diff options
| author | 2014-02-21 16:58:28 +0000 | |
|---|---|---|
| committer | 2014-02-21 16:58:28 +0000 | |
| commit | 35eeb2d859d0e535b4d23bfd52db76db38b1551c (patch) | |
| tree | 97ad9f2723529c8857c21d0ec33ba8963fdff1d2 | |
| parent | 2fb1fa6c88901fd16f1756a744a5f066f95c9253 (diff) | |
| parent | 6191044729b2dace9c9b4b15b19a8839377d8973 (diff) | |
am 61910447: am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"
* commit '6191044729b2dace9c9b4b15b19a8839377d8973':
Fixes for 64bit in libhwui
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 2 | ||||
| -rw-r--r-- | libs/hwui/PixelBuffer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 0589a022f13b..b5a66f6fdafe 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -1410,7 +1410,7 @@ public: DeferredDisplayList::kOpBatch_Text : DeferredDisplayList::kOpBatch_ColorText; - deferInfo.mergeId = (mergeid_t)mPaint->getColor(); + deferInfo.mergeId = reinterpret_cast<mergeid_t>(mPaint->getColor()); // don't merge decorated text - the decorations won't draw in order bool noDecorations = !(mPaint->getFlags() & (SkPaint::kUnderlineText_Flag | diff --git a/libs/hwui/PixelBuffer.cpp b/libs/hwui/PixelBuffer.cpp index 36e89c6a23cf..5b642b993a2e 100644 --- a/libs/hwui/PixelBuffer.cpp +++ b/libs/hwui/PixelBuffer.cpp @@ -151,7 +151,7 @@ void GpuPixelBuffer::upload(uint32_t x, uint32_t y, uint32_t width, uint32_t hei mCaches.bindPixelBuffer(mBuffer); unmap(); glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, mFormat, - GL_UNSIGNED_BYTE, (void*) offset); + GL_UNSIGNED_BYTE, reinterpret_cast<void*>(offset)); } /////////////////////////////////////////////////////////////////////////////// |