diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-11-08 22:23:29 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-11-08 22:23:29 +0000 |
commit | a102253cf2ffaac5d3d54c312d694864d8307b41 (patch) | |
tree | 3a4f7ceb008bd164f65b84043fd7fff143fe0ae5 /apps | |
parent | 1280f322ecb7973472b6d408aff7e273c517242d (diff) | |
download | rockbox-a102253cf2ffaac5d3d54c312d694864d8307b41.tar.gz rockbox-a102253cf2ffaac5d3d54c312d694864d8307b41.zip |
Make pictureflow compile again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30941 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 6 |
1 files changed, 4 insertions, 2 deletions
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, | |||
668 | #endif | 668 | #endif |
669 | } | 669 | } |
670 | 670 | ||
671 | /* read_image_file() is called without FORMAT_TRANSPARENT so | ||
672 | * it's safe to ignore alpha channel in the next two functions */ | ||
671 | static void output_row_32_transposed(uint32_t row, void * row_in, | 673 | static void output_row_32_transposed(uint32_t row, void * row_in, |
672 | struct scaler_context *ctx) | 674 | struct scaler_context *ctx) |
673 | { | 675 | { |
@@ -678,7 +680,7 @@ static void output_row_32_transposed(uint32_t row, void * row_in, | |||
678 | for (; dest < end; dest += ctx->bm->height) | 680 | for (; dest < end; dest += ctx->bm->height) |
679 | *dest = SC_OUT(*qp++, ctx); | 681 | *dest = SC_OUT(*qp++, ctx); |
680 | #else | 682 | #else |
681 | struct uint32_rgb *qp = (struct uint32_rgb*)row_in; | 683 | struct uint32_argb *qp = (struct uint32_argb*)row_in; |
682 | int r, g, b; | 684 | int r, g, b; |
683 | for (; dest < end; dest += ctx->bm->height) | 685 | for (; dest < end; dest += ctx->bm->height) |
684 | { | 686 | { |
@@ -697,7 +699,7 @@ static void output_row_32_transposed_fromyuv(uint32_t row, void * row_in, | |||
697 | { | 699 | { |
698 | pix_t *dest = (pix_t*)ctx->bm->data + row; | 700 | pix_t *dest = (pix_t*)ctx->bm->data + row; |
699 | pix_t *end = dest + ctx->bm->height * ctx->bm->width; | 701 | pix_t *end = dest + ctx->bm->height * ctx->bm->width; |
700 | struct uint32_rgb *qp = (struct uint32_rgb*)row_in; | 702 | struct uint32_argb *qp = (struct uint32_argb*)row_in; |
701 | for (; dest < end; dest += ctx->bm->height) | 703 | for (; dest < end; dest += ctx->bm->height) |
702 | { | 704 | { |
703 | unsigned r, g, b, y, u, v; | 705 | unsigned r, g, b, y, u, v; |