summaryrefslogtreecommitdiffstats
path: root/webclients/novnc/include/display.js
diff options
context:
space:
mode:
authorChristian Beier <[email protected]>2016-06-03 11:09:47 +0200
committerChristian Beier <[email protected]>2016-06-03 11:09:47 +0200
commit962e1082e835b95abc448cacba2c9ea5cdd200c1 (patch)
tree730791c1d9af622a4ba2b9ebdf48c2eded259264 /webclients/novnc/include/display.js
parent15dd6470c552c7c8c112f0f78bde414b9f6a2714 (diff)
downloadlibtdevnc-962e1082e835b95abc448cacba2c9ea5cdd200c1.tar.gz
libtdevnc-962e1082e835b95abc448cacba2c9ea5cdd200c1.zip
Update bundled noVNC to latest release 0.5.1
Fixes https://github.com/LibVNC/libvncserver/issues/54
Diffstat (limited to 'webclients/novnc/include/display.js')
-rw-r--r--webclients/novnc/include/display.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/webclients/novnc/include/display.js b/webclients/novnc/include/display.js
index 2f1211a..a42b854 100644
--- a/webclients/novnc/include/display.js
+++ b/webclients/novnc/include/display.js
@@ -76,7 +76,7 @@ var Display;
}
if (this._prefer_js === null) {
- Util.Info("Preferring javascript operations");
+ Util.Info("Prefering javascript operations");
this._prefer_js = true;
}
@@ -318,7 +318,7 @@ var Display;
// Clearing the current viewport first fixes the issue
this._drawCtx.clearRect(0, 0, this._viewportLoc.w, this._viewportLoc.h);
}
- this.resize(640, 20);
+ this.resize(240, 20);
this._drawCtx.clearRect(0, 0, this._viewportLoc.w, this._viewportLoc.h);
}
@@ -713,6 +713,12 @@ var Display;
cur.push(rgb[1]); // green
cur.push(rgb[0]); // red
cur.push(alpha); // alpha
+ } else {
+ idx = ((w0 * y) + x) * 4;
+ cur.push(pixels[idx + 2]); // blue
+ cur.push(pixels[idx + 1]); // green
+ cur.push(pixels[idx]); // red
+ cur.push(alpha); // alpha
}
}
}