diff options
| author | 2015-01-05 15:51:13 -0800 | |
|---|---|---|
| committer | 2015-01-05 16:49:13 -0800 | |
| commit | d41c4d8c732095ae99c955b6b82f7306633004b1 (patch) | |
| tree | dbb2e26c6c5a80c7ccf43e5cd5fb1554cc603555 /libs/hwui/Texture.cpp | |
| parent | 8dfaa4904205772cdceee63ef3989bcdedf1a914 (diff) | |
Add overrides and switch to nullptr keyword for all files
Adds remaining missing overrides and nullptr usages, missed due to
an extreme failure in tool usage.
Change-Id: I56abd72975a3999ad13330003c348db40f59aebf
Diffstat (limited to 'libs/hwui/Texture.cpp')
| -rw-r--r-- | libs/hwui/Texture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/Texture.cpp b/libs/hwui/Texture.cpp index e783905b677f..58fd972e3a63 100644 --- a/libs/hwui/Texture.cpp +++ b/libs/hwui/Texture.cpp @@ -25,14 +25,14 @@ namespace android { namespace uirenderer { Texture::Texture(): id(0), generation(0), blend(false), width(0), height(0), - cleanup(false), bitmapSize(0), mipMap(false), uvMapper(NULL), isInUse(false), + cleanup(false), bitmapSize(0), mipMap(false), uvMapper(nullptr), isInUse(false), mWrapS(GL_CLAMP_TO_EDGE), mWrapT(GL_CLAMP_TO_EDGE), mMinFilter(GL_NEAREST), mMagFilter(GL_NEAREST), mFirstFilter(true), mFirstWrap(true), mCaches(Caches::getInstance()) { } Texture::Texture(Caches& caches): id(0), generation(0), blend(false), width(0), height(0), - cleanup(false), bitmapSize(0), mipMap(false), uvMapper(NULL), isInUse(false), + cleanup(false), bitmapSize(0), mipMap(false), uvMapper(nullptr), isInUse(false), mWrapS(GL_CLAMP_TO_EDGE), mWrapT(GL_CLAMP_TO_EDGE), mMinFilter(GL_NEAREST), mMagFilter(GL_NEAREST), mFirstFilter(true), mFirstWrap(true), mCaches(caches) { |