diff options
| author | Kévin PETIT <kevin.petit@arm.com> | 2014-02-13 11:03:40 +0000 |
|---|---|---|
| committer | Kévin PETIT <kevin.petit@arm.com> | 2014-02-21 13:07:29 +0000 |
| commit | 73fc558e44be259c0833c8c8074ad2333bcb378d (patch) | |
| tree | 7fcfe431026c8967e6f6839b9aaf876012ab825b /libs | |
| parent | 16ea3e6a5b37dc436d1089996004bcae12f5e3b0 (diff) | |
| download | frameworks_base-73fc558e44be259c0833c8c8074ad2333bcb378d.zip frameworks_base-73fc558e44be259c0833c8c8074ad2333bcb378d.tar.gz frameworks_base-73fc558e44be259c0833c8c8074ad2333bcb378d.tar.bz2 | |
Fixes for 64bit in libhwui
Using reinterpret_cast allows conversions between pointer types
and integers which don't have the same size. The corresponding
flags is -Wint-to-pointer-cast.
Change-Id: I8ff0c79d235fa6d07b8d9305edc185d946d5133d
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
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)); } /////////////////////////////////////////////////////////////////////////////// |