summaryrefslogtreecommitdiffstats
path: root/media/mca
diff options
context:
space:
mode:
authorRuei-sung Lin <rslin@google.com>2012-09-12 14:56:59 -0700
committerRuei-sung Lin <rslin@google.com>2012-09-12 15:01:29 -0700
commitc733a79a4309a75ecda1731b2ffc84a8b9ac4f3c (patch)
treee5e391c2554652840698ae7398683f0f8aa4e654 /media/mca
parentf4fd2eb5ee425a29aa2bed4c92ea21ac5fd7fd69 (diff)
downloadframeworks_base-c733a79a4309a75ecda1731b2ffc84a8b9ac4f3c.zip
frameworks_base-c733a79a4309a75ecda1731b2ffc84a8b9ac4f3c.tar.gz
frameworks_base-c733a79a4309a75ecda1731b2ffc84a8b9ac4f3c.tar.bz2
Fix b/7087723 Patch leftover after tapping the red eye area
Change-Id: I06f5c491b09cf13698f001e8b11f42506fda5bbd
Diffstat (limited to 'media/mca')
-rw-r--r--media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java b/media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java
index 3450ef1..8618804 100644
--- a/media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java
+++ b/media/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java
@@ -72,9 +72,7 @@ public class RedEyeFilter extends Filter {
"void main() {\n" +
" vec4 color = texture2D(tex_sampler_0, v_texcoord);\n" +
" vec4 mask = texture2D(tex_sampler_1, v_texcoord);\n" +
- " gl_FragColor = vec4(mask.a, mask.a, mask.a, 1.0) * intensity + color * (1.0 - intensity);\n" +
" if (mask.a > 0.0) {\n" +
- " gl_FragColor.r = 0.0;\n" +
" float green_blue = color.g + color.b;\n" +
" float red_intensity = color.r / green_blue;\n" +
" if (red_intensity > intensity) {\n" +
@@ -105,8 +103,8 @@ public class RedEyeFilter extends Filter {
ShaderProgram shaderProgram = new ShaderProgram(context, mRedEyeShader);
shaderProgram.setMaximumTileSize(mTileSize);
mProgram = shaderProgram;
+ mProgram.setHostValue("intensity", DEFAULT_RED_INTENSITY);
break;
-
default:
throw new RuntimeException("Filter RedEye does not support frames of " +
"target " + target + "!");
@@ -180,8 +178,6 @@ public class RedEyeFilter extends Filter {
}
private void updateProgramParams() {
- mProgram.setHostValue("intensity", DEFAULT_RED_INTENSITY);
-
if ( mCenters.length % 2 == 1) {
throw new RuntimeException("The size of center array must be even.");
}