summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ben Cheng <bccheng@google.com> 2013-02-20 14:39:35 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-02-20 14:39:35 -0800
commit08d160a366932aec170a115a1edb3bb5ac4e3a4e (patch)
tree01cf849d4c08344f8d08ba9d92efea80ca0d54c3
parent3c394a3bec3c0467d7e9f5c8ceda0501e2e61f04 (diff)
parent7a60c43d874bd047ea4b93b94c9b8771ea5739cc (diff)
am 7a60c43d: Merge "Use free for memory chunks allocated through memalign."
* commit '7a60c43d874bd047ea4b93b94c9b8771ea5739cc': Use free for memory chunks allocated through memalign.
-rw-r--r--libs/hwui/FontRenderer.cpp2
-rw-r--r--libs/hwui/TextDropShadowCache.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index 965e33a5bc56..8eb2aeb142bf 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -798,7 +798,7 @@ void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, int
mRsScript->blur(ain, aout);
// replace the original image's pointer, avoiding a copy back to the original buffer
- delete *image;
+ free(*image);
*image = outImage;
}
diff --git a/libs/hwui/TextDropShadowCache.cpp b/libs/hwui/TextDropShadowCache.cpp
index db7bd489b404..f1f35bd1711c 100644
--- a/libs/hwui/TextDropShadowCache.cpp
+++ b/libs/hwui/TextDropShadowCache.cpp
@@ -222,7 +222,7 @@ ShadowTexture* TextDropShadowCache::get(SkPaint* paint, const char* text, uint32
}
// Cleanup shadow
- delete shadow.image;
+ free(shadow.image);
}
return texture;