2 files changed, 30 insertions, 7 deletions

diff --git a/apps/plugins/jpeg/yuv2rgb.c b/apps/plugins/jpeg/yuv2rgb.c
index c2464924fe..ed88d5416a 100644
--- a/apps/plugins/jpeg/yuv2rgb.c
+++ b/apps/plugins/jpeg/yuv2rgb.c
@@ -48,13 +48,6 @@
 #define COMPONENT_SHIFT  15
 #define MATRIX_SHIFT      7
 
-static inline int clamp_component(int x)
-{
-    if ((unsigned)x > YUV_WHITE)
-        x = x < 0 ? 0 : YUV_WHITE;
-    return x;
-}
-
 static inline int clamp_component_bits(int x, int bits)
 {
     if ((unsigned)x > (1u << bits) - 1)
diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c
index b78b953f13..7261d7a402 100644
--- a/apps/plugins/pictureflow.c
+++ b/apps/plugins/pictureflow.c
@@ -634,13 +634,43 @@ static void output_row_transposed(uint32_t row, void * row_in,
 #endif
 }
 
+#ifdef HAVE_LCD_COLOR
+static void output_row_transposed_fromyuv(uint32_t row, void * row_in,
+                                       struct scaler_context *ctx)
+{
+    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;
+    for (; dest < end; dest += ctx->bm->height)
+    {
+        unsigned r, g, b, y, u, v;
+        y = SC_MUL(qp->b + ctx->round, ctx->divisor);
+        u = SC_MUL(qp->g + ctx->round, ctx->divisor);
+        v = SC_MUL(qp->r + ctx->round, ctx->divisor);
+        qp++;
+        yuv_to_rgb(y, u, v, &r, &g, &b);
+        r = (31 * r + (r >> 3) + 127) >> 8;
+        g = (63 * g + (g >> 2) + 127) >> 8;
+        b = (31 * b + (b >> 3) + 127) >> 8;
+        *dest = LCD_RGBPACK_LCD(r, g, b);
+    }
+}
+#endif
+
 static unsigned int get_size(struct bitmap *bm)
 {
     return bm->width * bm->height * sizeof(pix_t);
 }
 
 const struct custom_format format_transposed = {
+#ifdef HAVE_LCD_COLOR
+    .output_row = {
+        output_row_transposed,
+        output_row_transposed_fromyuv
+    },
+#else
     .output_row = output_row_transposed,
+#endif
     .get_size = get_size
 };