jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tight decoding when using binary/non-base64 connection.

This commit is contained in:
Joel Martin 2012-08-15 12:45:53 -05:00
parent 4dd1bb1ecb
commit 14717eb468
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rfb.js
View File

@ -1252,11 +1252,11 @@ encHandlers.HEXTILE = function display_hextile() {
rQi += FBU.bytes - 1; rQi += FBU.bytes - 1;
} else { } else {
if (FBU.subencoding & 0x02) { // Background if (FBU.subencoding & 0x02) { // Background
FBU.background = rQ.slice(rQi, rQi + fb_Bpp); FBU.background = rQ.subarray(rQi, rQi + fb_Bpp);
rQi += fb_Bpp; rQi += fb_Bpp;
} }
if (FBU.subencoding & 0x04) { // Foreground if (FBU.subencoding & 0x04) { // Foreground
FBU.foreground = rQ.slice(rQi, rQi + fb_Bpp); FBU.foreground = rQ.subarray(rQi, rQi + fb_Bpp);
rQi += fb_Bpp; rQi += fb_Bpp;
} }
@ -1266,7 +1266,7 @@ encHandlers.HEXTILE = function display_hextile() {
rQi += 1; rQi += 1;
for (s = 0; s < subrects; s += 1) { for (s = 0; s < subrects; s += 1) {
if (FBU.subencoding & 0x10) { // SubrectsColoured if (FBU.subencoding & 0x10) { // SubrectsColoured
color = rQ.slice(rQi, rQi + fb_Bpp); color = rQ.subarray(rQi, rQi + fb_Bpp);
rQi += fb_Bpp; rQi += fb_Bpp;
} else { } else {
color = FBU.foreground; color = FBU.foreground;

4
include/util.js
View File

@ -18,6 +18,10 @@ var Util = {};
* Make arrays quack * Make arrays quack
*/ */
Array.prototype.subarray = function (start, end) {
this.slice(start, end);
};
Array.prototype.push8 = function (num) { Array.prototype.push8 = function (num) {
this.push(num & 0xFF); this.push(num & 0xFF);
}; };