diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-21 14:23:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-21 14:23:57 +0000 |
| commit | 22c66639093a634b5688372d261d003b0478c450 (patch) | |
| tree | bb7a2e55ec9588e0dce75d372198182b4f0eb497 /libs | |
| parent | 05cebdc2abd05b0dca351306cb039245d50c67ae (diff) | |
| parent | 73fc558e44be259c0833c8c8074ad2333bcb378d (diff) | |
| download | frameworks_base-22c66639093a634b5688372d261d003b0478c450.zip frameworks_base-22c66639093a634b5688372d261d003b0478c450.tar.gz frameworks_base-22c66639093a634b5688372d261d003b0478c450.tar.bz2 | |
Merge "Fixes for 64bit in libhwui"
Diffstat (limited to 'libs')
| -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 326805a..842e028 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -1444,7 +1444,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 36e89c6..5b642b9 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)); } /////////////////////////////////////////////////////////////////////////////// |