diff options
| author | Rahul Chaudhry <rahulchaudhry@google.com> | 2016-11-16 22:37:25 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 22:37:25 +0100 |
| commit | 849a911dee4b47133605d78d623014a166b1854c (patch) | |
| tree | d56d7512cb5564914fad42b211f49b4554377794 /minui/resources.cpp | |
| parent | Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." (diff) | |
| parent | Merge "Remove unnecessary uses of reinterpret_cast." (diff) | |
| download | android_bootable_recovery-849a911dee4b47133605d78d623014a166b1854c.tar android_bootable_recovery-849a911dee4b47133605d78d623014a166b1854c.tar.gz android_bootable_recovery-849a911dee4b47133605d78d623014a166b1854c.tar.bz2 android_bootable_recovery-849a911dee4b47133605d78d623014a166b1854c.tar.lz android_bootable_recovery-849a911dee4b47133605d78d623014a166b1854c.tar.xz android_bootable_recovery-849a911dee4b47133605d78d623014a166b1854c.tar.zst android_bootable_recovery-849a911dee4b47133605d78d623014a166b1854c.zip | |
Diffstat (limited to '')
| -rw-r--r-- | minui/resources.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/minui/resources.cpp b/minui/resources.cpp index 34e7b8be3..9ccbf4b1b 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp @@ -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; |