summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stephen Hines <srhines@google.com> 2010-11-15 17:09:02 -0800
committer Stephen Hines <srhines@google.com> 2010-11-15 17:09:02 -0800
commitbaa19bc59cd15e8a224cfae10454dc970baac23f (patch)
treefc617082b15d55c62167889a7450028028bc9d93
parentb86c89c1a1070a076fcfec8e9bf743245a996d8b (diff)
Remove WARs for zero-init + destructors.
Change-Id: I919db554f3f6fa1fb027402298602a16fba4a235
-rw-r--r--libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs3
-rw-r--r--libs/rs/java/Samples/src/com/android/samples/rslist.rs3
-rw-r--r--libs/rs/java/tests/src/com/android/rs/test/rslist.rs3
3 files changed, 3 insertions, 6 deletions
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
index 698540bb1750..3e811154bcaf 100644
--- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
+++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
@@ -64,7 +64,7 @@ static void computeGaussianWeights() {
static void copyInput() {
- rs_allocation ain = {0};
+ rs_allocation ain;
rsSetObject(&ain,rsGetAllocation(InPixel));
uint32_t dimx = rsAllocationGetDimX(ain);
uint32_t dimy = rsAllocationGetDimY(ain);
@@ -73,7 +73,6 @@ static void copyInput() {
ScratchPixel1[x + y * dimx] = convert_float4(InPixel[x + y * dimx]);
}
}
- rsClearObject(&ain);
}
void filter() {
diff --git a/libs/rs/java/Samples/src/com/android/samples/rslist.rs b/libs/rs/java/Samples/src/com/android/samples/rslist.rs
index f29276a4efe2..0baccb8ae412 100644
--- a/libs/rs/java/Samples/src/com/android/samples/rslist.rs
+++ b/libs/rs/java/Samples/src/com/android/samples/rslist.rs
@@ -46,7 +46,7 @@ int root(int launchID) {
rsgBindFont(gItalic);
color(0.2, 0.2, 0.2, 0);
- rs_allocation listAlloc = {0};
+ rs_allocation listAlloc;
rsSetObject(&listAlloc, rsGetAllocation(gList));
int allocSize = rsAllocationGetDimX(listAlloc);
@@ -67,7 +67,6 @@ int root(int launchID) {
}
currentYPos += itemHeight;
}
- rsClearObject(&listAlloc);
return 10;
}
diff --git a/libs/rs/java/tests/src/com/android/rs/test/rslist.rs b/libs/rs/java/tests/src/com/android/rs/test/rslist.rs
index d1fde570691d..f354a72a21ea 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/rslist.rs
+++ b/libs/rs/java/tests/src/com/android/rs/test/rslist.rs
@@ -47,7 +47,7 @@ int root(int launchID) {
rsgBindFont(gFont);
color(0.2, 0.2, 0.2, 0);
- rs_allocation listAlloc = {0};
+ rs_allocation listAlloc;
rsSetObject(&listAlloc, rsGetAllocation(gList));
int allocSize = rsAllocationGetDimX(listAlloc);
@@ -103,7 +103,6 @@ int root(int launchID) {
}
currentYPos += itemHeight;
}
- rsClearObject(&listAlloc);
return 10;
}