Skip to content

Minor swift improvements #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Minor swift improvements #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
665b8e2
Minor swifty improvements
pixeldock Nov 29, 2017
f763009
Remove double empty lines, fix indention
pixeldock Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions Source/UIImageEffects.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -272,9 +270,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()
}
Expand Down