From bfa85a7117fcf28ff19f2507f61db4620da2e828 Mon Sep 17 00:00:00 2001 From: Vincent Desprez Date: Tue, 10 Jan 2017 22:54:56 +0100 Subject: [PATCH] Handling non-topdown lz_rgb Signed-off-by: Vincent Desprez --- display.js | 3 --- lz.js | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/display.js b/display.js index 3f5d7bf..7719b23 100644 --- a/display.js +++ b/display.js @@ -288,9 +288,6 @@ SpiceDisplayConn.prototype.process_channel_message = function(msg) return false; } - if (draw_copy.data.src_bitmap.lz_rgb.top_down != 1) - this.log_warn("FIXME: Implement non top down support for lz_rgb"); - var source_img = convert_spice_lz_to_web(canvas.context, draw_copy.data.src_bitmap.lz_rgb); if (! source_img) diff --git a/lz.js b/lz.js index 4292eac..53c1141 100644 --- a/lz.js +++ b/lz.js @@ -141,6 +141,19 @@ function lz_rgb32_decompress(in_buf, at, out_buf, type, default_alpha) return encoder - 1; } +function flip_image_data(img) +{ + var wb = img.width * 4; + var h = img.height; + var temp_h = h; + var buff = new Uint8Array(img.width * img.height * 4); + while (temp_h--) + { + buff.set(img.data.subarray(temp_h * wb, (temp_h + 1) * wb), (h - temp_h - 1) * wb); + } + img.data.set(buff); +} + function convert_spice_lz_to_web(context, lz_image) { var at; @@ -150,6 +163,9 @@ function convert_spice_lz_to_web(context, lz_image) var ret = context.createImageData(lz_image.width, lz_image.height); at = lz_rgb32_decompress(u8, 0, ret.data, LZ_IMAGE_TYPE_RGB32, lz_image.type != LZ_IMAGE_TYPE_RGBA); + if (!lz_image.top_down) + flip_image_data(ret); + if (lz_image.type == LZ_IMAGE_TYPE_RGBA) lz_rgb32_decompress(u8, at, ret.data, LZ_IMAGE_TYPE_RGBA, false); }