Fixes #654, adds full test coverage

Author: lilith

imageflow_core/src/flow/nodes/clone_crop_fill_expand.rs

@@ -511,7 +511,8 @@ impl NodeDefOneInputExpand for CropWhitespaceDef {
                             if rect.x2 <= rect.x1 || rect.y2 <= rect.y1 {
                                 return Err(nerror!(crate::ErrorKind::InvalidState, "Whitespace detection returned invalid rectangle"));
                             }
-                            let padding = (percent_padding * (rect.x2 - rect.x1 + rect.y2 - rect.y1) as f32 / 2f32).ceil() as i64;
+                            let padding = (percent_padding / 100f32 * (rect.x2 - rect.x1 + rect.y2 - rect.y1) as f32 / 2f32).ceil() as i64;
+                            //eprintln!("Detected {}x{} whitespace rect: {:?} within {}x{}, padding: {}", rect.x2 - rect.x1, rect.y2 - rect.y1, rect, frame.w, frame.h, padding);
                             Ok((cmp::max(0, rect.x1 as i64 - padding) as u32, cmp::max(0, rect.y1 as i64 - padding) as u32,
                                 cmp::min(bitmap.w() as i64, rect.x2 as i64 + padding) as u32, cmp::min(bitmap.h() as i64, rect.y2 as i64 + padding) as u32))
                         } else {
@@ -521,6 +522,7 @@ impl NodeDefOneInputExpand for CropWhitespaceDef {
                 },
                 other => { Err(nerror!(crate::ErrorKind::InvalidOperation, "Cannot CropWhitespace without a parent bitmap; got {:?}", other)) }
             }?;
+            //eprintln!("Whitespace cropping to {}x{} of {}x{}: x1={}, y1={}, x2={}, y2={}", x2-x1, y2-y1, b.w, b.h, x1, y1, x2, y2);
             ctx.replace_node(ix, vec![
                 Node::n(&CROP,
                         NodeParams::Json(s::Node::Crop { x1, y1, x2, y2 }))

imageflow_core/src/graphics/whitespace.rs

@@ -71,13 +71,15 @@ const SCAN_FULL: ScanRegion = ScanRegion {
     y_2_percent: 1f32,
 };
 
+#[derive(Copy, Clone, Debug)]
 pub struct RectCorners {
     pub x1: u32,
     pub y1: u32,
     pub x2: u32,
     pub y2: u32,
 }
 
+#[derive(Copy, Clone, Debug)]
 struct Rect {
     x: u32,
     y: u32,

imageflow_core/tests/visuals.rs

@@ -67,6 +67,100 @@ fn test_trim_whitespace() {
 }
 
 
+#[test]
+fn test_trim_whitespace_with_padding() {
+    
+    compare_encoded(
+        Some(IoTestEnum::Url("https://s3-us-west-2.amazonaws.com/imageflow-resources/test_inputs/whitespace-issue.png".to_owned())),
+        "trim_whitespace_with_padding",
+        POPULATE_CHECKSUMS,
+        DEBUG_GRAPH,
+        Constraints {
+            similarity: Similarity::AllowDssimMatch(0.0, 0.002),
+            max_file_size: None
+        },
+        vec![
+            Node::CommandString{
+                kind: CommandStringKind::ImageResizer4,
+                value: "trim.threshold=20&trim.percentpadding=0.5&bgcolor=gray".to_owned(),
+                decode: Some(0),
+                encode: Some(1),
+                watermarks: None
+            }
+        ]
+    );
+}
+#[test]
+fn test_trim_resize_whitespace_with_padding() {
+    
+    compare_encoded(
+        Some(IoTestEnum::Url("https://s3-us-west-2.amazonaws.com/imageflow-resources/test_inputs/whitespace-issue.png".to_owned())),
+        "trim_resize_whitespace_with_padding",
+        POPULATE_CHECKSUMS,
+        DEBUG_GRAPH,
+        Constraints {
+            similarity: Similarity::AllowDssimMatch(0.0, 0.002),
+            max_file_size: None
+        },
+        vec![
+            Node::CommandString{
+                kind: CommandStringKind::ImageResizer4,
+                value: "w=450&h=450&scale=both&trim.threshold=20&trim.percentpadding=10&bgcolor=gray".to_owned(),
+                decode: Some(0),
+                encode: Some(1),
+                watermarks: None
+            }
+        ]
+    );
+}
+#[test]
+fn test_trim_resize_whitespace_without_padding() {
+    
+    compare_encoded(
+        Some(IoTestEnum::Url("https://s3-us-west-2.amazonaws.com/imageflow-resources/test_inputs/whitespace-issue.png".to_owned())),
+        "trim_resize_whitespace_without_padding",
+        POPULATE_CHECKSUMS,
+        DEBUG_GRAPH,
+        Constraints {
+            similarity: Similarity::AllowDssimMatch(0.0, 0.002),
+            max_file_size: None
+        },
+        vec![
+            Node::CommandString{
+                kind: CommandStringKind::ImageResizer4,
+                value: "w=450&h=450&scale=both&trim.threshold=20&bgcolor=gray".to_owned(),
+                decode: Some(0),
+                encode: Some(1),
+                watermarks: None
+            }
+        ]
+    );
+}
+#[test]
+fn test_trim_whitespace_with_padding_no_resize() {
+    
+    compare_encoded(
+        Some(IoTestEnum::Url("https://s3-us-west-2.amazonaws.com/imageflow-resources/test_inputs/whitespace-issue.png".to_owned())),
+        "trim_whitespace_with_padding_no_resize",
+        POPULATE_CHECKSUMS,
+        DEBUG_GRAPH,
+        Constraints {
+            similarity: Similarity::AllowDssimMatch(0.0, 0.002),
+            max_file_size: None
+        },
+        vec![
+            Node::CommandString{
+                kind: CommandStringKind::ImageResizer4,
+                value: "trim.threshold=20&trim.percentpadding=0.5&bgcolor=gray".to_owned(),
+                decode: Some(0),
+                encode: Some(1),
+                watermarks: None
+            }
+        ]
+    );
+}
+
+
 #[test]
 fn test_transparent_png_to_png() {
     compare_encoded(

imageflow_core/tests/visuals/checksums.json

@@ -90,6 +90,10 @@
   "transparent_png_to_png_round_corners": "070F860839693FDC7.png",
   "transparent_trim_whitespace": "0FBC6A5C3930ADEF7.png",
   "transparent_webp_to_webp": "0026D28C52CC20F72.webp",
+  "trim_resize_whitespace_with_padding": "0C98752E6DE58648A.png",
+  "trim_resize_whitespace_without_padding": "094AD8123D38FF811.png",
+  "trim_whitespace_with_padding": "0BEBDEBEADEFEF409.png",
+  "trim_whitespace_with_padding_no_resize": "0BEBDEBEADEFEF409.png",
   "watermark_jpeg_over_pnga": "04C0143A72CB4EBAA_073B7BE0C1ABF189F",
   "webp_lossless_alpha_decode_and_scale": "057FA4CBAC9D0E267_0172196390B512E97",
   "webp_lossy_alpha_decode_and_scale": "09F54D063249F69C8_0172196390B512E97",