summaryrefslogtreecommitdiffstats
path: root/apps/plugins/pictureflow
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2009-05-21 01:08:57 +0000
committerAndrew Mahone <andrew.mahone@gmail.com>2009-05-21 01:08:57 +0000
commitf28fcb0f32a0fb170490e0f12b654ef8d6776531 (patch)
tree4ebe6e9413e6490469481ca4ac881792bee854a4 /apps/plugins/pictureflow
parentd208abe46dc971544b8cf16ba9a8383649872479 (diff)
downloadrockbox-f28fcb0f32a0fb170490e0f12b654ef8d6776531.tar.gz
rockbox-f28fcb0f32a0fb170490e0f12b654ef8d6776531.tar.bz2
rockbox-f28fcb0f32a0fb170490e0f12b654ef8d6776531.zip
Fix cover corruption reported in PictureFlow by Maurus Cuelenaere, bump CACHE_VERSION to force cache rebuilds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21005 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/pictureflow')
-rw-r--r--apps/plugins/pictureflow/pictureflow.c28
1 files changed, 20 insertions, 8 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index c67825453b..2bf8c20802 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -228,7 +228,7 @@ typedef fb_data pix_t;
#define ERROR_BUFFER_FULL -2
/* current version for cover cache */
-#define CACHE_VERSION 2
+#define CACHE_VERSION 3
#define CONFIG_VERSION 1
#define CONFIG_FILE "pictureflow.cfg"
@@ -603,6 +603,18 @@ static inline uint32_t div255(uint32_t val)
}
#define SCALE_VAL(val,out) div255((val) * (out) + 127)
+#define SCALE_VAL32(val, out) \
+({ \
+ uint32_t val__ = (val) * (out); \
+ val__ = ((((val__ >> 8) + val__) >> 8) + val__ + 128) >> 8; \
+ val__; \
+})
+#define SCALE_VAL8(val, out) \
+({ \
+ unsigned val__ = (val) * (out); \
+ val__ = ((val__ >> 8) + val__ + 128) >> 8; \
+ val__; \
+})
static void output_row_8_transposed(uint32_t row, void * row_in,
struct scaler_context *ctx)
@@ -618,9 +630,9 @@ static void output_row_8_transposed(uint32_t row, void * row_in,
unsigned r, g, b;
for (; dest < end; dest += ctx->bm->height)
{
- r = qp->red;
- g = qp->green;
- b = (qp++)->blue;
+ r = SCALE_VAL8(qp->red, 31);
+ g = SCALE_VAL8(qp->green, 63);
+ b = SCALE_VAL8((qp++)->blue, 31);
*dest = LCD_RGBPACK_LCD(r,g,b);
}
#endif
@@ -637,10 +649,10 @@ static void output_row_32_transposed(uint32_t row, void * row_in,
*dest = SC_MUL((*qp++) + ctx->round, ctx->divisor);
#else
struct uint32_rgb *qp = (struct uint32_rgb*)row_in;
- uint32_t rb_mul = SCALE_VAL(ctx->divisor, 31),
- rb_rnd = SCALE_VAL(ctx->round, 31),
- g_mul = SCALE_VAL(ctx->divisor, 63),
- g_rnd = SCALE_VAL(ctx->round, 63);
+ uint32_t rb_mul = SCALE_VAL32(ctx->divisor, 31),
+ rb_rnd = SCALE_VAL32(ctx->round, 31),
+ g_mul = SCALE_VAL32(ctx->divisor, 63),
+ g_rnd = SCALE_VAL32(ctx->round, 63);
int r, g, b;
for (; dest < end; dest += ctx->bm->height)
{