From 665b8e2197378805f2a6a48076a17e76a6510715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rn=20Schoppe?= Date: Wed, 29 Nov 2017 11:24:42 +0100 Subject: [PATCH 1/2] Minor swifty improvements --- Source/UIImageEffects.swift | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/UIImageEffects.swift b/Source/UIImageEffects.swift index 0b439ff..e5c0e16 100644 --- a/Source/UIImageEffects.swift +++ b/Source/UIImageEffects.swift @@ -151,14 +151,14 @@ public extension UIImage { print("*** error: image must be backed by a CGImage: \(self)") return nil } - if maskImage != nil && maskImage!.cgImage == nil { + guard let maskCGImage = maskImage?.cgImage else { print("*** error: maskImage must be backed by a CGImage: \(String(describing: maskImage))") return nil } - let __FLT_EPSILON__ = CGFloat(Float.ulpOfOne) + let __FLT_EPSILON__ = CGFloat.ulpOfOne let screenScale = UIScreen.main.scale - let imageRect = CGRect(origin: CGPoint.zero, size: size) + let imageRect = CGRect(origin: .zero, size: size) var effectImage = self let hasBlur = blurRadius > __FLT_EPSILON__ @@ -272,9 +272,7 @@ public extension UIImage { // Draw effect image. if hasBlur { outputContext.saveGState() - if let maskCGImage = maskImage?.cgImage { - outputContext.clip(to: imageRect, mask: maskCGImage); - } + outputContext.clip(to: imageRect, mask: maskCGImage); outputContext.draw(effectImage.cgImage!, in: imageRect) outputContext.restoreGState() } From f763009016a38d14dbeb520d63fd5fc6efe5e8e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rn=20Schoppe?= Date: Wed, 29 Nov 2017 11:25:07 +0100 Subject: [PATCH 2/2] Remove double empty lines, fix indention --- Source/UIImageEffects.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/UIImageEffects.swift b/Source/UIImageEffects.swift index e5c0e16..4f42825 100644 --- a/Source/UIImageEffects.swift +++ b/Source/UIImageEffects.swift @@ -183,13 +183,11 @@ public extension UIImage { var effectInBuffer = createEffectBuffer(effectInContext) - UIGraphicsBeginImageContextWithOptions(size, false, screenScale) guard let effectOutContext = UIGraphicsGetCurrentContext() else { return nil } var effectOutBuffer = createEffectBuffer(effectOutContext) - if hasBlur { // A description of how to compute the box kernel width from the Gaussian // radius (aka standard deviation) appears in the SVG spec: @@ -226,7 +224,7 @@ public extension UIImage { 0.0722 + 0.9278 * s, 0.0722 - 0.0722 * s, 0.0722 - 0.0722 * s, 0, 0.7152 - 0.7152 * s, 0.7152 + 0.2848 * s, 0.7152 - 0.7152 * s, 0, 0.2126 - 0.2126 * s, 0.2126 - 0.2126 * s, 0.2126 + 0.7873 * s, 0, - 0, 0, 0, 1 + 0, 0, 0, 1 ] let divisor: CGFloat = 256