Only create soft mask for image if really necessary

Author: LaurenzV

src/render/image.rs

@@ -127,15 +127,21 @@ fn handle_transparent_image(image: &DynamicImage) -> (Vec<u8>, Filter, Option<Ve
 
     let encoded_mask: Option<Vec<u8>> = if color.has_alpha() {
         if bits / channels > 8 {
-            Some(
-                image
-                    .to_rgba16()
-                    .pixels()
-                    .flat_map(|&Rgba([.., a])| a.to_be_bytes())
-                    .collect(),
-            )
+            let image = image.to_rgba16();
+
+            if image.pixels().any(|&Rgba([.., a])| a != u16::MAX) {
+                Some(image.pixels().flat_map(|&Rgba([.., a])| a.to_be_bytes()).collect())
+            } else {
+                None
+            }
         } else {
-            Some(image.to_rgba8().pixels().map(|&Rgba([.., a])| a).collect())
+            let image = image.to_rgba8();
+
+            if image.pixels().any(|&Rgba([.., a])| a != u8::MAX) {
+                Some(image.pixels().map(|&Rgba([.., a])| a).collect())
+            } else {
+                None
+            }
         }
     } else {
         None

tests/ref/custom/integration/matplotlib/affine_image_transformation.png

@@ -17,7 +17,6 @@
 IGNORE_TESTS = {
     # The following test cases still need to be investigated
     "svg/resvg/filters/fePointLight/primitiveUnits=objectBoundingBox.svg": INVESTIGATE,
-    "svg/resvg/filters/filter/with-mask-on-parent.svg": INVESTIGATE,
     "svg/resvg/masking/mask/recursive-on-child.svg": INVESTIGATE,
     "svg/resvg/paint-servers/pattern/nested-objectBoundingBox.svg": INVESTIGATE,
     "svg/resvg/paint-servers/radialGradient/fr=0.2.svg": INVESTIGATE,
@@ -79,6 +78,7 @@
     "svg/resvg/paint-servers/radialGradient/attributes-via-xlink-href-from-linearGradient.svg": NO_REFLECT,
     "svg/resvg/paint-servers/radialGradient/spreadMethod=reflect.svg": NO_REFLECT,
     "svg/resvg/paint-servers/radialGradient/spreadMethod=repeat.svg": NO_REPEAT,
+    "svg/custom/masking/mask/mask-and-image-with-transparency.svg": "bug",
 }
 
 

tests/ref/resvg/filters/filter/with-mask-on-parent.png

@@ -114,6 +114,11 @@ fn is_pix_diff(pixel1: &Rgba<u8>, pixel2: &Rgba<u8>) -> bool {
 /// Runs a single test instance.
 pub fn run_test(svg_path: &str, ref_path: &str, diff_path: &str, replace: bool) -> i32 {
     let (_, actual_image) = convert_svg(&fs::read_to_string(svg_path).unwrap());
+    if !Path::new(ref_path).exists() {
+        fs::create_dir_all(Path::new(ref_path).parent().unwrap()).unwrap();
+        save_image(&actual_image, Path::new(ref_path));
+        return 0;
+    }
     let expected_image = Reader::open(ref_path).unwrap().decode().unwrap().into_rgba8();
 
     let width = max(expected_image.width(), actual_image.width());

tests/scripts/gen-tests.py

@@ -288,8 +288,7 @@ use crate::run_test;
 #[test] fn resvg_filters_filter_on_an_empty_group_2() {assert_eq!(run_test("svg/resvg/filters/filter/on-an-empty-group-2.svg", "ref/resvg/filters/filter/on-an-empty-group-2.png", "diff/resvg/filters/filter/on-an-empty-group-2.png", false), 0)}
 #[test] fn resvg_filters_filter_in_BackgroundAlpha() {assert_eq!(run_test("svg/resvg/filters/filter/in=BackgroundAlpha.svg", "ref/resvg/filters/filter/in=BackgroundAlpha.png", "diff/resvg/filters/filter/in=BackgroundAlpha.png", false), 0)}
 #[test] fn resvg_filters_filter_with_clip_path_and_mask() {assert_eq!(run_test("svg/resvg/filters/filter/with-clip-path-and-mask.svg", "ref/resvg/filters/filter/with-clip-path-and-mask.png", "diff/resvg/filters/filter/with-clip-path-and-mask.png", false), 0)}
-// need to investigate
-#[ignore] #[test] fn resvg_filters_filter_with_mask_on_parent() {assert_eq!(run_test("svg/resvg/filters/filter/with-mask-on-parent.svg", "ref/resvg/filters/filter/with-mask-on-parent.png", "diff/resvg/filters/filter/with-mask-on-parent.png", false), 0)}
+#[test] fn resvg_filters_filter_with_mask_on_parent() {assert_eq!(run_test("svg/resvg/filters/filter/with-mask-on-parent.svg", "ref/resvg/filters/filter/with-mask-on-parent.png", "diff/resvg/filters/filter/with-mask-on-parent.png", false), 0)}
 #[test] fn resvg_filters_filter_with_region_outside_the_canvas() {assert_eq!(run_test("svg/resvg/filters/filter/with-region-outside-the-canvas.svg", "ref/resvg/filters/filter/with-region-outside-the-canvas.png", "diff/resvg/filters/filter/with-region-outside-the-canvas.png", false), 0)}
 #[test] fn resvg_filters_filter_transform_on_shape() {assert_eq!(run_test("svg/resvg/filters/filter/transform-on-shape.svg", "ref/resvg/filters/filter/transform-on-shape.png", "diff/resvg/filters/filter/transform-on-shape.png", false), 0)}
 #[test] fn resvg_filters_filter_in_BackgroundImage_with_enable_background() {assert_eq!(run_test("svg/resvg/filters/filter/in=BackgroundImage-with-enable-background.svg", "ref/resvg/filters/filter/in=BackgroundImage-with-enable-background.png", "diff/resvg/filters/filter/in=BackgroundImage-with-enable-background.png", false), 0)}
@@ -1775,3 +1774,5 @@ use crate::run_test;
 #[test] fn custom_structure_viewbox_negative_viewbox() {assert_eq!(run_test("svg/custom/structure/viewbox/negative_viewbox.svg", "ref/custom/structure/viewbox/negative_viewbox.png", "diff/custom/structure/viewbox/negative_viewbox.png", false), 0)}
 #[test] fn custom_masking_clipPath_clip_path_with_nested_clip_path_and_transform() {assert_eq!(run_test("svg/custom/masking/clipPath/clip-path-with-nested-clip-path-and-transform.svg", "ref/custom/masking/clipPath/clip-path-with-nested-clip-path-and-transform.png", "diff/custom/masking/clipPath/clip-path-with-nested-clip-path-and-transform.png", false), 0)}
 #[test] fn custom_masking_clipPath_complex_clip_path_with_nested_clip_path_on_child() {assert_eq!(run_test("svg/custom/masking/clipPath/complex-clip-path-with-nested-clip-path-on-child.svg", "ref/custom/masking/clipPath/complex-clip-path-with-nested-clip-path-on-child.png", "diff/custom/masking/clipPath/complex-clip-path-with-nested-clip-path-on-child.png", false), 0)}
+// bug
+#[ignore] #[test] fn custom_masking_mask_mask_and_image_with_transparency() {assert_eq!(run_test("svg/custom/masking/mask/mask-and-image-with-transparency.svg", "ref/custom/masking/mask/mask-and-image-with-transparency.png", "diff/custom/masking/mask/mask-and-image-with-transparency.png", false), 0)}