Merge "Remove unnecessary uses of reinterpret_cast."
am: c470dc8681
Change-Id: I44081a387bfc60ce9f9cacf5b8db0b9248c84c4d
This commit is contained in:
+1
-1
@@ -306,7 +306,7 @@ static void gr_init_font(void)
|
|||||||
gr_font->texture->pixel_bytes = 1;
|
gr_font->texture->pixel_bytes = 1;
|
||||||
|
|
||||||
unsigned char* bits = static_cast<unsigned char*>(malloc(font.width * font.height));
|
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 data;
|
||||||
unsigned char* in = font.rundata;
|
unsigned char* in = font.rundata;
|
||||||
|
|||||||
+2
-2
@@ -308,7 +308,7 @@ int res_create_multi_display_surface(const char* name, int* frames, int* fps,
|
|||||||
}
|
}
|
||||||
free(p_row);
|
free(p_row);
|
||||||
|
|
||||||
*pSurface = reinterpret_cast<GRSurface**>(surface);
|
*pSurface = surface;
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
|
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);
|
memcpy(surface->data + i*w, row.data(), w);
|
||||||
}
|
}
|
||||||
|
|
||||||
*pSurface = reinterpret_cast<GRSurface*>(surface);
|
*pSurface = surface;
|
||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
int i;
|
int i;
|
||||||
|
|||||||
Reference in New Issue
Block a user