From 78dbe1cef1a0dabf9e7e0d935c7ef95ea14f3281 Mon Sep 17 00:00:00 2001
From: orbea <orbea@fredslev.dk>
Date: Fri, 8 Feb 2019 14:12:40 -0800
Subject: [PATCH] Fix warnings with --enable-sixel.

---
 gfx/drivers_font/sixel_font.c             |  2 +-
 menu/drivers_display/menu_display_sixel.c | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/gfx/drivers_font/sixel_font.c b/gfx/drivers_font/sixel_font.c
index 674d9d460a..03cef2e098 100644
--- a/gfx/drivers_font/sixel_font.c
+++ b/gfx/drivers_font/sixel_font.c
@@ -76,7 +76,7 @@ static const struct font_glyph *sixel_font_get_glyph(
 
 static void sixel_render_msg(video_frame_info_t *video_info,
       void *data, const char *msg,
-      const void *userdata)
+      const struct font_params *userdata)
 {
    float x, y, scale;
    unsigned width, height;
diff --git a/menu/drivers_display/menu_display_sixel.c b/menu/drivers_display/menu_display_sixel.c
index 023365b048..984de305c3 100644
--- a/menu/drivers_display/menu_display_sixel.c
+++ b/menu/drivers_display/menu_display_sixel.c
@@ -25,30 +25,33 @@
 
 #include "../menu_driver.h"
 
-static void *menu_display_sixel_get_default_mvp(void)
+static void *menu_display_sixel_get_default_mvp(video_frame_info_t *video_info)
 {
    return NULL;
 }
 
-static void menu_display_sixel_blend_begin(void)
+static void menu_display_sixel_blend_begin(video_frame_info_t *video_info)
 {
 }
 
-static void menu_display_sixel_blend_end(void)
+static void menu_display_sixel_blend_end(video_frame_info_t *video_info)
 {
 }
 
-static void menu_display_sixel_draw(void *data)
+static void menu_display_sixel_draw(menu_display_ctx_draw_t *data,
+      video_frame_info_t *video_info)
 {
    (void)data;
 }
 
-static void menu_display_sixel_draw_pipeline(void *data)
+static void menu_display_sixel_draw_pipeline(menu_display_ctx_draw_t *data,
+      video_frame_info_t *video_info)
 {
    (void)data;
 }
 
-static void menu_display_sixel_viewport(void *data)
+static void menu_display_sixel_viewport(menu_display_ctx_draw_t *data,
+      video_frame_info_t *video_info)
 {
    (void)data;
 }
@@ -57,7 +60,9 @@ static void menu_display_sixel_restore_clear_color(void)
 {
 }
 
-static void menu_display_sixel_clear_color(menu_display_ctx_clearcolor_t *clearcolor)
+static void menu_display_sixel_clear_color(
+      menu_display_ctx_clearcolor_t *clearcolor,
+      video_frame_info_t *video_info)
 {
    (void)clearcolor;