From a102253cf2ffaac5d3d54c312d694864d8307b41 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Tue, 8 Nov 2011 22:23:29 +0000 Subject: Make pictureflow compile again. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30941 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/pictureflow/pictureflow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'apps/plugins/pictureflow/pictureflow.c') diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index a572586886..ee92ab8737 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -668,6 +668,8 @@ static void output_row_8_transposed(uint32_t row, void * row_in, #endif } +/* read_image_file() is called without FORMAT_TRANSPARENT so + * it's safe to ignore alpha channel in the next two functions */ static void output_row_32_transposed(uint32_t row, void * row_in, struct scaler_context *ctx) { @@ -678,7 +680,7 @@ static void output_row_32_transposed(uint32_t row, void * row_in, for (; dest < end; dest += ctx->bm->height) *dest = SC_OUT(*qp++, ctx); #else - struct uint32_rgb *qp = (struct uint32_rgb*)row_in; + struct uint32_argb *qp = (struct uint32_argb*)row_in; int r, g, b; for (; dest < end; dest += ctx->bm->height) { @@ -697,7 +699,7 @@ static void output_row_32_transposed_fromyuv(uint32_t row, void * row_in, { pix_t *dest = (pix_t*)ctx->bm->data + row; pix_t *end = dest + ctx->bm->height * ctx->bm->width; - struct uint32_rgb *qp = (struct uint32_rgb*)row_in; + struct uint32_argb *qp = (struct uint32_argb*)row_in; for (; dest < end; dest += ctx->bm->height) { unsigned r, g, b, y, u, v; -- cgit v1.2.3