From da41706f650bee77b0652536528ef637783b6579 Mon Sep 17 00:00:00 2001 From: Tomer Shalev Date: Fri, 15 Jan 2010 11:48:21 +0000 Subject: Fractals: Fix yellow - Have USEGSLIB be defined in fractals.h - BTW the plugin name was renamed to fractals from mandelbrot, because it now provide the basis to use other fractals set, such as the Julia set. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24235 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/fractals/fractal.c | 3 +-- apps/plugins/fractals/fractal.h | 4 ++++ apps/plugins/fractals/mandelbrot_set.c | 8 +++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/plugins/fractals/fractal.c b/apps/plugins/fractals/fractal.c index a086652647..41c06d36ab 100644 --- a/apps/plugins/fractals/fractal.c +++ b/apps/plugins/fractals/fractal.c @@ -30,8 +30,7 @@ #include "fractal_sets.h" #include "mandelbrot_set.h" -#if (LCD_DEPTH < 8) -#define USEGSLIB +#ifdef USEGSLIB #define MYLCD(fn) grey_ub_ ## fn #define MYLCD_UPDATE() #define MYXLCD(fn) grey_ub_ ## fn diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index e1dfd5b6c9..7fbfaa526d 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h @@ -21,6 +21,10 @@ #ifndef _FRACTAL_H #define _FRACTAL_H +#if (LCD_DEPTH < 8) +#define USEGSLIB +#endif + /* variable button definitions */ #if CONFIG_KEYPAD == RECORDER_PAD #define FRACTAL_QUIT BUTTON_OFF diff --git a/apps/plugins/fractals/mandelbrot_set.c b/apps/plugins/fractals/mandelbrot_set.c index 077858d24f..fdd741d658 100644 --- a/apps/plugins/fractals/mandelbrot_set.c +++ b/apps/plugins/fractals/mandelbrot_set.c @@ -25,9 +25,9 @@ #define BUTTON_YIELD_TIMEOUT (HZ / 4) #ifdef USEGSLIB -unsigned char imgbuffer[LCD_HEIGHT]; +static unsigned char imgbuffer[LCD_HEIGHT]; #else -fb_data imgbuffer[LCD_HEIGHT]; +static fb_data imgbuffer[LCD_HEIGHT]; #endif /* 8 entries cyclical, last entry is black (convergence) */ @@ -60,9 +60,7 @@ static const unsigned char color[9] = { #define MB_XFAC (MB_YFAC*LCD_WIDTH/MB_HEIGHT) #endif -#if (LCD_DEPTH < 8) -#define USEGSLIB -#else +#ifndef USEGSLIB #define UPDATE_FREQ (HZ/50) #endif -- cgit v1.2.3