Fix transfer function indices.

This commit is contained in:
Michael Jumper 2012-02-27 13:14:19 -08:00
parent 554d6e1ec1
commit c55bef0c41

View File

@ -113,42 +113,42 @@ typedef enum guac_composite_mode {
typedef enum guac_transfer_function { typedef enum guac_transfer_function {
/* Constant functions */ /* ABCD */ /* Constant functions */ /* ABCD */
GUAC_TRANSFER_BINARY_BLACK = 0x10, /* 0000 */ GUAC_TRANSFER_BINARY_BLACK = 0x0, /* 0000 */
GUAC_TRANSFER_BINARY_WHITE = 0x1F, /* 1111 */ GUAC_TRANSFER_BINARY_WHITE = 0xF, /* 1111 */
/* Copy functions */ /* Copy functions */
GUAC_TRANSFER_BINARY_SRC = 0x13, /* 0011 */ GUAC_TRANSFER_BINARY_SRC = 0x3, /* 0011 */
GUAC_TRANSFER_BINARY_DEST = 0x15, /* 0101 */ GUAC_TRANSFER_BINARY_DEST = 0x5, /* 0101 */
GUAC_TRANSFER_BINARY_NSRC = 0x1C, /* 1100 */ GUAC_TRANSFER_BINARY_NSRC = 0xC, /* 1100 */
GUAC_TRANSFER_BINARY_NDEST = 0x1A, /* 1010 */ GUAC_TRANSFER_BINARY_NDEST = 0xA, /* 1010 */
/* AND / NAND */ /* AND / NAND */
GUAC_TRANSFER_BINARY_AND = 0x11, /* 0001 */ GUAC_TRANSFER_BINARY_AND = 0x1, /* 0001 */
GUAC_TRANSFER_BINARY_NAND = 0x1E, /* 1110 */ GUAC_TRANSFER_BINARY_NAND = 0xE, /* 1110 */
/* OR / NOR */ /* OR / NOR */
GUAC_TRANSFER_BINARY_OR = 0x17, /* 0111 */ GUAC_TRANSFER_BINARY_OR = 0x7, /* 0111 */
GUAC_TRANSFER_BINARY_NOR = 0x18, /* 1000 */ GUAC_TRANSFER_BINARY_NOR = 0x8, /* 1000 */
/* XOR / XNOR */ /* XOR / XNOR */
GUAC_TRANSFER_BINARY_XOR = 0x16, /* 0110 */ GUAC_TRANSFER_BINARY_XOR = 0x6, /* 0110 */
GUAC_TRANSFER_BINARY_XNOR = 0x19, /* 1001 */ GUAC_TRANSFER_BINARY_XNOR = 0x9, /* 1001 */
/* AND / NAND with inverted source */ /* AND / NAND with inverted source */
GUAC_TRANSFER_BINARY_NSRC_AND = 0x14, /* 0100 */ GUAC_TRANSFER_BINARY_NSRC_AND = 0x4, /* 0100 */
GUAC_TRANSFER_BINARY_NSRC_NAND = 0x1B, /* 1011 */ GUAC_TRANSFER_BINARY_NSRC_NAND = 0xB, /* 1011 */
/* OR / NOR with inverted source */ /* OR / NOR with inverted source */
GUAC_TRANSFER_BINARY_NSRC_OR = 0x1D, /* 1101 */ GUAC_TRANSFER_BINARY_NSRC_OR = 0xD, /* 1101 */
GUAC_TRANSFER_BINARY_NSRC_NOR = 0x12, /* 0010 */ GUAC_TRANSFER_BINARY_NSRC_NOR = 0x2, /* 0010 */
/* AND / NAND with inverted destination */ /* AND / NAND with inverted destination */
GUAC_TRANSFER_BINARY_NDEST_AND = 0x12, /* 0010 */ GUAC_TRANSFER_BINARY_NDEST_AND = 0x2, /* 0010 */
GUAC_TRANSFER_BINARY_NDEST_NAND = 0x1D, /* 1101 */ GUAC_TRANSFER_BINARY_NDEST_NAND = 0xD, /* 1101 */
/* OR / NOR with inverted destination */ /* OR / NOR with inverted destination */
GUAC_TRANSFER_BINARY_NDEST_OR = 0x1B, /* 1011 */ GUAC_TRANSFER_BINARY_NDEST_OR = 0xB, /* 1011 */
GUAC_TRANSFER_BINARY_NDEST_NOR = 0x14 /* 0100 */ GUAC_TRANSFER_BINARY_NDEST_NOR = 0x4 /* 0100 */
} guac_transfer_function; } guac_transfer_function;