From 78e00eed4f98816b5a9992566a451ef74102359a Mon Sep 17 00:00:00 2001 From: teru Date: Thu, 21 Jan 2010 12:27:07 +0000 Subject: [PATCH] Fractals: this should fix bugs on simulator for greyscale LCD targets. * moved #define USEGSLIB to fractal_sets.h and include only needed header file. * include plugin.h so that LCD_DEPTH is defined. * explicitly include fractal_sets.h in mandelbrot_set.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24309 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/fractals/fractal.h | 4 ---- apps/plugins/fractals/fractal_sets.h | 6 ++++++ apps/plugins/fractals/mandelbrot_set.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 6c0af2298..cac0df48c 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h @@ -21,10 +21,6 @@ #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/fractal_sets.h b/apps/plugins/fractals/fractal_sets.h index 3b5e3c785..b2eaa589d 100644 --- a/apps/plugins/fractals/fractal_sets.h +++ b/apps/plugins/fractals/fractal_sets.h @@ -21,8 +21,14 @@ #ifndef _FRACTAL_SETS_H #define _FRACTAL_SETS_H +#include "plugin.h" + +#if (LCD_DEPTH < 8) +#define USEGSLIB #include "lib/grey.h" +#else #include "lib/xlcd.h" +#endif #define DELTA 8 /* Panning moves 1/DELTA of screen */ diff --git a/apps/plugins/fractals/mandelbrot_set.c b/apps/plugins/fractals/mandelbrot_set.c index 013b46245..85f1b4ba7 100644 --- a/apps/plugins/fractals/mandelbrot_set.c +++ b/apps/plugins/fractals/mandelbrot_set.c @@ -20,6 +20,7 @@ * KIND, either express or implied. * ****************************************************************************/ +#include "fractal_sets.h" #include "mandelbrot_set.h" #define BUTTON_YIELD_TIMEOUT (HZ / 4) -- 2.11.4.GIT