diff options
author | Elliott Hughes | 2015-04-15 12:58:56 -0500 |
---|---|---|
committer | Elliott Hughes | 2015-04-15 12:58:56 -0500 |
commit | 0a5cb0c7cd995ae0330a7d54a8d0db5d892a48a9 (patch) | |
tree | 625c21a7688ed613dd22fc9fc9e6c68cec7c44bc /screen_ui.cpp | |
parent | 6e435abfeb7256b5ea82ca37166acf36e3f98085 (diff) | |
download | platform-bootable-recovery-0a5cb0c7cd995ae0330a7d54a8d0db5d892a48a9.tar.gz platform-bootable-recovery-0a5cb0c7cd995ae0330a7d54a8d0db5d892a48a9.tar.xz platform-bootable-recovery-0a5cb0c7cd995ae0330a7d54a8d0db5d892a48a9.zip |
Don't use typedefs that hide *s.
gr_surface was causing confusion for no good reason.
Change-Id: If7120187f9a00dd16297877fc49352185a4d4ea6
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r-- | screen_ui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp index 52f22c24..5e73d37c 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp | |||
@@ -89,11 +89,11 @@ void ScreenRecoveryUI::draw_background_locked(Icon icon) { | |||
89 | gr_clear(); | 89 | gr_clear(); |
90 | 90 | ||
91 | if (icon) { | 91 | if (icon) { |
92 | gr_surface surface = backgroundIcon[icon]; | 92 | GRSurface* surface = backgroundIcon[icon]; |
93 | if (icon == INSTALLING_UPDATE || icon == ERASING) { | 93 | if (icon == INSTALLING_UPDATE || icon == ERASING) { |
94 | surface = installation[installingFrame]; | 94 | surface = installation[installingFrame]; |
95 | } | 95 | } |
96 | gr_surface text_surface = backgroundText[icon]; | 96 | GRSurface* text_surface = backgroundText[icon]; |
97 | 97 | ||
98 | int iconWidth = gr_get_width(surface); | 98 | int iconWidth = gr_get_width(surface); |
99 | int iconHeight = gr_get_height(surface); | 99 | int iconHeight = gr_get_height(surface); |
@@ -132,7 +132,7 @@ void ScreenRecoveryUI::draw_progress_locked() { | |||
132 | if (currentIcon == ERROR) return; | 132 | if (currentIcon == ERROR) return; |
133 | 133 | ||
134 | if (currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) { | 134 | if (currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) { |
135 | gr_surface icon = installation[installingFrame]; | 135 | GRSurface* icon = installation[installingFrame]; |
136 | gr_blit(icon, 0, 0, gr_get_width(icon), gr_get_height(icon), iconX, iconY); | 136 | gr_blit(icon, 0, 0, gr_get_width(icon), gr_get_height(icon), iconX, iconY); |
137 | } | 137 | } |
138 | 138 | ||
@@ -357,21 +357,21 @@ void ScreenRecoveryUI::ProgressThreadLoop() { | |||
357 | } | 357 | } |
358 | } | 358 | } |
359 | 359 | ||
360 | void ScreenRecoveryUI::LoadBitmap(const char* filename, gr_surface* surface) { | 360 | void ScreenRecoveryUI::LoadBitmap(const char* filename, GRSurface** surface) { |
361 | int result = res_create_display_surface(filename, surface); | 361 | int result = res_create_display_surface(filename, surface); |
362 | if (result < 0) { | 362 | if (result < 0) { |
363 | LOGE("missing bitmap %s\n(Code %d)\n", filename, result); | 363 | LOGE("missing bitmap %s\n(Code %d)\n", filename, result); |
364 | } | 364 | } |
365 | } | 365 | } |
366 | 366 | ||
367 | void ScreenRecoveryUI::LoadBitmapArray(const char* filename, int* frames, gr_surface** surface) { | 367 | void ScreenRecoveryUI::LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface) { |
368 | int result = res_create_multi_display_surface(filename, frames, surface); | 368 | int result = res_create_multi_display_surface(filename, frames, surface); |
369 | if (result < 0) { | 369 | if (result < 0) { |
370 | LOGE("missing bitmap %s\n(Code %d)\n", filename, result); | 370 | LOGE("missing bitmap %s\n(Code %d)\n", filename, result); |
371 | } | 371 | } |
372 | } | 372 | } |
373 | 373 | ||
374 | void ScreenRecoveryUI::LoadLocalizedBitmap(const char* filename, gr_surface* surface) { | 374 | void ScreenRecoveryUI::LoadLocalizedBitmap(const char* filename, GRSurface** surface) { |
375 | int result = res_create_localized_alpha_surface(filename, locale, surface); | 375 | int result = res_create_localized_alpha_surface(filename, locale, surface); |
376 | if (result < 0) { | 376 | if (result < 0) { |
377 | LOGE("missing bitmap %s\n(Code %d)\n", filename, result); | 377 | LOGE("missing bitmap %s\n(Code %d)\n", filename, result); |