maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-282: Correct common surface transfer functions to copy/ignore alpha channel as required.

Browse Source
This commit is contained in:
Michael Jumper 2017-04-24 11:57:12 -07:00
parent 69caa9936b
commit 691a3ab840
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/surface.c
View File

@ -724,51 +724,51 @@ static int __guac_common_surface_transfer_int(guac_transfer_function op, uint32_
break;
case GUAC_TRANSFER_BINARY_NSRC:
*dst = ~(*src);
*dst = *src ^ 0x00FFFFFF;
break;
case GUAC_TRANSFER_BINARY_NDEST:
*dst = ~(*dst);
*dst = *dst ^ 0x00FFFFFF;
break;
case GUAC_TRANSFER_BINARY_AND:
*dst = (*dst) & (*src);
*dst = ((*dst) & (0xFF000000 | *src));
break;
case GUAC_TRANSFER_BINARY_NAND:
*dst = ~((*dst) & (*src));
*dst = ((*dst) & (0xFF000000 | *src)) ^ 0x00FFFFFF;
break;
case GUAC_TRANSFER_BINARY_OR:
*dst = (*dst) | (*src);
*dst = ((*dst) | (0x00FFFFFF & *src));
break;
case GUAC_TRANSFER_BINARY_NOR:
*dst = ~((*dst) | (*src));
*dst = ((*dst) | (0x00FFFFFF & *src)) ^ 0x00FFFFFF;
break;
case GUAC_TRANSFER_BINARY_XOR:
*dst = (*dst) ^ (*src);
*dst = ((*dst) ^ (0x00FFFFFF & *src));
break;
case GUAC_TRANSFER_BINARY_XNOR:
*dst = ~((*dst) ^ (*src));
*dst = ((*dst) ^ (0x00FFFFFF & *src)) ^ 0x00FFFFFF;
break;
case GUAC_TRANSFER_BINARY_NSRC_AND:
*dst = (*dst) & ~(*src);
*dst = ((*dst) & (0xFF000000 | (*src ^ 0x00FFFFFF)));
break;
case GUAC_TRANSFER_BINARY_NSRC_NAND:
*dst = ~((*dst) & ~(*src));
*dst = ((*dst) & (0xFF000000 | (*src ^ 0x00FFFFFF))) ^ 0x00FFFFFF;
break;
case GUAC_TRANSFER_BINARY_NSRC_OR:
*dst = (*dst) | ~(*src);
*dst = ((*dst) | (0x00FFFFFF & (*src ^ 0x00FFFFFF)));
break;
case GUAC_TRANSFER_BINARY_NSRC_NOR:
*dst = ~((*dst) | ~(*src));
*dst = ((*dst) | (0x00FFFFFF & (*src ^ 0x00FFFFFF))) ^ 0x00FFFFFF;
break;
}