Remove lena (#49)

Author: xd009642

Cargo.toml

@@ -34,3 +34,6 @@ approx = "0.4"
 noisy_float = "0.2"
 png = "0.16"
 ndarray-linalg = { version = "0.14", features = ["intel-mkl"] }
+# it is a dependency of intel-mkl-tool, we pin it to temporary solve
+# https://github.com/rust-math/intel-mkl-src/issues/68
+anyhow = "<1.0.49"

examples/basic.rs

@@ -4,34 +4,32 @@ use ndarray_vision::format::netpbm::*;
 use ndarray_vision::format::*;
 use ndarray_vision::processing::*;
 use std::env::current_exe;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 fn main() {
-    if let Ok(mut root) = current_exe() {
-        root.pop();
-        root.pop();
-        root.pop();
-        root.pop();
-        let mut lena = PathBuf::from(&root);
-        lena.push("images/lena.ppm");
+    let root = Path::new(env!("CARGO_MANIFEST_DIR"));
+    let mut cameraman = root.clone().join("images/cameraman.ppm");
+    println!("{:?}", cameraman);
 
-        let decoder = PpmDecoder::default();
-        let image: Image<u8, _> = decoder.decode_file(lena).expect("Couldn't open Lena.ppm");
+    let decoder = PpmDecoder::default();
+    let image: Image<u8, _> = decoder
+        .decode_file(cameraman)
+        .expect("Couldn't open cameraman.ppm");
 
-        let boxkern: Array3<f64> =
-            BoxLinearFilter::build(Ix3(3, 3, 3)).expect("Was unable to construct filter");
+    let boxkern: Array3<f64> =
+        BoxLinearFilter::build(Ix3(3, 3, 3)).expect("Was unable to construct filter");
 
-        let mut image: Image<f64, _> = image.into_type();
+    let mut image: Image<f64, _> = image.into_type();
 
-        let _ = image
-            .conv2d_inplace(boxkern.view())
-            .expect("Poorly sized kernel");
-        // There's no u8: From<f64> so I've done this to hack things
+    let _ = image
+        .conv2d_inplace(boxkern.view())
+        .expect("Poorly sized kernel");
+    // There's no u8: From<f64> so I've done this to hack things
 
-        let mut lena = PathBuf::from(&root);
-        lena.push("images/lenablur.ppm");
+    let mut cameraman = PathBuf::from(&root);
+    cameraman.push("images/cameramanblur.ppm");
 
-        let ppm = PpmEncoder::new_plaintext_encoder();
-        ppm.encode_file(&image, lena).expect("Unable to encode ppm");
-    }
+    let ppm = PpmEncoder::new_plaintext_encoder();
+    ppm.encode_file(&image, cameraman)
+        .expect("Unable to encode ppm");
 }

examples/edges.rs

@@ -22,11 +22,13 @@ fn main() {
         root.pop();
         root.pop();
         root.pop();
-        let mut lena = PathBuf::from(&root);
-        lena.push("images/lena.ppm");
+        let mut cameraman = PathBuf::from(&root);
+        cameraman.push("images/cameraman.ppm");
 
         let decoder = PpmDecoder::default();
-        let image: Image<u8, _> = decoder.decode_file(lena).expect("Couldn't open Lena.ppm");
+        let image: Image<u8, _> = decoder
+            .decode_file(cameraman)
+            .expect("Couldn't open cameraman.ppm");
 
         let image: Image<f64, _> = image.into_type();
         let image: Image<_, Gray> = image.into();
@@ -36,15 +38,16 @@ fn main() {
         let image = image.apply_sobel().expect("Error in sobel");
         // back to RGB
         let image: Image<_, RGB> = image.into();
-        let mut lena = PathBuf::from(&root);
-        lena.push("images/lena-sobel.ppm");
+        let mut cameraman = PathBuf::from(&root);
+        cameraman.push("images/cameraman-sobel.ppm");
 
         let ppm = PpmEncoder::new_plaintext_encoder();
-        ppm.encode_file(&image, lena).expect("Unable to encode ppm");
+        ppm.encode_file(&image, cameraman)
+            .expect("Unable to encode ppm");
 
-        let mut lena = PathBuf::from(&root);
-        lena.push("images/lena-canny.ppm");
-        ppm.encode_file(&canny.into(), lena)
+        let mut cameraman = PathBuf::from(&root);
+        cameraman.push("images/cameraman-canny.ppm");
+        ppm.encode_file(&canny.into(), cameraman)
             .expect("Unable to encode ppm");
     }
 }

examples/transforms.rs

@@ -9,37 +9,39 @@ use std::fs::File;
 use std::io::BufWriter;
 use std::path::{Path, PathBuf};
 
-fn get_lena() -> Option<Image<u8, RGB>> {
+fn get_cameraman() -> Option<Image<u8, RGB>> {
     if let Ok(mut root) = current_exe() {
         root.pop();
         root.pop();
         root.pop();
         root.pop();
-        let mut lena = PathBuf::from(&root);
-        lena.push("images/lena.ppm");
+        let mut cameraman = PathBuf::from(&root);
+        cameraman.push("images/cameraman.ppm");
 
         let decoder = PpmDecoder::default();
-        let image: Image<u8, _> = decoder.decode_file(lena).expect("Couldn't open Lena.ppm");
+        let image: Image<u8, _> = decoder
+            .decode_file(cameraman)
+            .expect("Couldn't open cameraman.ppm");
         Some(image)
     } else {
         None
     }
 }
 
 fn main() {
-    let lena = get_lena().expect("Couldn't load lena");
+    let cameraman = get_cameraman().expect("Couldn't load cameraman");
 
     // Create transformation matrix
-    let x = 0.5 * (lena.cols() as f64) - 0.5;
-    let y = 0.5 * (lena.rows() as f64) - 0.5;
+    let x = 0.5 * (cameraman.cols() as f64) - 0.5;
+    let y = 0.5 * (cameraman.rows() as f64) - 0.5;
     let trans = rotate_around_centre(FRAC_PI_4, (x, y)).dot(&scale(0.7, 0.7));
 
-    let transformed = lena
+    let transformed = cameraman
         .transform(trans.view(), None)
         .expect("Transform failed");
 
     // save
-    let path = Path::new("transformed_lena.png");
+    let path = Path::new("transformed_cameraman.png");
     let file = File::create(path).expect("Couldn't create output file");
     let ref mut w = BufWriter::new(file);