Merge pull request BradLarson#1502 from mvarie/master

updated iOS version reference to avoid explicit release of semaphores on iOS6
colinger · Apr 28, 2014 · 2040d53 · 2040d53
2 parents 38357d3 + 86ec94a
commit 2040d53
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/framework/Source/GPUImageFilter.m b/framework/Source/GPUImageFilter.m
@@ -70,7 +70,8 @@ - (id)initWithVertexShaderFromString:(NSString *)vertexShaderString fragmentShad
     backgroundColorGreen = 0.0;
     backgroundColorBlue = 0.0;
     backgroundColorAlpha = 0.0;
-    imageCaptureSemaphore = dispatch_semaphore_create(1);
+    imageCaptureSemaphore = dispatch_semaphore_create(0);
+    dispatch_semaphore_signal(imageCaptureSemaphore);
 
     runSynchronouslyOnVideoProcessingQueue(^{
         [GPUImageContext useImageProcessingContext];

diff --git a/framework/Source/iOS/GPUImagePicture.m b/framework/Source/iOS/GPUImagePicture.m
@@ -62,8 +62,10 @@ - (id)initWithCGImage:(CGImageRef)newImageSource smoothlyScaleOutput:(BOOL)smoot
 
     hasProcessedImage = NO;
     self.shouldSmoothlyScaleOutput = smoothlyScaleOutput;
-    imageUpdateSemaphore = dispatch_semaphore_create(1);
-
+    imageUpdateSemaphore = dispatch_semaphore_create(0);
+    dispatch_semaphore_signal(imageUpdateSemaphore);
+
+
     // TODO: Dispatch this whole thing asynchronously to move image loading off main thread
     CGFloat widthOfImage = CGImageGetWidth(newImageSource);
     CGFloat heightOfImage = CGImageGetHeight(newImageSource);
@@ -296,4 +298,4 @@ - (void)addTarget:(id<GPUImageInput>)newTarget atTextureLocation:(NSInteger)text
     }
 }
 
-@end
+@end