diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-09 10:10:26 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-09 10:10:26 +0000 |
commit | e3b1d78dfc06ec69248558630d3a4afd7c1ec9c2 (patch) | |
tree | c580d0b7e80c1dd86b2efa600b30ed2599631878 /apps | |
parent | 91efc162564cd9c04677e2e38550cde21995b06e (diff) | |
download | rockbox-e3b1d78dfc06ec69248558630d3a4afd7c1ec9c2.tar.gz rockbox-e3b1d78dfc06ec69248558630d3a4afd7c1ec9c2.zip |
Fix test for direct JPEG output, bump plugin API as r20884 changed struct custom_format.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20885 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugin.h | 4 | ||||
-rw-r--r-- | apps/recorder/jpeg_load.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugin.h b/apps/plugin.h index d017d6394d..5efe3fe00c 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -129,12 +129,12 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
129 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ | 129 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ |
130 | 130 | ||
131 | /* increase this every time the api struct changes */ | 131 | /* increase this every time the api struct changes */ |
132 | #define PLUGIN_API_VERSION 150 | 132 | #define PLUGIN_API_VERSION 151 |
133 | 133 | ||
134 | /* update this to latest version if a change to the api struct breaks | 134 | /* update this to latest version if a change to the api struct breaks |
135 | backwards compatibility (and please take the opportunity to sort in any | 135 | backwards compatibility (and please take the opportunity to sort in any |
136 | new function which are "waiting" at the end of the function table) */ | 136 | new function which are "waiting" at the end of the function table) */ |
137 | #define PLUGIN_MIN_API_VERSION 150 | 137 | #define PLUGIN_MIN_API_VERSION 151 |
138 | 138 | ||
139 | /* plugin return codes */ | 139 | /* plugin return codes */ |
140 | enum plugin_status { | 140 | enum plugin_status { |
diff --git a/apps/recorder/jpeg_load.c b/apps/recorder/jpeg_load.c index 9393e60de8..177e7c098c 100644 --- a/apps/recorder/jpeg_load.c +++ b/apps/recorder/jpeg_load.c | |||
@@ -2032,8 +2032,8 @@ int read_jpeg_fd(int fd, | |||
2032 | } | 2032 | } |
2033 | p_jpeg->h_scale[0] = calc_scale(p_jpeg->x_size, bm->width); | 2033 | p_jpeg->h_scale[0] = calc_scale(p_jpeg->x_size, bm->width); |
2034 | p_jpeg->v_scale[0] = calc_scale(p_jpeg->y_size, bm->height); | 2034 | p_jpeg->v_scale[0] = calc_scale(p_jpeg->y_size, bm->height); |
2035 | if ((p_jpeg->x_size << p_jpeg->h_scale[0]) >> 3 && | 2035 | if ((p_jpeg->x_size << p_jpeg->h_scale[0]) >> 3 == bm->width && |
2036 | (p_jpeg->y_size << p_jpeg->v_scale[0]) >> 3) | 2036 | (p_jpeg->y_size << p_jpeg->v_scale[0]) >> 3 == bm->height) |
2037 | resize = false; | 2037 | resize = false; |
2038 | #ifdef HAVE_LCD_COLOR | 2038 | #ifdef HAVE_LCD_COLOR |
2039 | p_jpeg->h_scale[1] = p_jpeg->h_scale[0] + | 2039 | p_jpeg->h_scale[1] = p_jpeg->h_scale[0] + |