projects
/
guacamole-common-js.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6036c99
)
JS bitwise operators use all 32-bits, added mask to keep bitwise NOT to 8-bits
author
Matt Hortman <matt@FlintRiverSystems.com>
Mon, 5 Mar 2012 17:07:45 +0000
(12:07 -0500)
committer
Matt Hortman <matt@FlintRiverSystems.com>
Mon, 5 Mar 2012 17:07:45 +0000
(12:07 -0500)
src/main/resources/guacamole.js
patch
|
blob
|
history
diff --git
a/src/main/resources/guacamole.js
b/src/main/resources/guacamole.js
index
b3a0b33
..
aee7fae
100644
(file)
--- a/
src/main/resources/guacamole.js
+++ b/
src/main/resources/guacamole.js
@@
-680,17
+680,17
@@
Guacamole.Client.DefaultTransferFunction = {
/* Invert SRC */
0xC: function (src, dst) {
/* Invert SRC */
0xC: function (src, dst) {
- dst.red = ~src.red;
- dst.green = ~src.green;
- dst.blue = ~src.blue;
+ dst.red = 0xFF & ~src.red;
+ dst.green = 0xFF & ~src.green;
+ dst.blue = 0xFF & ~src.blue;
dst.alpha = src.alpha;
},
/* Invert DEST */
0xA: function (src, dst) {
dst.alpha = src.alpha;
},
/* Invert DEST */
0xA: function (src, dst) {
- dst.red = ~dst.red;
- dst.green = ~dst.green;
- dst.blue = ~dst.blue;
+ dst.red = 0xFF & ~dst.red;
+ dst.green = 0xFF & ~dst.green;
+ dst.blue = 0xFF & ~dst.blue;
},
/* AND */
},
/* AND */
@@
-702,9
+702,9
@@
Guacamole.Client.DefaultTransferFunction = {
/* NAND */
0xE: function (src, dst) {
/* NAND */
0xE: function (src, dst) {
- dst.red = ~( src.red & dst.red);
- dst.green = ~( src.green & dst.green);
- dst.blue = ~( src.blue & dst.blue);
+ dst.red = 0xFF & ~( src.red & dst.red);
+ dst.green = 0xFF & ~( src.green & dst.green);
+ dst.blue = 0xFF & ~( src.blue & dst.blue);
},
/* OR */
},
/* OR */
@@
-716,9
+716,9
@@
Guacamole.Client.DefaultTransferFunction = {
/* NOR */
0x8: function (src, dst) {
/* NOR */
0x8: function (src, dst) {
- dst.red = ~( src.red | dst.red);
- dst.green = ~( src.green | dst.green);
- dst.blue = ~( src.blue | dst.blue);
+ dst.red = 0xFF & ~( src.red | dst.red);
+ dst.green = 0xFF & ~( src.green | dst.green);
+ dst.blue = 0xFF & ~( src.blue | dst.blue);
},
/* XOR */
},
/* XOR */
@@
-730,37
+730,37
@@
Guacamole.Client.DefaultTransferFunction = {
/* XNOR */
0x9: function (src, dst) {
/* XNOR */
0x9: function (src, dst) {
- dst.red = ~( src.red ^ dst.red);
- dst.green = ~( src.green ^ dst.green);
- dst.blue = ~( src.blue ^ dst.blue);
+ dst.red = 0xFF & ~( src.red ^ dst.red);
+ dst.green = 0xFF & ~( src.green ^ dst.green);
+ dst.blue = 0xFF & ~( src.blue ^ dst.blue);
},
/* AND inverted source */
0x4: function (src, dst) {
},
/* AND inverted source */
0x4: function (src, dst) {
- dst.red = (~src.red & dst.red);
- dst.green = (~src.green & dst.green);
- dst.blue = (~src.blue & dst.blue);
+ dst.red = 0xFF & (~src.red & dst.red);
+ dst.green = 0xFF & (~src.green & dst.green);
+ dst.blue = 0xFF & (~src.blue & dst.blue);
},
/* OR inverted source */
0xD: function (src, dst) {
},
/* OR inverted source */
0xD: function (src, dst) {
- dst.red = (~src.red | dst.red);
- dst.green = (~src.green | dst.green);
- dst.blue = (~src.blue | dst.blue);
+ dst.red = 0xFF & (~src.red | dst.red);
+ dst.green = 0xFF & (~src.green | dst.green);
+ dst.blue = 0xFF & (~src.blue | dst.blue);
},
/* AND inverted destination */
0x2: function (src, dst) {
},
/* AND inverted destination */
0x2: function (src, dst) {
- dst.red = ( src.red & ~dst.red);
- dst.green = ( src.green & ~dst.green);
- dst.blue = ( src.blue & ~dst.blue);
+ dst.red = 0xFF & ( src.red & ~dst.red);
+ dst.green = 0xFF & ( src.green & ~dst.green);
+ dst.blue = 0xFF & ( src.blue & ~dst.blue);
},
/* OR inverted destination */
0xB: function (src, dst) {
},
/* OR inverted destination */
0xB: function (src, dst) {
- dst.red = ( src.red | ~dst.red);
- dst.green = ( src.green | ~dst.green);
- dst.blue = ( src.blue | ~dst.blue);
+ dst.red = 0xFF & ( src.red | ~dst.red);
+ dst.green = 0xFF & ( src.green | ~dst.green);
+ dst.blue = 0xFF & ( src.blue | ~dst.blue);
}
};
}
};