diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-22 15:50:05 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-22 15:50:05 +0200 |
commit | f68fe5a1cd052386d444bbeab91c4caf8763ce10 (patch) | |
tree | 986014451967a1fd062833a15bc516cab6805f4b /xicc | |
parent | 84a8f501bcac3bc25c35715c0b669db04a39e56d (diff) | |
parent | 615ab5513e79c4abc5bbe5c993587785b6a1738b (diff) |
Merge tag 'upstream/1.9.2+repack'
Upstream version 1.9.2+repack
Diffstat (limited to 'xicc')
-rw-r--r-- | xicc/xcolorants.c | 4 | ||||
-rw-r--r-- | xicc/xcolorants.h | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/xicc/xcolorants.c b/xicc/xcolorants.c index edc7e52..f243718 100644 --- a/xicc/xcolorants.c +++ b/xicc/xcolorants.c @@ -133,6 +133,10 @@ static struct { "CMYK + Red + Blue" }, { ICX_CMYKOG, ICX_W, icSig6colorData, icSigMch6Data, "CMYK + Orange + Green" }, + { ICX_CMYKRGB, ICX_W, icSig7colorData, icSigMch7Data, + "CMYK + Red + Green + Blue" }, + { ICX_CMYKOGB, ICX_W, icSig7colorData, icSigMch7Data, + "CMYK + Orange + Green + Blue" }, { ICX_CMYKcmk1k, ICX_CMYK, icSig8colorData, icSigMch8Data, "CMYK + Light CMK + Light Light K" }, { ICX_CMYKOGcm, ICX_CMYKOG, icSig8colorData, icSigMch8Data, diff --git a/xicc/xcolorants.h b/xicc/xcolorants.h index e328ad2..804fea5 100644 --- a/xicc/xcolorants.h +++ b/xicc/xcolorants.h @@ -183,10 +183,18 @@ typedef unsigned int inkmask; ( ICX_CYAN | ICX_MAGENTA | ICX_YELLOW | ICX_BLACK \ | ICX_ORANGE | ICX_GREEN) +#define ICX_CMYKOGB /* A "hexachrome" _ Blue style extended gamut printer */ \ + ( ICX_CYAN | ICX_MAGENTA | ICX_YELLOW | ICX_BLACK \ + | ICX_ORANGE | ICX_GREEN | ICX_BLUE) + #define ICX_CMYKRB /* A 6 color printer with red and blue. */ \ ( ICX_CYAN | ICX_MAGENTA | ICX_YELLOW | ICX_BLACK \ | ICX_RED | ICX_BLUE) +#define ICX_CMYKRGB /* A 7 color printer with RGB */ \ + ( ICX_CYAN | ICX_MAGENTA | ICX_YELLOW | ICX_BLACK \ + | ICX_RED | ICX_GREEN | ICX_BLUE) + #define ICX_CMYKOGcm /* An 8 color extended gamut printer */ \ ( ICX_CYAN | ICX_MAGENTA | ICX_YELLOW | ICX_BLACK \ | ICX_ORANGE | ICX_GREEN | ICX_LIGHT_CYAN | ICX_LIGHT_MAGENTA) |