aboutsummaryrefslogtreecommitdiffstats
path: root/minui
diff options
context:
space:
mode:
authorRahul Chaudhry2016-11-16 15:59:56 -0600
committerandroid-build-merger2016-11-16 15:59:56 -0600
commiteca28fb8c005d213a9d0a577868ea839ff9457e5 (patch)
treeddbf6b98c6410887f0a24030b3d85fc02935bfa2 /minui
parenta5f8c5dd59a527ef436022eff59e46f09dc50e27 (diff)
parent8ef4c38abe1563b0c317aaff1b67f6ab4da3c2a0 (diff)
downloadplatform-bootable-recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.tar.gz
platform-bootable-recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.tar.xz
platform-bootable-recovery-eca28fb8c005d213a9d0a577868ea839ff9457e5.zip
Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee am: 6a6e54da04
am: 8ef4c38abe Change-Id: I795ab2874d6fc8c6087c89df72e7a2341e97e387
Diffstat (limited to 'minui')
-rw-r--r--minui/graphics.cpp2
-rw-r--r--minui/resources.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/minui/graphics.cpp b/minui/graphics.cpp
index d5d8d526..a3a95881 100644
--- a/minui/graphics.cpp
+++ b/minui/graphics.cpp
@@ -306,7 +306,7 @@ static void gr_init_font(void)
306 gr_font->texture->pixel_bytes = 1; 306 gr_font->texture->pixel_bytes = 1;
307 307
308 unsigned char* bits = static_cast<unsigned char*>(malloc(font.width * font.height)); 308 unsigned char* bits = static_cast<unsigned char*>(malloc(font.width * font.height));
309 gr_font->texture->data = reinterpret_cast<unsigned char*>(bits); 309 gr_font->texture->data = bits;
310 310
311 unsigned char data; 311 unsigned char data;
312 unsigned char* in = font.rundata; 312 unsigned char* in = font.rundata;
diff --git a/minui/resources.cpp b/minui/resources.cpp
index 34e7b8be..9ccbf4b1 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,
308 } 308 }
309 free(p_row); 309 free(p_row);
310 310
311 *pSurface = reinterpret_cast<GRSurface**>(surface); 311 *pSurface = surface;
312 312
313exit: 313exit:
314 png_destroy_read_struct(&png_ptr, &info_ptr, NULL); 314 png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -436,7 +436,7 @@ int res_create_localized_alpha_surface(const char* name,
436 memcpy(surface->data + i*w, row.data(), w); 436 memcpy(surface->data + i*w, row.data(), w);
437 } 437 }
438 438
439 *pSurface = reinterpret_cast<GRSurface*>(surface); 439 *pSurface = surface;
440 break; 440 break;
441 } else { 441 } else {
442 int i; 442 int i;