diff options
Diffstat (limited to 'src/main/print-canon.h')
| -rw-r--r-- | src/main/print-canon.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/main/print-canon.h b/src/main/print-canon.h index 26607ed..3baeb2c 100644 --- a/src/main/print-canon.h +++ b/src/main/print-canon.h @@ -35,13 +35,21 @@ #define CANON_INK_K 1 #define CANON_INK_CMY 2 #define CANON_INK_CMYK 4 -#define CANON_INK_CcMmYK 8 -#define CANON_INK_CcMmYyK 16 +#define CANON_INK_CMYKk 8 +#define CANON_INK_CcMmYK 16 +#define CANON_INK_CcMmYKk 32 +#define CANON_INK_CcMmYyK 64 +#define CANON_INK_CcMmYyKk 128 +#define CANON_INK_cmy 256 +#define CANON_INK_CcMmYy 512 -#define CANON_INK_CcMmYyKk_MASK (CANON_INK_CcMmYK|CANON_INK_CcMmYyK) /* Ink is CcMmYyKk */ -#define CANON_INK_CMYK_MASK (CANON_INK_CMYK|CANON_INK_CcMmYyKk_MASK) /* Ink is CMYK */ -#define CANON_INK_CMY_MASK (CANON_INK_CMY|CANON_INK_CMYK_MASK) /* Ink is CMY */ -#define CANON_INK_K_MASK (CANON_INK_K|CANON_INK_CMYK_MASK) /* Ink is K */ +#define CANON_INK_CcMmYyKk_MASK (CANON_INK_CcMmYK|CANON_INK_CcMmYKk|CANON_INK_CcMmYyK|CANON_INK_CcMmYyKk) /* Ink is CcMmYyKk */ +#define CANON_INK_CMYKk_MASK (CANON_INK_CMYKk|CANON_INK_CcMmYyKk_MASK) /* Ink is CMYKk */ +#define CANON_INK_CMYK_MASK (CANON_INK_CMYK|CANON_INK_CMYKk_MASK) /* Ink is CMYK */ +#define CANON_INK_CMY_MASK (CANON_INK_CMY|CANON_INK_CMYK_MASK|CANON_INK_CcMmYy|CANON_INK_cmy) /* Ink is CMY --- or CMYcmy */ +#define CANON_INK_K_MASK (CANON_INK_K|CANON_INK_CMYK_MASK) /* Ink is K */ +/* completely different inks */ +/*#define CANON_INK_cmy_MASK (CANON_INK_cmy) */ /* Ink is cmy */ @@ -55,8 +63,11 @@ static struct canon_inktype_s { const char* name; const char* text; } canon_inktypes[] = { + {CANON_INK_CcMmYyKk,8,"PhotoCMYKk","Photo CcMmYyKk Color"}, /* Gernot: inserted */ {CANON_INK_CcMmYyK,7,"PhotoCMYK","Photo CcMmYyK Color"}, + {CANON_INK_CcMmYKk,7,"PhotoCMYKk","Photo CcMmYKk Color"}, /* Gernot: inserted */ {CANON_INK_CcMmYK,6,"PhotoCMY", "Photo CcMmYK Color"}, + {CANON_INK_CMYKk,5,"CMYKk","CMYKk Color"}, /* Gernot: inserted */ {CANON_INK_CMYK,4,"CMYK","CMYK Color"}, {CANON_INK_CMY,3,"RGB","CMY Color"}, {CANON_INK_K,1,"Gray","Black"} |