commit eca28fb8c005d213a9d0a577868ea839ff9457e5
author Rahul Chaudhry <rahulchaudhry@google.com> Wed Nov 16 21:59:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 16 21:59:56 2016 +0000
tree ddbf6b98c6410887f0a24030b3d85fc02935bfa2
parent a5f8c5dd59a527ef436022eff59e46f09dc50e27
parent 8ef4c38abe1563b0c317aaff1b67f6ab4da3c2a0

Merge "Remove unnecessary uses of reinterpret_cast." am: c470dc8681 am: 849a911dee am: 6a6e54da04
am: 8ef4c38abe

Change-Id: I795ab2874d6fc8c6087c89df72e7a2341e97e387

minui/graphics.cpp

diff --git a/minui/graphics.cpp b/minui/graphics.cpp
index d5d8d52..a3a9588 100644
--- a/minui/graphics.cpp
+++ b/minui/graphics.cpp
@@ -306,7 +306,7 @@
     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;

minui/resources.cpp

diff --git a/minui/resources.cpp b/minui/resources.cpp
index 34e7b8b..9ccbf4b 100644
--- a/minui/resources.cpp
+++ b/minui/resources.cpp
@@ -308,7 +308,7 @@
     }
     free(p_row);
 
-    *pSurface = reinterpret_cast<GRSurface**>(surface);
+    *pSurface = surface;
 
 exit:
     png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -436,7 +436,7 @@
                 memcpy(surface->data + i*w, row.data(), w);
             }
 
-            *pSurface = reinterpret_cast<GRSurface*>(surface);
+            *pSurface = surface;
             break;
         } else {
             int i;