tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 6a6e54da04

Change-Id: Ia0783f4d936d844284cf488481318e8b96133066
This commit is contained in:
Rahul Chaudhry 2016-11-16 21:52:26 +00:00 committed by android-build-merger
commit 8ef4c38abe
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
minui/graphics.cpp
View file

@ -306,7 +306,7 @@ static void gr_init_font(void)
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;

4
minui/resources.cpp
View file

@ -308,7 +308,7 @@ int res_create_multi_display_surface(const char* name, int* frames, int* fps,
}
free(p_row);
*pSurface = reinterpret_cast<GRSurface**>(surface);
*pSurface = surface;
exit:
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);
}
*pSurface = reinterpret_cast<GRSurface*>(surface);
*pSurface = surface;
break;
} else {
int i;