summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shih-wei Liao <sliao@google.com> 2011-01-17 01:18:32 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-01-17 01:18:32 -0800
commit38f79d01db07f7cc3d3b49d594b675adfa8959d5 (patch)
tree60470e336a7e0cd57a3251d698dca37188cb1c77
parent5a1473bae0467693445b31454e4f736763276de8 (diff)
parent2aad562ab26dc2986fbe826411f69b958cb67967 (diff)
Merge "Make ImageProcessing work." into honeycomb
-rw-r--r--libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
index 4615e1fba4e4..bd4ae4eca3b7 100644
--- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
+++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
@@ -87,7 +87,7 @@ void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32
temp = pow(temp, (float3)gamma);
temp = clamp(temp * outWMinOutB + outBlack, 0.f, 255.f);
- output->xyz = convert2uchar3(temp);
+ output->xyz = convert_uchar3(temp);
//output->w = input->w;
}