am 66d6ac85: Merge "Fix RenderScript warnings."

* commit '66d6ac8556a382b13dad5fab831aab84cbe8c0cc':
  Fix RenderScript warnings.

diff --git a/src/com/android/gallery3d/filtershow/filters/saturation.rs b/src/com/android/gallery3d/filtershow/filters/saturation.rs
index 5210e34..5b21640 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/saturation.rs
+++ b/src/com/android/gallery3d/filtershow/filters/saturation.rs
@@ -149,7 +149,6 @@ uchar4 __attribute__((kernel)) selectiveAdjust(const uchar4 in, uint32_t x,
     uint32_t y) {
     float4 pixel = rsUnpackColor8888(in);
 
-    float4 wsum = pixel;
     int hue = rgb2hue(in);
 
     float t = satLut[hue];
@@ -158,4 +157,4 @@ uchar4 __attribute__((kernel)) selectiveAdjust(const uchar4 in, uint32_t x,
 
     pixel.a = 1.0f;
     return rsPackColorTo8888(clamp(pixel, 0.f, 1.0f));
-}
\ No newline at end of file
+}

diff --git a/src/com/android/gallery3d/filtershow/filters/vignette.rs b/src/com/android/gallery3d/filtershow/filters/vignette.rs
index 709b220..7ab4663 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/vignette.rs
+++ b/src/com/android/gallery3d/filtershow/filters/vignette.rs
@@ -38,8 +38,6 @@ static const float Bf = 0.114f;
 
 
 void setupVignetteParams() {
-    int k = 0;
-
     scalex = 1.f / radiusx;
     scaley = 1.f / radiusy;
 
@@ -75,4 +73,4 @@ uchar4 __attribute__((kernel)) vignette(const uchar4 in, uint32_t x,  uint32_t y
     wsum.a = 1.0f;
     uchar4 out = rsPackColorTo8888(clamp(wsum, 0.f, 1.0f));
     return out;
-}
\ No newline at end of file
+}