diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-21 08:34:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 08:34:30 -0800 |
| commit | 192563407964926537d688d4098054c3834341c0 (patch) | |
| tree | 882138a5b5f2c53cfb7d3f0cf1746bf217681744 | |
| parent | fca204a4b8771b800383c91465a48eb2cd8b3ba2 (diff) | |
| parent | 22c66639093a634b5688372d261d003b0478c450 (diff) | |
| download | frameworks_base-192563407964926537d688d4098054c3834341c0.zip frameworks_base-192563407964926537d688d4098054c3834341c0.tar.gz frameworks_base-192563407964926537d688d4098054c3834341c0.tar.bz2 | |
am 22c66639: Merge "Fixes for 64bit in libhwui"
* commit '22c66639093a634b5688372d261d003b0478c450':
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 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)); } /////////////////////////////////////////////////////////////////////////////// |