commit 8ef4c38abe1563b0c317aaff1b67f6ab4da3c2a0
author Rahul Chaudhry <rahulchaudhry@google.com> Wed Nov 16 21:52:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 16 21:52:26 2016 +0000
tree 9b8b6868aca953bc91a8abbd9ce1d5ae684d4929
parent 120076ea51d8da03e78a2e80988ae74653eb0c3a
parent 6a6e54da0448c6d111d1bac64fdf3a744e503f8c

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

Change-Id: Ia0783f4d936d844284cf488481318e8b96133066

minui/graphics.cpp

diff --git a/minui/graphics.cpp b/minui/graphics.cpp
index 0680c32..dcca3ec 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;