diff options
author | Narayan Kamath <narayan@google.com> | 2014-02-21 16:58:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 16:58:28 +0000 |
commit | 35eeb2d859d0e535b4d23bfd52db76db38b1551c (patch) | |
tree | 97ad9f2723529c8857c21d0ec33ba8963fdff1d2 /libs/hwui/DisplayListOp.h | |
parent | 2fb1fa6c88901fd16f1756a744a5f066f95c9253 (diff) | |
parent | 6191044729b2dace9c9b4b15b19a8839377d8973 (diff) | |
download | frameworks_base-35eeb2d859d0e535b4d23bfd52db76db38b1551c.zip frameworks_base-35eeb2d859d0e535b4d23bfd52db76db38b1551c.tar.gz frameworks_base-35eeb2d859d0e535b4d23bfd52db76db38b1551c.tar.bz2 |
am 61910447: am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"
* commit '6191044729b2dace9c9b4b15b19a8839377d8973':
Fixes for 64bit in libhwui
Diffstat (limited to 'libs/hwui/DisplayListOp.h')
-rw-r--r-- | libs/hwui/DisplayListOp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 0589a02..b5a66f6 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -1410,7 +1410,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 | |