From a7a78b3b52923467cd3879ce2f5c9ff74662b8fa Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Wed, 28 Dec 2011 11:47:35 +0000 Subject: Fix warnings from r31453 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31454 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/imageviewer/jpeg/jpeg_decoder.c | 1 + apps/plugins/pictureflow/pictureflow.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/imageviewer/jpeg/jpeg_decoder.c b/apps/plugins/imageviewer/jpeg/jpeg_decoder.c index 3c43c5d303..0adff53788 100644 --- a/apps/plugins/imageviewer/jpeg/jpeg_decoder.c +++ b/apps/plugins/imageviewer/jpeg/jpeg_decoder.c @@ -1423,6 +1423,7 @@ int jpeg_decode(struct jpeg* p_jpeg, unsigned char* p_pixel[1], int downscale, else return -1; /* not supported */ /* init bitstream, fake a restart to make it start */ + bs.get_buffer = 0; bs.next_input_byte = p_jpeg->p_entropy_data; bs.bits_left = 0; bs.input_end = p_jpeg->p_entropy_end; diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 1b9683460e..224dc81667 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -2645,7 +2645,7 @@ static void error_wait(const char *message) Main function that also contain the main plasma algorithm. */ -static int main(void) +static int pictureflow_main(void) { int ret; @@ -2963,7 +2963,7 @@ enum plugin_status plugin_start(const void *parameter) buf = (void*)(grey_buf_used + (char*)buf); #endif - ret = main(); + ret = pictureflow_main(); if ( ret == PLUGIN_OK || ret == PLUGIN_GOTO_WPS) { if (configfile_save(CONFIG_FILE, config, CONFIG_NUM_ITEMS, CONFIG_VERSION)) -- cgit v1.2.3