drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '192563407964926537d688d4098054c3834341c0':
  Fixes for 64bit in libhwui
This commit is contained in:
Narayan Kamath
2014-02-21 16:47:38 +00:00
committed by Android Git Automerger
parent 1648f042f3 1925634079
commit 7942397b31
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/DisplayListOp.h
View File

@ -1444,7 +1444,7 @@ public:
DeferredDisplayList::kOpBatch_Text : DeferredDisplayList::kOpBatch_Text :
DeferredDisplayList::kOpBatch_ColorText; 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 // don't merge decorated text - the decorations won't draw in order
bool noDecorations = !(mPaint->getFlags() & (SkPaint::kUnderlineText_Flag | bool noDecorations = !(mPaint->getFlags() & (SkPaint::kUnderlineText_Flag |

2
libs/hwui/PixelBuffer.cpp
View File

@ -151,7 +151,7 @@ void GpuPixelBuffer::upload(uint32_t x, uint32_t y, uint32_t width, uint32_t hei
mCaches.bindPixelBuffer(mBuffer); mCaches.bindPixelBuffer(mBuffer);
unmap(); unmap();
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, mFormat, glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, mFormat,
GL_UNSIGNED_BYTE, (void*) offset); GL_UNSIGNED_BYTE, reinterpret_cast<void*>(offset));
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////