fix major bug on 32 bpp algorithm

PrettyChen · Jul 9, 2015 · 7197d2d · 7197d2d
1 parent af4785d
commit 7197d2d
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
-## 0.2.1 - 20150708
+## 0.2.3 - 20150709
+* Fix major bug on 32 bpp image decompression
+
+## 0.2.2 - 20150708
 * Fix bug on freeze event after close event
 * Remove border of canvas
 * Add better favicon

diff --git a/client/js/rle.js b/client/js/rle.js
diff --git a/obj/rle.c b/obj/rle.c
@@ -955,6 +955,21 @@ bitmap_decompress_24(uint8 * output, int output_width, int output_height, int in
 }
 
 int
-bitmap_decompress_32(uint8 * output, int width, int height, uint8* input, int size) {
-	return bitmap_decompress4(output, width, height, input, size);
+bitmap_decompress_32(uint8 * output, int output_width, int output_height, int input_width, int input_height, uint8* input, int size) {
+	uint8 * temp = (uint8*)malloc(input_width * input_height * 4);
+	RD_BOOL rv = bitmap_decompress4(temp, input_width, input_height, input, size);
+
+	// convert to rgba
+	for (int y = 0; y < output_height; y++) {
+		for (int x = 0; x < output_width; x++) {
+			uint8 r = temp[(y * input_width + x) * 4];
+			uint8 g = temp[(y * input_width + x) * 4 + 1];
+			uint8 b = temp[(y * input_width + x) * 4 + 2];
+			uint8 a = temp[(y * input_width + x) * 4 + 3];
+			((uint32*)output)[y * output_width + x] = 0xff << 24 | r << 16 | g << 8 | b;
+		}
+	}
+	free(temp);
+
+	return rv;
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "mstsc.js",
 	"author": "Sylvain Peyrefitte",
-	"version": "0.2.2",
+	"version": "0.2.3",
 	"engines": 
 	[
 		"node = 0.10.x"