Merge pull request #8233 from orbea/sixel

Fix warnings with --enable-sixel.
This commit is contained in:
Twinaphex 2019-02-09 00:27:11 +01:00 committed by GitHub
commit aac14a00a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions

View File

@ -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;

View File

@ -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;