summaryrefslogtreecommitdiffstats
path: root/minui/graphics.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.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.cpp')
-rw-r--r--minui/graphics.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/minui/graphics.cpp b/minui/graphics.cpp
index ab56a6fd6..0680c32bb 100644
--- a/minui/graphics.cpp
+++ b/minui/graphics.cpp
@@ -298,14 +298,14 @@ static void gr_init_font(void)
// fall back to the compiled-in font.
- gr_font = reinterpret_cast<GRFont*>(calloc(1, sizeof(*gr_font)));
- gr_font->texture = reinterpret_cast<GRSurface*>(malloc(sizeof(*gr_font->texture)));
+ gr_font = static_cast<GRFont*>(calloc(sizeof(*gr_font), 1));
+ gr_font->texture = static_cast<GRSurface*>(malloc(sizeof(*gr_font->texture)));
gr_font->texture->width = font.width;
gr_font->texture->height = font.height;
gr_font->texture->row_bytes = font.width;
gr_font->texture->pixel_bytes = 1;
- unsigned char* bits = reinterpret_cast<unsigned char*>(malloc(font.width * font.height));
+ unsigned char* bits = static_cast<unsigned char*>(malloc(font.width * font.height));
gr_font->texture->data = reinterpret_cast<unsigned char*>(bits);
unsigned char data;