Merge pull request #3 from Eskils/develop

Fix applying gradientBlur causes unintended blurring
Eskils · Feb 16, 2024 · 74d9fcb · 74d9fcb
2 parents bd34a6c + 343e9ec
commit 74d9fcb
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ let package = Package(
   dependencies: [
     .package(
       url: "https://github.com/Eskils/VariableBlurImageView", 
-      .upToNextMinor(from: "1.1.1") // or `.upToNextMajor
+      .upToNextMinor(from: "1.1.2") // or `.upToNextMajor
     )
   ],
   targets: [

diff --git a/Sources/VariableBlurImageView/VariableBlur.metal b/Sources/VariableBlurImageView/VariableBlur.metal
@@ -182,9 +182,16 @@ kernel void gradientVariableBlur(
     const float4 gradientValue = gradient.read(gradientGid);
     const half luma = ((half)gradientValue.x + (half)gradientValue.y + (half)gradientValue.z) / 3;
 
-    half radius = max(luma * (half)maxRadius, 1.0h);
+    half radius = luma * (half)maxRadius;
+
+    float4 colorOut;
+
+    if (radius >= 1.0h) {
+        colorOut = (float4)colorForBlurAtPixel(hGid, textureIn, radius);
+    } else {
+        colorOut = textureIn.read(gid);
+    }
 
-    float4 colorOut = (float4)colorForBlurAtPixel(hGid, textureIn, radius);
 
     textureOut.write(colorOut, gid);
 }

diff --git a/...bleBlurImageViewTests/ExpectedOutputs/GreenerOnTheOtherSide-GradientBlur-20.png b/...bleBlurImageViewTests/ExpectedOutputs/GreenerOnTheOtherSide-GradientBlur-20.png
diff --git a/Tests/VariableBlurImageViewTests/ExpectedOutputs/Leaves-GradientBlur-20.png b/Tests/VariableBlurImageViewTests/ExpectedOutputs/Leaves-GradientBlur-20.png
diff --git a/Tests/VariableBlurImageViewTests/ExpectedOutputs/TestAlpha-GradientBlur-20.png b/Tests/VariableBlurImageViewTests/ExpectedOutputs/TestAlpha-GradientBlur-20.png
diff --git a/...bleBlurImageViewTests/ExpectedOutputs/VariableBlurTestImage-GradientBlur-20.png b/...bleBlurImageViewTests/ExpectedOutputs/VariableBlurTestImage-GradientBlur-20.png
diff --git a/...urImageViewTests/ExpectedOutputs/VariableBlurTestImageSmall-GradientBlur-20.png b/...urImageViewTests/ExpectedOutputs/VariableBlurTestImageSmall-GradientBlur-20.png
diff --git a/Tests/VariableBlurImageViewTests/InputImages/VariableBlurTestImageSmall.png b/Tests/VariableBlurImageViewTests/InputImages/VariableBlurTestImageSmall.png
diff --git a/...bleBlurImageViewTests/ProducedOutputs/VariableBlurTestImage-GradientBlur-20.png b/...bleBlurImageViewTests/ProducedOutputs/VariableBlurTestImage-GradientBlur-20.png
diff --git a/...ests/ProducedOutputs/VariableBlurTestImage-HorizontalBlur-(0,20)-to-(50w,0).png b/...ests/ProducedOutputs/VariableBlurTestImage-HorizontalBlur-(0,20)-to-(50w,0).png
diff --git a/...ts/ProducedOutputs/VariableBlurTestImage-HorizontalBlur-(90w,20)-to-(50w,0).png b/...ts/ProducedOutputs/VariableBlurTestImage-HorizontalBlur-(90w,20)-to-(50w,0).png
diff --git a/...leBlurImageViewTests/ProducedOutputs/VariableBlurTestImage-MultipleBlurs-20.png b/...leBlurImageViewTests/ProducedOutputs/VariableBlurTestImage-MultipleBlurs-20.png
diff --git a/...geViewTests/ProducedOutputs/VariableBlurTestImage-MultipleBlurs-WithOverlap.png b/...geViewTests/ProducedOutputs/VariableBlurTestImage-MultipleBlurs-WithOverlap.png
diff --git a/...dOutputs/VariableBlurTestImage-VariableBlur-((10w,15h),20)-to-((60w,40h),0).png b/...dOutputs/VariableBlurTestImage-VariableBlur-((10w,15h),20)-to-((60w,40h),0).png
diff --git a/...wTests/ProducedOutputs/VariableBlurTestImage-VerticalBlur-(0,20)-to-(50h,0).png b/...wTests/ProducedOutputs/VariableBlurTestImage-VerticalBlur-(0,20)-to-(50h,0).png
diff --git a/...ests/ProducedOutputs/VariableBlurTestImage-VerticalBlur-(90h,20)-to-(50h,0).png b/...ests/ProducedOutputs/VariableBlurTestImage-VerticalBlur-(90h,20)-to-(50h,0).png
diff --git a/...urImageViewTests/ProducedOutputs/VariableBlurTestImageSmall-GradientBlur-20.png b/...urImageViewTests/ProducedOutputs/VariableBlurTestImageSmall-GradientBlur-20.png
diff --git a/Tests/VariableBlurImageViewTests/VariableBlurImageViewTests.swift b/Tests/VariableBlurImageViewTests/VariableBlurImageViewTests.swift
@@ -10,7 +10,7 @@ final class VariableBlurImageViewTests: XCTestCase {
 
     let testsDirectory = URL(fileURLWithPath: #filePath + "/..").standardizedFileURL.path
 
-    let inputImageName = "GreenerOnTheOtherSide"
+    let inputImageName = "VariableBlurTestImage"
 
     func testVerticalVariableBlur() throws {
         XCTAssertTrue(
@@ -159,6 +159,25 @@ final class VariableBlurImageViewTests: XCTestCase {
         )
     }
 
+    func testGradientBlurSmallImageForUnintendedBlur() throws {
+        let inputImageName = "VariableBlurTestImageSmall"
+        let gradientImage = try provideInputImage(inputImageName: "TestAlpha")
+
+        XCTAssertTrue(
+            try isEqual(
+                inputImageName: inputImageName,
+                expectedImageName: "\(inputImageName)-GradientBlur-20",
+                afterPerformingImageOperations: { input in
+                    try variableBlurEngine.applyGradientVariableBlur(
+                        toImage: input,
+                        withGradient: gradientImage,
+                        maxRadius: 20
+                    )
+                }
+            )
+        )
+    }
+
     func testPerformanceOfGradientBlur() throws {
         let inputImage = try provideInputImage(inputImageName: inputImageName)
         let gradientImage = try provideInputImage(inputImageName: "TestAlpha")