aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2015-04-15 12:58:56 -0500
committerElliott Hughes2015-04-15 12:58:56 -0500
commit0a5cb0c7cd995ae0330a7d54a8d0db5d892a48a9 (patch)
tree625c21a7688ed613dd22fc9fc9e6c68cec7c44bc /screen_ui.h
parent6e435abfeb7256b5ea82ca37166acf36e3f98085 (diff)
downloadplatform-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.h')
-rw-r--r--screen_ui.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/screen_ui.h b/screen_ui.h
index d473b8e9..46165d90 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -73,13 +73,13 @@ class ScreenRecoveryUI : public RecoveryUI {
73 bool rtl_locale; 73 bool rtl_locale;
74 74
75 pthread_mutex_t updateMutex; 75 pthread_mutex_t updateMutex;
76 gr_surface backgroundIcon[5]; 76 GRSurface* backgroundIcon[5];
77 gr_surface backgroundText[5]; 77 GRSurface* backgroundText[5];
78 gr_surface *installation; 78 GRSurface** installation;
79 gr_surface progressBarEmpty; 79 GRSurface* progressBarEmpty;
80 gr_surface progressBarFill; 80 GRSurface* progressBarFill;
81 gr_surface stageMarkerEmpty; 81 GRSurface* stageMarkerEmpty;
82 gr_surface stageMarkerFill; 82 GRSurface* stageMarkerFill;
83 83
84 ProgressType progressBarType; 84 ProgressType progressBarType;
85 85
@@ -127,9 +127,9 @@ class ScreenRecoveryUI : public RecoveryUI {
127 void DrawTextLine(int* y, const char* line, bool bold); 127 void DrawTextLine(int* y, const char* line, bool bold);
128 void DrawTextLines(int* y, const char* const* lines); 128 void DrawTextLines(int* y, const char* const* lines);
129 129
130 void LoadBitmap(const char* filename, gr_surface* surface); 130 void LoadBitmap(const char* filename, GRSurface** surface);
131 void LoadBitmapArray(const char* filename, int* frames, gr_surface** surface); 131 void LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface);
132 void LoadLocalizedBitmap(const char* filename, gr_surface* surface); 132 void LoadLocalizedBitmap(const char* filename, GRSurface** surface);
133}; 133};
134 134
135#endif // RECOVERY_UI_H 135#endif // RECOVERY_UI_H