summaryrefslogtreecommitdiffstats
path: root/minui/graphics_adf.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-11-16 19:25:16 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-11-16 19:25:16 +0100
commitb8c4ae9f806ccff6447c29dd61154a374c5af398 (patch)
tree5843939ddc11042ae3d8519ae2a897e2cbad2087 /minui/graphics_adf.cpp
parentresolve merge conflicts of 4f86f26 to stage-aosp-master (diff)
parentMerge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." (diff)
downloadandroid_bootable_recovery-b8c4ae9f806ccff6447c29dd61154a374c5af398.tar
android_bootable_recovery-b8c4ae9f806ccff6447c29dd61154a374c5af398.tar.gz
android_bootable_recovery-b8c4ae9f806ccff6447c29dd61154a374c5af398.tar.bz2
android_bootable_recovery-b8c4ae9f806ccff6447c29dd61154a374c5af398.tar.lz
android_bootable_recovery-b8c4ae9f806ccff6447c29dd61154a374c5af398.tar.xz
android_bootable_recovery-b8c4ae9f806ccff6447c29dd61154a374c5af398.tar.zst
android_bootable_recovery-b8c4ae9f806ccff6447c29dd61154a374c5af398.zip
Diffstat (limited to 'minui/graphics_adf.cpp')
-rw-r--r--minui/graphics_adf.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/minui/graphics_adf.cpp b/minui/graphics_adf.cpp
index 3c3541094..9e262b044 100644
--- a/minui/graphics_adf.cpp
+++ b/minui/graphics_adf.cpp
@@ -68,9 +68,9 @@ static int adf_surface_init(adf_pdata *pdata, drm_mode_modeinfo *mode, adf_surfa
surf->base.row_bytes = surf->pitch;
surf->base.pixel_bytes = (pdata->format == DRM_FORMAT_RGB565) ? 2 : 4;
- surf->base.data = reinterpret_cast<uint8_t*>(mmap(NULL,
- surf->pitch * surf->base.height, PROT_WRITE,
- MAP_SHARED, surf->fd, surf->offset));
+ surf->base.data = static_cast<uint8_t*>(mmap(NULL,
+ surf->pitch * surf->base.height, PROT_WRITE,
+ MAP_SHARED, surf->fd, surf->offset));
if (surf->base.data == MAP_FAILED) {
close(surf->fd);
return -errno;
@@ -259,7 +259,7 @@ static void adf_exit(minui_backend *backend)
minui_backend *open_adf()
{
- adf_pdata* pdata = reinterpret_cast<adf_pdata*>(calloc(1, sizeof(*pdata)));
+ adf_pdata* pdata = static_cast<adf_pdata*>(calloc(1, sizeof(*pdata)));
if (!pdata) {
perror("allocating adf backend failed");
return NULL;