summaryrefslogtreecommitdiff
path: root/libs/ui/GraphicBuffer.cpp
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2015-04-23 23:13:56 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-23 23:13:56 +0000
commit17df593eb386940a26377d2db9fcb8a60e8badba (patch)
treedd46c4d33f9176d521df74831b80c50b928c8a7f /libs/ui/GraphicBuffer.cpp
parent423b40f7bd004a8ab5bca887e3855cd20c6bcc28 (diff)
parent9aae16a47d727a2650af0f0892657b41bd88215d (diff)
am 9aae16a4: am 82e4d49b: Merge "libui/libgui: Fix errors in parceling"
* commit '9aae16a47d727a2650af0f0892657b41bd88215d': libui/libgui: Fix errors in parceling
Diffstat (limited to 'libs/ui/GraphicBuffer.cpp')
-rw-r--r--libs/ui/GraphicBuffer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
index 638ac62991..52fa0df0b1 100644
--- a/libs/ui/GraphicBuffer.cpp
+++ b/libs/ui/GraphicBuffer.cpp
@@ -303,7 +303,7 @@ status_t GraphicBuffer::flatten(void*& buffer, size_t& size, int*& fds, size_t&
static_cast<size_t>(handle->numInts) * sizeof(int));
}
- buffer = reinterpret_cast<void*>(static_cast<int*>(buffer) + sizeNeeded);
+ buffer = static_cast<void*>(static_cast<uint8_t*>(buffer) + sizeNeeded);
size -= sizeNeeded;
if (handle) {
fds += handle->numFds;
@@ -385,7 +385,7 @@ status_t GraphicBuffer::unflatten(
}
}
- buffer = reinterpret_cast<void const*>(static_cast<int const*>(buffer) + sizeNeeded);
+ buffer = static_cast<void const*>(static_cast<uint8_t const*>(buffer) + sizeNeeded);
size -= sizeNeeded;
fds += numFds;
count -= numFds;