summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@android.com>2014-01-17 20:11:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-17 20:11:38 +0000
commit3a3bdd042d8bd056d31a1b37332e91c1307060a0 (patch)
treeafa8c5eabb73efeec3539b802ff75dce223c0c45
parentaa27b97f0b67e8a5e0fa542e6db1af07dc0152d1 (diff)
parentee846d3e74eda006f4bbf17cb4844b4d8f9c5cb0 (diff)
downloadframeworks_base-3a3bdd042d8bd056d31a1b37332e91c1307060a0.zip
frameworks_base-3a3bdd042d8bd056d31a1b37332e91c1307060a0.tar.gz
frameworks_base-3a3bdd042d8bd056d31a1b37332e91c1307060a0.tar.bz2
am ee846d3e: am 38cf0704: am e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference"
* commit 'ee846d3e74eda006f4bbf17cb4844b4d8f9c5cb0': Initialize pointer members to NULL to avoid illegal reference
-rw-r--r--libs/hwui/SkiaShader.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/SkiaShader.h b/libs/hwui/SkiaShader.h
index d71f8ee..6015761 100644
--- a/libs/hwui/SkiaShader.h
+++ b/libs/hwui/SkiaShader.h
@@ -146,7 +146,7 @@ struct SkiaBitmapShader: public SkiaShader {
GLuint* textureUnit);
private:
- SkiaBitmapShader() {
+ SkiaBitmapShader() : mBitmap(NULL), mTexture(NULL) {
}
SkBitmap* mBitmap;