Skip to content

avoid crash #37

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
kirayamato1989 wants to merge 2 commits into
base: master
Choose a base branch
from
+0 −8
Open

avoid crash #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6a8f93
avoid crash
kirayamato1989 Feb 28, 2017
70020fe
如果有某些帧没有取到也不抛出异常
kirayamato1989 Mar 1, 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
8 changes: 0 additions & 8 deletions Regift/Regift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,11 @@ public struct Regift {

// Create a dispatch group to force synchronous behavior on an asynchronous method.
let gifGroup = Group()
var dispatchError: Bool = false
gifGroup.enter()

generator.generateCGImagesAsynchronously(forTimes: times, completionHandler: { (requestedTime, image, actualTime, result, error) in
guard let imageRef = image , error == nil else {
print("An error occurred: \(error), image is \(image)")
dispatchError = true
gifGroup.leave()

@nakajijapan nakajijapan Oct 29, 2017 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that gifGroup.leave()'s position isn't good. In this case, leave is called only if an error doesn't occur. We should call leave every cases.

return
}

Expand All @@ -313,11 +310,6 @@ public struct Regift {

// Wait for the asynchronous generator to finish.
gifGroup.wait()

// If there was an error in the generator, throw the error.
if dispatchError {
throw RegiftError.AddFrameToDestination
}

CGImageDestinationSetProperties(destination, fileProperties as CFDictionary)

Expand Down