commit 35eeb2d859d0e535b4d23bfd52db76db38b1551c
author Narayan Kamath <narayan@google.com> Fri Feb 21 16:58:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 21 16:58:28 2014 +0000
tree 97ad9f2723529c8857c21d0ec33ba8963fdff1d2
parent 2fb1fa6c88901fd16f1756a744a5f066f95c9253
parent 6191044729b2dace9c9b4b15b19a8839377d8973

am 61910447: am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"

* commit '6191044729b2dace9c9b4b15b19a8839377d8973':
  Fixes for 64bit in libhwui

libs/hwui/DisplayListOp.h

diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h
index 0589a022..b5a66f6 100644
--- a/libs/hwui/DisplayListOp.h
+++ b/libs/hwui/DisplayListOp.h
@@ -1410,7 +1410,7 @@
                 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 |

libs/hwui/PixelBuffer.cpp

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 @@
     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));
 }
 
 ///////////////////////////////////////////////////////////////////////////////