diff options
| author | 2014-02-21 16:47:38 +0000 | |
|---|---|---|
| committer | 2014-02-21 16:47:38 +0000 | |
| commit | 7942397b3174a9642996979ae8b4aafb313dc2e2 (patch) | |
| tree | 4221e740615802ee628f428cb07ad5fdfd747679 /libs/hwui/PixelBuffer.cpp | |
| parent | 1648f042f31df54c25a725c4c5ca2c852a10ef0e (diff) | |
| parent | 192563407964926537d688d4098054c3834341c0 (diff) | |
am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"
* commit '192563407964926537d688d4098054c3834341c0':
Fixes for 64bit in libhwui
Diffstat (limited to 'libs/hwui/PixelBuffer.cpp')
| -rw-r--r-- | libs/hwui/PixelBuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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)); } /////////////////////////////////////////////////////////////////////////////// |