From f3111e73b0b1fb57929b2164deed663c09898456 Mon Sep 17 00:00:00 2001 From: funman Date: Thu, 10 Jun 2010 19:46:14 +0000 Subject: [PATCH] ppmviewer/rockpaint: do not steal the audiobuffer (and stop playback) if the plugin buffer is large enough git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26750 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/ppmviewer.c | 12 +++++++++--- apps/plugins/rockpaint.c | 14 ++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/apps/plugins/ppmviewer.c b/apps/plugins/ppmviewer.c index af66b5873..c947af10b 100644 --- a/apps/plugins/ppmviewer.c +++ b/apps/plugins/ppmviewer.c @@ -294,11 +294,17 @@ enum plugin_status plugin_start(const void* parameter) if(!parameter) return PLUGIN_ERROR; size_t buffer_size; - char *audiobuf = rb->plugin_get_audio_buffer(&buffer_size); + char *audiobuf = rb->plugin_get_buffer(&buffer_size); if (buffer_size < PPM_MAXSIZE + LCD_WIDTH * LCD_HEIGHT + 1) { - rb->splash(HZ, "Not enough memory"); - return PLUGIN_ERROR; + /* steal from audiobuffer if plugin buffer is too small */ + audiobuf = rb->plugin_get_audio_buffer(&buffer_size); + + if (buffer_size < PPM_MAXSIZE + LCD_WIDTH * LCD_HEIGHT + 1) + { + rb->splash(HZ, "Not enough memory"); + return PLUGIN_ERROR; + } } /* align on 16 bits */ diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index d762737ce..264e4f6b1 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -3031,12 +3031,18 @@ static int save_bitmap( char *file ) enum plugin_status plugin_start(const void* parameter) { size_t buffer_size; - buffer = (buf*) - (((uintptr_t)rb->plugin_get_audio_buffer(&buffer_size) + 3) & ~3); + buffer = (buf*) (((uintptr_t)rb->plugin_get_buffer(&buffer_size) + 3) & ~3); if (buffer_size < sizeof(*buffer) + 3) { - rb->splash(HZ, "Not enough memory"); - return PLUGIN_ERROR; + /* steal from audiobuffer if plugin buffer is too small */ + buffer = (buf*) + (((uintptr_t)rb->plugin_get_audio_buffer(&buffer_size) + 3) & ~3); + + if (buffer_size < sizeof(*buffer) + 3) + { + rb->splash(HZ, "Not enough memory"); + return PLUGIN_ERROR; + } } rb->lcd_set_foreground(COLOR_WHITE); -- 2.11.4.GIT