Merge pull request BradLarson#456 from jagbolanos/master

The GrayscaleFilter wasn't respecting the alpha channel
mramsden · Sep 5, 2012 · 4504196 · 4504196
2 parents fa8ea2f + 363bd5d
commit 4504196
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/framework/Source/GPUImageGrayscaleFilter.m b/framework/Source/GPUImageGrayscaleFilter.m
@@ -14,9 +14,10 @@ @implementation GPUImageGrayscaleFilter
 
  void main()
  {
-     float luminance = dot(texture2D(inputImageTexture, textureCoordinate).rgb, W);
+     lowp vec4 textureColor = texture2D(inputImageTexture, textureCoordinate);
+     float luminance = dot(textureColor.rgb, W);
 
-     gl_FragColor = vec4(vec3(luminance), 1.0);
+     gl_FragColor = vec4(vec3(luminance), textureColor.a);
  }
 );
 

diff --git a/framework/Source/GPUImageMotionDetector.m b/framework/Source/GPUImageMotionDetector.m
@@ -25,7 +25,7 @@ void main()
 
 @implementation GPUImageMotionDetector
 
-@synthesize lowPassFilterStrength;
+@synthesize lowPassFilterStrength, motionDetectionBlock;
 
 #pragma mark -
 #pragma mark Initialization and teardown