commit 0a5cb0c7cd995ae0330a7d54a8d0db5d892a48a9
author Elliott Hughes <enh@google.com> Wed Apr 15 10:58:56 2015 -0700
committer Elliott Hughes <enh@google.com> Wed Apr 15 10:58:56 2015 -0700
tree 625c21a7688ed613dd22fc9fc9e6c68cec7c44bc
parent 6e435abfeb7256b5ea82ca37166acf36e3f98085

Don't use typedefs that hide *s.

gr_surface was causing confusion for no good reason.

Change-Id: If7120187f9a00dd16297877fc49352185a4d4ea6

screen_ui.h

diff --git a/screen_ui.h b/screen_ui.h
index d473b8e..46165d9 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -73,13 +73,13 @@
     bool rtl_locale;
 
     pthread_mutex_t updateMutex;
-    gr_surface backgroundIcon[5];
-    gr_surface backgroundText[5];
-    gr_surface *installation;
-    gr_surface progressBarEmpty;
-    gr_surface progressBarFill;
-    gr_surface stageMarkerEmpty;
-    gr_surface stageMarkerFill;
+    GRSurface* backgroundIcon[5];
+    GRSurface* backgroundText[5];
+    GRSurface** installation;
+    GRSurface* progressBarEmpty;
+    GRSurface* progressBarFill;
+    GRSurface* stageMarkerEmpty;
+    GRSurface* stageMarkerFill;
 
     ProgressType progressBarType;
 
@@ -127,9 +127,9 @@
     void DrawTextLine(int* y, const char* line, bool bold);
     void DrawTextLines(int* y, const char* const* lines);
 
-    void LoadBitmap(const char* filename, gr_surface* surface);
-    void LoadBitmapArray(const char* filename, int* frames, gr_surface** surface);
-    void LoadLocalizedBitmap(const char* filename, gr_surface* surface);
+    void LoadBitmap(const char* filename, GRSurface** surface);
+    void LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface);
+    void LoadLocalizedBitmap(const char* filename, GRSurface** surface);
 };
 
 #endif  // RECOVERY_UI_H