Make pictureflow compile again.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30941 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-11-08 22:23:29 +00:00
parent 1280f322ec
commit a102253cf2

View file

@ -668,6 +668,8 @@ static void output_row_8_transposed(uint32_t row, void * row_in,
#endif #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, static void output_row_32_transposed(uint32_t row, void * row_in,
struct scaler_context *ctx) 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) for (; dest < end; dest += ctx->bm->height)
*dest = SC_OUT(*qp++, ctx); *dest = SC_OUT(*qp++, ctx);
#else #else
struct uint32_rgb *qp = (struct uint32_rgb*)row_in; struct uint32_argb *qp = (struct uint32_argb*)row_in;
int r, g, b; int r, g, b;
for (; dest < end; dest += ctx->bm->height) 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 *dest = (pix_t*)ctx->bm->data + row;
pix_t *end = dest + ctx->bm->height * ctx->bm->width; 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) for (; dest < end; dest += ctx->bm->height)
{ {
unsigned r, g, b, y, u, v; unsigned r, g, b, y, u, v;