From cf67217cbf4be43c05ef3efbd88a3ad8b47744b4 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Mon, 12 Apr 2010 11:21:03 -0500
Subject: [PATCH] Change to RGB ordering.

---
 canvas.js | 6 +++---
 vnc.js    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/canvas.js b/canvas.js
index 2f9db49..b223490 100644
--- a/canvas.js
+++ b/canvas.js
@@ -139,9 +139,9 @@ draw: function () {
 rfbImage: function(x, y, width, height, arr) {
     var img = Canvas.ctx.createImageData(width, height);
     for (var i=0; i < (width * height); i++) {
-        img.data[i*4 + 0] = arr[i*4 + 2];
+        img.data[i*4 + 0] = arr[i*4 + 0];
         img.data[i*4 + 1] = arr[i*4 + 1];
-        img.data[i*4 + 2] = arr[i*4 + 0];
+        img.data[i*4 + 2] = arr[i*4 + 2];
         img.data[i*4 + 3] = 255; // Set Alpha
     }
     Canvas.ctx.putImageData(img, x, y);
@@ -149,7 +149,7 @@ rfbImage: function(x, y, width, height, arr) {
 },
 
 rfbRect: function(x, y, width, height, color) {
-    Canvas.ctx.fillStyle = "rgb(" + color[2] + "," + color[1] + "," + color[0] + ")";  
+    Canvas.ctx.fillStyle = "rgb(" + color[0] + "," + color[1] + "," + color[2] + ")";  
     Canvas.ctx.fillRect(x, y, width, height);
 },
 
diff --git a/vnc.js b/vnc.js
index fc274d4..255b8ce 100644
--- a/vnc.js
+++ b/vnc.js
@@ -346,9 +346,9 @@ setPixelFormat: function () {
     arr.push16(255);  // red-max
     arr.push16(255);  // green-max
     arr.push16(255);  // blue-max
-    arr.push8(16);    // red-shift
+    arr.push8(0);    // red-shift
     arr.push8(8);     // green-shift
-    arr.push8(0);     // blue-shift
+    arr.push8(16);     // blue-shift
 
     arr.push8(0);  // padding
     arr.push8(0);  // padding