PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hack-fix build with different system/core/charger versions" into twrp2.7

Browse Source
This commit is contained in:
Dees Troy
2013-09-10 08:46:29 -05:00
committed by Gerrit Code Review
parent bc365b5e44 65fdcddec6
commit abaa9ca8f3
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minui/graphics.c
+6 -1
View File
@@ -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;
minui/minui.h
+6 -1
View File
@@ -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);