Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "convert2uchar3." into honeycomb

Browse Source
This commit is contained in:
Shih-wei Liao
2011-01-13 02:03:51 -08:00
committed by Android (Google) Code Review
parent 2ea9aaa245 16095fc4c8
commit 3ae5017b1b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
View File

@@ -55,6 +55,9 @@ void setGamma(float g) {
gamma = (float3)g; gamma = (float3)g;
} }
//sliao
uchar3 convert2uchar3(float3 xyz);
void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32_t y) { void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32_t y) {
uchar4 *output = (uchar4 *)v_out; uchar4 *output = (uchar4 *)v_out;
const FilterStruct *fs = (const FilterStruct *)usrData; const FilterStruct *fs = (const FilterStruct *)usrData;
@@ -84,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 = pow(temp, (float3)gamma);
temp = clamp(temp * outWMinOutB + outBlack, 0.f, 255.f); temp = clamp(temp * outWMinOutB + outBlack, 0.f, 255.f);
output->xyz = convert_uchar3(temp); output->xyz = convert2uchar3(temp);
//output->w = input->w; //output->w = input->w;
} }

BIN
libs/rs/rslib.bc
View File

Binary file not shown.