summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDees Troy <dees_troy@teamw.in>2013-09-10 15:46:29 +0200
committerGerrit Code Review <gerrit@198.50.184.117>2013-09-10 15:46:29 +0200
commitabaa9ca8f3d3b7fa9ec6454d0ff03f5351313993 (patch)
treefdaf095e6ed67689ff865d602ce53be1db10c279
parentMerge "another fix to ignore space then = sign" into twrp2.7 (diff)
parentHack-fix build with different system/core/charger versions (diff)
downloadandroid_bootable_recovery-abaa9ca8f3d3b7fa9ec6454d0ff03f5351313993.tar
android_bootable_recovery-abaa9ca8f3d3b7fa9ec6454d0ff03f5351313993.tar.gz
android_bootable_recovery-abaa9ca8f3d3b7fa9ec6454d0ff03f5351313993.tar.bz2
android_bootable_recovery-abaa9ca8f3d3b7fa9ec6454d0ff03f5351313993.tar.lz
android_bootable_recovery-abaa9ca8f3d3b7fa9ec6454d0ff03f5351313993.tar.xz
android_bootable_recovery-abaa9ca8f3d3b7fa9ec6454d0ff03f5351313993.tar.zst
android_bootable_recovery-abaa9ca8f3d3b7fa9ec6454d0ff03f5351313993.zip
Diffstat (limited to '')
-rw-r--r--minui/graphics.c7
-rw-r--r--minui/minui.h7
2 files changed, 12 insertions, 2 deletions
diff --git a/minui/graphics.c b/minui/graphics.c
index 4968eac7a..9ee77b3aa 100644
--- a/minui/graphics.c
+++ b/minui/graphics.c
@@ -223,7 +223,12 @@ void gr_font_size(int *x, int *y)
*y = gr_font->cheight;
}
-int gr_text(int x, int y, const char *s, int bold)
+int gr_text(int x, int y, const char *s, ...)
+{
+ return gr_text_impl(x, y, s, 0);
+}
+
+int gr_text_impl(int x, int y, const char *s, int bold)
{
GGLContext *gl = gr_context;
GRFont *font = gr_font;
diff --git a/minui/minui.h b/minui/minui.h
index 1b8dd059b..ccd501f85 100644
--- a/minui/minui.h
+++ b/minui/minui.h
@@ -37,7 +37,12 @@ void gr_fb_blank(bool blank);
void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
void gr_fill(int x1, int y1, int x2, int y2);
-int gr_text(int x, int y, const char *s, int bold);
+
+// system/core/charger uses different gr_print signatures in diferent
+// Android versions, either with or without int bold.
+int gr_text(int x, int y, const char *s, ...);
+int gr_text_impl(int x, int y, const char *s, int bold);
+
void gr_texticon(int x, int y, gr_surface icon);
int gr_measure(const char *s);
void gr_font_size(int *x, int *y);