summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-11-09 17:38:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-09 17:38:20 -0800
commiteaf6bd1a693f7afacb63940f8d467154b578883b (patch)
tree6e928cd4186f31d45d3661a94196a68c78180f11 /libs
parent3f6a1f5e5928cfda8773da07d744993c46e3226c (diff)
parent06d69de78845659e6904ae4964e606a7f1a6a4a8 (diff)
downloadframeworks_base-eaf6bd1a693f7afacb63940f8d467154b578883b.zip
frameworks_base-eaf6bd1a693f7afacb63940f8d467154b578883b.tar.gz
frameworks_base-eaf6bd1a693f7afacb63940f8d467154b578883b.tar.bz2
Merge "Continue error check improvements and write some docs."
Diffstat (limited to 'libs')
-rw-r--r--libs/rs/rsAllocation.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index b74fa8e..28078fc 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -869,6 +869,8 @@ RsAllocation rsaAllocationCreateFromBitmap(RsContext con, uint32_t w, uint32_t h
}
} else {
rsc->setError(RS_ERROR_BAD_VALUE, "Unsupported bitmap format");
+ delete texAlloc;
+ return NULL;
}
return texAlloc;