summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-05-19 17:03:23 +0000
committerJens Arnold <amiconn@rockbox.org>2004-05-19 17:03:23 +0000
commit0d23d0adea67050f41792b788360b54e6a41f446 (patch)
treec2c740d3c26cb8cb890f40305a540f269c2a73a4 /apps
parent007e1d1af37bd3412bab3c263cd1e5033c42b751 (diff)
JPEG viewer now uses the 'official' grayscale framework
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4649 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/jpeg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index 556972f768..be9e4db5e2 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -27,7 +27,7 @@
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP /* and also not for the Player */
-#include "grayscale.h"
+#include "gray.h"
/******************************* Globals ***********************************/
@@ -1754,9 +1754,7 @@ int main(char* filename)
/* initialize the grayscale buffer:
* 112 pixels wide, 8 rows (64 pixels) high, (try to) reserve
* 32 bitplanes for 33 shades of gray. (uses 28856 bytes)*/
- align(&buf, &buf_size, 4); // 32 bit align
- graysize = sizeof(tGraybuf) + sizeof(long) + (112 * 8 + sizeof(long)) * 32;
- grayscales = gray_init_buffer(buf, graysize, 112, 8, 32) + 1;
+ grayscales = gray_init_buffer(buf, buf_size, 112, 8, 32, &graysize) + 1;
buf += graysize;
buf_size -= graysize;
if (grayscales < 33 || buf_size <= 0)
@@ -1906,6 +1904,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb = api; /* copy to global api pointer */
+ /* This plugin uses the grayscale framework, so initialize */
+ gray_init(api);
ret = main((char*)parameter);
if (ret == PLUGIN_USB_CONNECTED)