commit c470dc8681364b4e00bda0a28386a20d6b5f6048
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 16 21:27:31 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 16 21:27:32 2016 +0000
tree a9350bc8e8a49bf7324dfdc06b3d4d8c933a4eb4
parent 0bedc8e14c8872393ed1a9c3daad4091a3c90b0d
parent 1cf93f5f74680e22044c6e0051a975770a4b819b

Merge "Remove unnecessary uses of reinterpret_cast."

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;