summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2014-11-12 12:35:42 -0800
committerDan Stoza <stoza@google.com>2014-11-12 12:35:42 -0800
commita41f29cc000680f402d51972dfad0a46c5a3cb07 (patch)
tree30d930c7e79e72b163b9a7c8cafa5ea5ed38bbc7
parentd71152fc8d21b0fdac9617aea76395f6bd850014 (diff)
downloadframeworks_base-a41f29cc000680f402d51972dfad0a46c5a3cb07.zip
frameworks_base-a41f29cc000680f402d51972dfad0a46c5a3cb07.tar.gz
frameworks_base-a41f29cc000680f402d51972dfad0a46c5a3cb07.tar.bz2
Change GraphicBuffer fields from uint to int
This changes fields which are tracking GraphicBuffer width and height to use int instead of uint32_t, which is in keeping with a recent change to GraphicBuffer itself and avoids a warning (error since this build uses -Werror). Change-Id: I66c5c3e3d321d4ef5ea2c40c86ac068111c18662
-rw-r--r--libs/hwui/DeferredLayerUpdater.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/DeferredLayerUpdater.h b/libs/hwui/DeferredLayerUpdater.h
index ef385b9..61efafe 100644
--- a/libs/hwui/DeferredLayerUpdater.h
+++ b/libs/hwui/DeferredLayerUpdater.h
@@ -38,7 +38,7 @@ public:
ANDROID_API DeferredLayerUpdater(renderthread::RenderThread& thread, Layer* layer);
ANDROID_API ~DeferredLayerUpdater();
- ANDROID_API bool setSize(uint32_t width, uint32_t height) {
+ ANDROID_API bool setSize(int width, int height) {
if (mWidth != width || mHeight != height) {
mWidth = width;
mHeight = height;
@@ -83,8 +83,8 @@ public:
private:
// Generic properties
- uint32_t mWidth;
- uint32_t mHeight;
+ int mWidth;
+ int mHeight;
bool mBlend;
SkColorFilter* mColorFilter;
int mAlpha;