diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2010-01-15 06:17:56 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2010-01-15 06:17:56 +0000 |
commit | 4794891c971dd546e279ac928a1fcba837df7a09 (patch) | |
tree | 88c5cd0a6377757b1040f16f11bf3bc0513ffd2c /apps/plugins/fractals | |
parent | 7719d297f2a1da0e45fd39cad21e99e23fd695c8 (diff) | |
download | rockbox-4794891c971dd546e279ac928a1fcba837df7a09.tar.gz rockbox-4794891c971dd546e279ac928a1fcba837df7a09.zip |
Fractals: Fix red
- Define painting buffer inside fractal set implementation
- Add missing USEGLIB define
- Removed mandelbrot.c that was forgotten in last commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24231 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/fractals')
-rw-r--r-- | apps/plugins/fractals/fractal.c | 3 | ||||
-rw-r--r-- | apps/plugins/fractals/fractal_sets.h | 6 | ||||
-rw-r--r-- | apps/plugins/fractals/mandelbrot_set.c | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/apps/plugins/fractals/fractal.c b/apps/plugins/fractals/fractal.c index 3a0c785bdd..a086652647 100644 --- a/apps/plugins/fractals/fractal.c +++ b/apps/plugins/fractals/fractal.c | |||
@@ -45,9 +45,6 @@ | |||
45 | GREY_INFO_STRUCT | 45 | GREY_INFO_STRUCT |
46 | static unsigned char *gbuf; | 46 | static unsigned char *gbuf; |
47 | static size_t gbuf_size = 0; | 47 | static size_t gbuf_size = 0; |
48 | unsigned char imgbuffer[LCD_HEIGHT]; | ||
49 | #else | ||
50 | fb_data imgbuffer[LCD_HEIGHT]; | ||
51 | #endif | 48 | #endif |
52 | 49 | ||
53 | #define REDRAW_NONE 0 | 50 | #define REDRAW_NONE 0 |
diff --git a/apps/plugins/fractals/fractal_sets.h b/apps/plugins/fractals/fractal_sets.h index c5339d63d7..2d0ff7d930 100644 --- a/apps/plugins/fractals/fractal_sets.h +++ b/apps/plugins/fractals/fractal_sets.h | |||
@@ -24,12 +24,6 @@ | |||
24 | #include "lib/grey.h" | 24 | #include "lib/grey.h" |
25 | #include "lib/xlcd.h" | 25 | #include "lib/xlcd.h" |
26 | 26 | ||
27 | #ifdef USEGSLIB | ||
28 | extern unsigned char imgbuffer[LCD_HEIGHT]; | ||
29 | #else | ||
30 | extern fb_data imgbuffer[LCD_HEIGHT]; | ||
31 | #endif | ||
32 | |||
33 | struct fractal_rect | 27 | struct fractal_rect |
34 | { | 28 | { |
35 | int px_min; | 29 | int px_min; |
diff --git a/apps/plugins/fractals/mandelbrot_set.c b/apps/plugins/fractals/mandelbrot_set.c index ccc65b8e91..22f81ea4bb 100644 --- a/apps/plugins/fractals/mandelbrot_set.c +++ b/apps/plugins/fractals/mandelbrot_set.c | |||
@@ -24,6 +24,12 @@ | |||
24 | 24 | ||
25 | #define BUTTON_YIELD_TIMEOUT (HZ / 4) | 25 | #define BUTTON_YIELD_TIMEOUT (HZ / 4) |
26 | 26 | ||
27 | #ifdef USEGSLIB | ||
28 | unsigned char imgbuffer[LCD_HEIGHT]; | ||
29 | #else | ||
30 | fb_data imgbuffer[LCD_HEIGHT]; | ||
31 | #endif | ||
32 | |||
27 | /* 8 entries cyclical, last entry is black (convergence) */ | 33 | /* 8 entries cyclical, last entry is black (convergence) */ |
28 | #ifdef HAVE_LCD_COLOR | 34 | #ifdef HAVE_LCD_COLOR |
29 | static const fb_data color[9] = { | 35 | static const fb_data color[9] = { |
@@ -55,6 +61,7 @@ static const unsigned char color[9] = { | |||
55 | #endif | 61 | #endif |
56 | 62 | ||
57 | #if (LCD_DEPTH < 8) | 63 | #if (LCD_DEPTH < 8) |
64 | #define USEGLIB | ||
58 | #else | 65 | #else |
59 | #define UPDATE_FREQ (HZ/50) | 66 | #define UPDATE_FREQ (HZ/50) |
60 | #endif | 67 | #endif |