Merge pull request #1308 from achambers16/fix-RawDataOutput-bad-access

Fix exc-bad-access if GPUImageRawDataOutput is initialized during render
BradLarson · Dec 9, 2013 · 0862252 · 0862252
2 parents 2941de1 + 3c72968
commit 0862252
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/framework/Source/GPUImageRawDataOutput.m b/framework/Source/GPUImageRawDataOutput.m
@@ -85,12 +85,6 @@ - (id)initWithImageSize:(CGSize)newImageSize resultsInBGRAFormat:(BOOL)resultsIn
     dataTextureCoordinateAttribute = [dataProgram attributeIndex:@"inputTextureCoordinate"];
     dataInputTextureUniform = [dataProgram uniformIndex:@"inputImageTexture"];
 
-    // REFACTOR: Wrap this in a block for the image processing queue
-    [GPUImageContext setActiveShaderProgram:dataProgram];
-
-	glEnableVertexAttribArray(dataPositionAttribute);
-	glEnableVertexAttribArray(dataTextureCoordinateAttribute);
-
     return self;
 }
 
@@ -305,6 +299,9 @@ - (void)renderAtInternalSize;
     glVertexAttribPointer(dataPositionAttribute, 2, GL_FLOAT, 0, 0, squareVertices);
 	glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0, textureCoordinates);
 
+    glEnableVertexAttribArray(dataPositionAttribute);
+	glEnableVertexAttribArray(dataTextureCoordinateAttribute);
+
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }