Fixes infinite loops when call endProcess by adding a flag to check i…

…f the filter has already started the end process
achambers16 · Nov 8, 2013 · abe404b · abe404b
1 parent 49fcf22
commit abe404b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/framework/Source/GPUImageFilter.h b/framework/Source/GPUImageFilter.h
@@ -57,6 +57,7 @@ typedef struct GPUMatrix3x3 GPUMatrix3x3;
     GLfloat backgroundColorRed, backgroundColorGreen, backgroundColorBlue, backgroundColorAlpha;
 
     BOOL preparedToCaptureImage;
+    BOOL isEndProcessing;
 
     // Texture caches are an iOS-specific capability
 #if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE

diff --git a/framework/Source/GPUImageFilter.m b/framework/Source/GPUImageFilter.m
@@ -1002,9 +1002,14 @@ - (CGSize)maximumOutputSize;
 
 - (void)endProcessing 
 {
-    for (id<GPUImageInput> currentTarget in targets)
+    if (!isEndProcessing)
     {
-        [currentTarget endProcessing];
+        isEndProcessing = YES;
+
+        for (id<GPUImageInput> currentTarget in targets)
+        {
+            [currentTarget endProcessing];
+        }
     }
 }
 

diff --git a/framework/Source/GPUImageFilterGroup.h b/framework/Source/GPUImageFilterGroup.h
@@ -4,6 +4,7 @@
 @interface GPUImageFilterGroup : GPUImageOutput <GPUImageInput, GPUImageTextureDelegate>
 {
     NSMutableArray *filters;
+    BOOL isEndProcessing;
 }
 
 @property(readwrite, nonatomic, strong) GPUImageOutput<GPUImageInput> *terminalFilter;

diff --git a/framework/Source/GPUImageFilterGroup.m b/framework/Source/GPUImageFilterGroup.m
@@ -182,9 +182,14 @@ - (CGSize)maximumOutputSize;
 
 - (void)endProcessing;
 {
-    for (GPUImageOutput<GPUImageInput> *currentFilter in _initialFilters)
+    if (!isEndProcessing)
     {
-        [currentFilter endProcessing];
+        isEndProcessing = YES;
+
+        for (id<GPUImageInput> currentTarget in targets)
+        {
+            [currentTarget endProcessing];
+        }
     }
 }