Merge pull request BradLarson#1880 from tbveralrud/master

Implement shouldResizeBlurRadiusWithImageSize feature for blurs.
AncAinu · Jan 24, 2015 · 5186c19 · 5186c19
2 parents eecb459 + 7172fc4
commit 5186c19
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/framework/Source/GPUImageGaussianBlurFilter.h b/framework/Source/GPUImageGaussianBlurFilter.h
@@ -18,7 +18,7 @@
  */
 @property (readwrite, nonatomic) CGFloat blurRadiusInPixels;
 
-/** Setting these properties will allow the blur radius to scale with the size of the image
+/** Setting these properties will allow the blur radius to scale with the size of the image. These properties are mutually exclusive; setting either will set the other to 0.
  */
 @property (readwrite, nonatomic) CGFloat blurRadiusAsFractionOfImageWidth;
 @property (readwrite, nonatomic) CGFloat blurRadiusAsFractionOfImageHeight;

diff --git a/framework/Source/GPUImageGaussianBlurFilter.m b/framework/Source/GPUImageGaussianBlurFilter.m
@@ -352,9 +352,16 @@ - (void)setupFilterForSize:(CGSize)filterFrameSize;
 {
     [super setupFilterForSize:filterFrameSize];
 
-    if (shouldResizeBlurRadiusWithImageSize == YES)
+    if (shouldResizeBlurRadiusWithImageSize)
     {
-
+        if (self.blurRadiusAsFractionOfImageWidth > 0)
+        {
+            self.blurRadiusInPixels = filterFrameSize.width * self.blurRadiusAsFractionOfImageWidth;
+        }
+        else
+        {
+            self.blurRadiusInPixels = filterFrameSize.height * self.blurRadiusAsFractionOfImageHeight;
+        }
     }
 }
 
@@ -485,4 +492,22 @@ - (void)setBlurRadiusInPixels:(CGFloat)newValue;
     shouldResizeBlurRadiusWithImageSize = NO;
 }
 
+- (void)setBlurRadiusAsFractionOfImageWidth:(CGFloat)blurRadiusAsFractionOfImageWidth
+{
+    if (blurRadiusAsFractionOfImageWidth < 0)  return;
+
+    shouldResizeBlurRadiusWithImageSize = _blurRadiusAsFractionOfImageWidth != blurRadiusAsFractionOfImageWidth && blurRadiusAsFractionOfImageWidth > 0;
+    _blurRadiusAsFractionOfImageWidth = blurRadiusAsFractionOfImageWidth;
+    _blurRadiusAsFractionOfImageHeight = 0;
+}
+
+- (void)setBlurRadiusAsFractionOfImageHeight:(CGFloat)blurRadiusAsFractionOfImageHeight
+{
+    if (blurRadiusAsFractionOfImageHeight < 0)  return;
+
+    shouldResizeBlurRadiusWithImageSize = _blurRadiusAsFractionOfImageHeight != blurRadiusAsFractionOfImageHeight && blurRadiusAsFractionOfImageHeight > 0;
+    _blurRadiusAsFractionOfImageHeight = blurRadiusAsFractionOfImageHeight;
+    _blurRadiusAsFractionOfImageWidth = 0;
+}
+
 @end