diff options
author | Rahul Chaudhry <rahulchaudhry@google.com> | 2016-11-16 22:59:56 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 22:59:56 +0100 |
commit | eca28fb8c005d213a9d0a577868ea839ff9457e5 (patch) | |
tree | ddbf6b98c6410887f0a24030b3d85fc02935bfa2 | |
parent | Merge "Convert update_verifier to boot HIDL HAL" (diff) | |
parent | Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee (diff) | |
download | android_bootable_recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.tar android_bootable_recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.tar.gz android_bootable_recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.tar.bz2 android_bootable_recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.tar.lz android_bootable_recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.tar.xz android_bootable_recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.tar.zst android_bootable_recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.zip |
-rw-r--r-- | minui/graphics.cpp | 2 | ||||
-rw-r--r-- | minui/resources.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/minui/graphics.cpp b/minui/graphics.cpp index d5d8d526e..a3a958819 100644 --- a/minui/graphics.cpp +++ b/minui/graphics.cpp @@ -306,7 +306,7 @@ static void gr_init_font(void) gr_font->texture->pixel_bytes = 1; unsigned char* bits = static_cast<unsigned char*>(malloc(font.width * font.height)); - gr_font->texture->data = reinterpret_cast<unsigned char*>(bits); + gr_font->texture->data = bits; unsigned char data; unsigned char* in = font.rundata; diff --git a/minui/resources.cpp b/minui/resources.cpp index 34e7b8be3..9ccbf4b1b 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp @@ -308,7 +308,7 @@ int res_create_multi_display_surface(const char* name, int* frames, int* fps, } free(p_row); - *pSurface = reinterpret_cast<GRSurface**>(surface); + *pSurface = surface; exit: png_destroy_read_struct(&png_ptr, &info_ptr, NULL); @@ -436,7 +436,7 @@ int res_create_localized_alpha_surface(const char* name, memcpy(surface->data + i*w, row.data(), w); } - *pSurface = reinterpret_cast<GRSurface*>(surface); + *pSurface = surface; break; } else { int i; |