diff options
| -rw-r--r-- | minuitwrp/events.c | 6 | ||||
| -rw-r--r-- | minuitwrp/graphics.c | 4 | ||||
| -rw-r--r-- | twrp-functions.cpp | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/minuitwrp/events.c b/minuitwrp/events.c index 52c5a7d50..557ab84e4 100644 --- a/minuitwrp/events.c +++ b/minuitwrp/events.c @@ -34,9 +34,15 @@ #define VIBRATOR_TIMEOUT_FILE "/sys/class/timed_output/vibrator/enable" #define VIBRATOR_TIME_MS 50 +#ifndef SYN_REPORT #define SYN_REPORT 0x00 +#endif +#ifndef SYN_CONFIG #define SYN_CONFIG 0x01 +#endif +#ifndef SYN_MT_REPORT #define SYN_MT_REPORT 0x02 +#endif #define ABS_MT_POSITION 0x2a /* Group a set of X and Y */ #define ABS_MT_AMPLITUDE 0x2b /* Group a set of Z and W */ diff --git a/minuitwrp/graphics.c b/minuitwrp/graphics.c index 939f098d1..b30a92ef0 100644 --- a/minuitwrp/graphics.c +++ b/minuitwrp/graphics.c @@ -402,7 +402,7 @@ int gr_textExWH(int x, int y, const char *s, void* pFont, int max_width, int max rect_x = x + cwidth; else rect_x = max_width; - if (y + font->cheight < max_height) + if (y + font->cheight < (unsigned int)(max_height)) rect_y = y + font->cheight; else rect_y = max_height; @@ -423,7 +423,7 @@ int twgr_text(int x, int y, const char *s) GGLContext *gl = gr_context; GRFont *font = gr_font; unsigned off; - unsigned cwidth; + unsigned cwidth = 0; y -= font->ascent; diff --git a/twrp-functions.cpp b/twrp-functions.cpp index 320001723..01f854193 100644 --- a/twrp-functions.cpp +++ b/twrp-functions.cpp @@ -394,7 +394,7 @@ void TWFunc::Output_Version(void) { Path = DataManager::GetSettingsStoragePath(); if (!PartitionManager.Mount_By_Path(Path, false)) { - LOGI("Unable to mount '%s' to write version number.\n"); + LOGI("Unable to mount '%s' to write version number.\n", Path.c_str()); return; } Path += "/TWRP/.version"; |