summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomer Shalev <shalev.tomer@gmail.com>2010-01-15 11:48:21 +0000
committerTomer Shalev <shalev.tomer@gmail.com>2010-01-15 11:48:21 +0000
commitda41706f650bee77b0652536528ef637783b6579 (patch)
tree57200455a212e23a20aba674aa57878984d38053
parent12173598e448ce7a7a71694221f8d5e10fc57e66 (diff)
downloadrockbox-da41706f650bee77b0652536528ef637783b6579.tar.gz
rockbox-da41706f650bee77b0652536528ef637783b6579.zip
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
-rw-r--r--apps/plugins/fractals/fractal.c3
-rw-r--r--apps/plugins/fractals/fractal.h4
-rw-r--r--apps/plugins/fractals/mandelbrot_set.c8
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 @@
30#include "fractal_sets.h" 30#include "fractal_sets.h"
31#include "mandelbrot_set.h" 31#include "mandelbrot_set.h"
32 32
33#if (LCD_DEPTH < 8) 33#ifdef USEGSLIB
34#define USEGSLIB
35#define MYLCD(fn) grey_ub_ ## fn 34#define MYLCD(fn) grey_ub_ ## fn
36#define MYLCD_UPDATE() 35#define MYLCD_UPDATE()
37#define MYXLCD(fn) grey_ub_ ## fn 36#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 @@
21#ifndef _FRACTAL_H 21#ifndef _FRACTAL_H
22#define _FRACTAL_H 22#define _FRACTAL_H
23 23
24#if (LCD_DEPTH < 8)
25#define USEGSLIB
26#endif
27
24/* variable button definitions */ 28/* variable button definitions */
25#if CONFIG_KEYPAD == RECORDER_PAD 29#if CONFIG_KEYPAD == RECORDER_PAD
26#define FRACTAL_QUIT BUTTON_OFF 30#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 @@
25#define BUTTON_YIELD_TIMEOUT (HZ / 4) 25#define BUTTON_YIELD_TIMEOUT (HZ / 4)
26 26
27#ifdef USEGSLIB 27#ifdef USEGSLIB
28unsigned char imgbuffer[LCD_HEIGHT]; 28static unsigned char imgbuffer[LCD_HEIGHT];
29#else 29#else
30fb_data imgbuffer[LCD_HEIGHT]; 30static fb_data imgbuffer[LCD_HEIGHT];
31#endif 31#endif
32 32
33/* 8 entries cyclical, last entry is black (convergence) */ 33/* 8 entries cyclical, last entry is black (convergence) */
@@ -60,9 +60,7 @@ static const unsigned char color[9] = {
60#define MB_XFAC (MB_YFAC*LCD_WIDTH/MB_HEIGHT) 60#define MB_XFAC (MB_YFAC*LCD_WIDTH/MB_HEIGHT)
61#endif 61#endif
62 62
63#if (LCD_DEPTH < 8) 63#ifndef USEGSLIB
64#define USEGSLIB
65#else
66#define UPDATE_FREQ (HZ/50) 64#define UPDATE_FREQ (HZ/50)
67#endif 65#endif
68 66