From 615ab5513e79c4abc5bbe5c993587785b6a1738b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 22 Oct 2016 15:49:39 +0200 Subject: New upstream version 1.9.2+repack --- Readme.txt | 6 +- doc/ArgyllDoc.html | 261 ++++- doc/ChangesSummary.html | 2304 +++++++++++++++++++++++---------------------- doc/Installing_Linux.html | 822 ++++++++-------- h/aconfig.h | 4 +- log.txt | 7 + spectro/oemarch.c | 3 +- spectro/usbio_lx.c | 2 +- spectro/xdg_bds.c | 6 + spectro/xdg_bds.h | 8 +- target/targen.c | 14 +- xicc/xcolorants.c | 4 + xicc/xcolorants.h | 8 + 13 files changed, 1879 insertions(+), 1570 deletions(-) diff --git a/Readme.txt b/Readme.txt index de57d9a..f406d68 100644 --- a/Readme.txt +++ b/Readme.txt @@ -1,8 +1,8 @@ -Argyll CMS README file - Version 1.9.0 +Argyll CMS README file - Version 1.9.2 -------------------------------------- -Date: 28th September 2016 +Date: 17th October 2016 Author: Graeme Gill Introduction @@ -26,7 +26,7 @@ provided for each major tool, and a general guide to using the tools for typical color management tasks is also available. A mailing list provides support for more advanced usage. -This is Version 1.9.1, a feature and bug fix update to the last major release V1.8.3. +This is Version 1.9.2, a bug fix update to the last release V1.9.1. The first public release of icclib was in November 1998, and of Argyll was in October 2000. Code development commenced in 1995. See Changes Summary for an overview of changes since the last release. Changes diff --git a/doc/ArgyllDoc.html b/doc/ArgyllDoc.html index e1625f4..8c6f353 100644 --- a/doc/ArgyllDoc.html +++ b/doc/ArgyllDoc.html @@ -10,9 +10,9 @@ Argyll Documentation Top -

ArgyllCMS documentation index (V1.9.1)
+

ArgyllCMS documentation index (V1.9.2)

- Date:   28th September 2016
+ Date:   17th October 2016
Author: Graeme Gill

Introduction

ArgyllCMS is an ICC compatible color management system, available as @@ -35,11 +35,10 @@ general guide to using the tools for typical color management tasks is also available. A mailing list provides support for more advanced usage.
-

This is Version 1.9.1, a feature and bug fix update to the last - major releaseV1.8.3. The first public release of icclib was in - November 1998, and of ArgyllCMS was in October 2000. Code - development commenced in 1995. See Changes - +

This is Version 1.9.2, a bug fix update to the last + releaseV1.9.1. The first public release of icclib was in November + 1998, and of ArgyllCMS was in October 2000. Code development + commenced in 1995. See Changes Summary for an overview of changes since the last release. Changes between revisions is detailed in the log.txt file that accompanies the source code.

@@ -130,6 +129,8 @@ + + @@ -250,6 +251,8 @@ + + @@ -266,6 +269,8 @@ + +    - Tele-Spectro-Radiometer

@@ -346,6 +351,8 @@ + + @@ -406,6 +413,8 @@ + + @@ -534,6 +543,8 @@ + + @@ -656,6 +667,8 @@ + + @@ -777,6 +790,8 @@ + + @@ -900,6 +915,8 @@ + + @@ -1021,6 +1038,8 @@ + + @@ -1142,6 +1161,8 @@ + + @@ -1324,6 +1345,8 @@ + + @@ -1446,6 +1469,8 @@ + + @@ -1577,6 +1602,8 @@ + + @@ -1701,6 +1728,8 @@ + + @@ -1829,6 +1858,8 @@ + + @@ -1970,6 +2001,8 @@ + + @@ -1986,6 +2019,8 @@ + + - display colorimeter
    Palette/SwatchMate @@ -2013,6 +2048,8 @@ + + @@ -2026,6 +2063,8 @@ + + - reflective colorimeter

@@ -2110,6 +2149,8 @@ + + @@ -2285,6 +2326,8 @@ + + @@ -2404,6 +2447,8 @@ + + @@ -2617,6 +2662,8 @@ calibration + + @@ -2642,6 +2689,8 @@ calibration + + Little Argyll GUI by Russell Cottrell, and for cameras or scanners, CoCa by @@ -2771,6 +2820,8 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + @@ -2907,6 +2958,8 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + @@ -3029,6 +3082,8 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + @@ -3151,6 +3206,8 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + @@ -3276,6 +3333,8 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + @@ -3398,6 +3457,8 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + @@ -3671,6 +3732,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -3794,6 +3857,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -3917,6 +3982,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -4042,6 +4109,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -4166,6 +4235,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -4289,6 +4360,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -4412,6 +4485,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -4540,6 +4615,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -4667,6 +4744,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -4791,6 +4870,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -4914,6 +4995,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -4976,6 +5059,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -5099,6 +5184,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -5152,6 +5239,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -5276,6 +5365,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -5398,6 +5489,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -5521,6 +5614,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -5645,6 +5740,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -5770,6 +5867,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -5893,6 +5992,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -6015,6 +6116,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -6138,6 +6241,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -6261,6 +6366,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -6384,6 +6491,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -6515,6 +6624,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -6637,6 +6748,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -6760,6 +6873,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -6885,6 +7000,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -7007,6 +7124,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -7129,6 +7248,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -7250,6 +7371,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -7376,6 +7499,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -7497,6 +7622,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -7562,6 +7689,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -7684,6 +7813,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -7807,6 +7938,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -7932,6 +8065,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -8060,6 +8195,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -8189,6 +8326,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -8215,6 +8354,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -8340,6 +8481,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -8462,6 +8605,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -8585,6 +8730,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -8708,6 +8855,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -8830,6 +8979,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -8954,6 +9105,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -9076,6 +9229,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -9199,6 +9354,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -9328,6 +9485,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -9451,6 +9610,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -9575,6 +9736,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -9702,6 +9865,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -9825,6 +9990,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -9947,6 +10114,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -10069,6 +10238,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -10191,6 +10362,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -10314,6 +10487,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -10436,6 +10611,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -10558,6 +10735,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -10680,6 +10859,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -10806,6 +10987,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -10833,6 +11016,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -10956,6 +11141,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -11078,6 +11265,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -11201,6 +11390,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -11328,6 +11519,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -11450,6 +11643,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -11573,6 +11768,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -11701,6 +11898,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -11824,6 +12023,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -11948,6 +12149,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -12072,6 +12275,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -12193,6 +12398,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -12315,6 +12522,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -12437,6 +12646,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -12560,6 +12771,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -12682,6 +12895,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -12805,6 +13020,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -12932,6 +13149,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -13056,6 +13275,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -13179,6 +13400,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -13329,6 +13552,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -13450,6 +13675,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -13571,6 +13798,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -13696,6 +13925,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -13818,6 +14049,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -13939,6 +14172,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -14068,6 +14303,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -14189,6 +14426,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -14310,6 +14549,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -14431,6 +14672,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -14552,6 +14795,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + @@ -14678,6 +14923,8 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + diff --git a/doc/ChangesSummary.html b/doc/ChangesSummary.html index 459285f..3549a79 100644 --- a/doc/ChangesSummary.html +++ b/doc/ChangesSummary.html @@ -1,1064 +1,1076 @@ - - - - - - - - - - Argyll CMS changes since last release - - -

Summary of Argyll CMS Changes since last release

-

For a complete - and more detailed list of changes, please see the log.txt file.

-

[V1.8.3 -> V1.9.1] 28th September 2016

- -

[V1.8.2 -> V1.8.3] 26th October 2015

- -

[V1.8.1 -> V1.8.2] 7th September 2015

- -

[V1.8.0 -> V1.8.1] 4th September 2015

- -

[V1.7.0 -> V1.8.0] 20th August 2015

- -

[V1.6.3 -> V1.7.0] 1st May 2015

- -

[V1.6.2 -> V1.6.3] 26th January 2014

- -

[V1.6.1 -> V1.6.2] 18th November 2013

- -

[V1.6.0 -> V1.6.1] 30th September 2013

- -

[V1.5.1 -> V1.6.0] 16th August 2013

- -

[V1.5.0 -> V1.5.1] 8th March 2013

- -

[V1.4.0 -> V1.5.0] 1st March 2013

- -

[V1.3.7 -> V1.4.0] 20th April 2012

- -

[V1.3.6 -> V1.3.7] 26th March 2012

- -

[V1.3.5 -> V1.3.6] 19th March 2012
-

- -

[V1.3.4 -> V1.3.5] 24th October 2011

- -

[V1.3.3 -> V1.3.4] 31st August 2011

- -

[V1.3.2 -> V1.3.3] 13th May 2011

- - -

[V1.3.1 -> V1.3.2] 4th November 2010
-

- -

[V1.3.0 -> V1.3.1] 26th October 2010
-

- -

[V1.2.0 -> V1.3.0] 8th September 2010
-

- -

[V1.1.1 -> V1.2.0] 30 July 2010
-

- -

[V1.1.0 -> V1.1.1] 21 February 2010
-

- -

[V1.0.4 -> V1.1.0] 17th January 2010
-

- -

[V1.0.3 -> V1.0.4] 30th June 2009
-

- -

[V1.0.2 -> V1.0.3] 3rd September 2008
-

- +

[V0.70 Beta 8 -> V1.0.0] 1st July 2008
+

+
+ Apart from numerous bug fixes and many minor feature additions and + improvements, the main changes to this version compared to the + previous one are:
+ + As usual, a more detailed description of all changes is in the log.txt + file that accompanies the source code. +

[V0.60 -> V0.70 Beta 8]15th January 2008
+

+ +
+
+
+


+  
+  
+  
+  
+  
+  

+
+ + diff --git a/doc/Installing_Linux.html b/doc/Installing_Linux.html index 87d7fba..dc9a044 100644 --- a/doc/Installing_Linux.html +++ b/doc/Installing_Linux.html @@ -1,45 +1,49 @@ - - - - - - - Argyll Installation on Linux - - -

Installing the software on Linux with X11
-

-
- You will need to unpack the downloaded file in the location you have - chosen to hold the executable files. Typically this might be in /usr/local/, or perhaps $HOME/bin/. You would then - unpack the files using tar -zxf - archivename.tgz, which will - create a directory Argyll_VX.X.X, - where X.X.X is the version number, and the executables will be in Argyll_VX.X.X/bin You will also - have to configure your $PATH environment variable to give access to - the executables from your command line environment. The .tgz file - also contains several useful reference files (such as scanner chart - recognition templates, sample illumination spectrum etc.) in the ref - sub-directory, as well as all the current HTML documentation in a - doc sub-directory. You may want to copy things to more standard - locations such as /usr/local/bin, /usr/local/argyll/bin etc., - depending on the conventions used on your system.
-
- Note on the system bell:
-
- When reading strips using the Eye-One Pro or ColorMunki instrument, - the system bell is used to indicate when the instrument the ready to - be used, and to provide feedback on any problems. On some Linux - installations the system bell may be disabled. As well as checking - the terminal and GUI sound preferences, you may have to enable the - used of the PC speaker driver, which can be done by adding the + + + + + + + Argyll Installation on Linux + + +

Installing the software on Linux with X11
+

+
+ You will need to unpack the downloaded file in the location you have + chosen to hold the executable files. Typically this might be in /usr/local/, or perhaps $HOME/bin/. You would then + unpack the files using tar -zxf + archivename.tgz, which will + create a directory Argyll_VX.X.X, + where X.X.X is the version number, and the executables will be in Argyll_VX.X.X/bin You will also + have to configure your $PATH environment variable to give access to + the executables from your command line environment. The .tgz file + also contains several useful reference files (such as scanner chart + recognition templates, sample illumination spectrum etc.) in the ref + sub-directory, as well as all the current HTML documentation in a + doc sub-directory. You may want to copy things to more standard + locations such as /usr/local/bin, /usr/local/argyll/bin etc., + depending on the conventions used on your system.
+
+ Some systems (Fedora ?) seem to be missing normal X11 libraries like + libXss.so, so you may have to install libXScrnSaver, + i.e. "sudo dnf install libXScrnSaver".
+
+ Note on the system bell:
+
+ When reading strips using the Eye-One Pro or ColorMunki instrument, + the system bell is used to indicate when the instrument the ready to + be used, and to provide feedback on any problems. On some Linux + installations the system bell may be disabled. As well as checking + the terminal and GUI sound preferences, you may have to enable the + used of the PC speaker driver, which can be done by adding the command /sbin/modprobe pcspkr to @@ -53,7 +57,8 @@ - the /etc/rc.local startup + + the /etc/rc.local startup script. You may also have to run xset @@ -67,211 +72,213 @@ - b 100 1000 100 in your local setup, if you are running in - an X11 environment. You can check that the system bell is operating - by doing an "echo ^G", where ^G is ctrl-G.
-
- Note on X11 multi-monitor - setups:
-
- When working with a multi-monitor X11 configuration, note that you - will only be able to individually calibrate monitors if the - multi-window extension you are using (if any), supports access to - the individual screen Video LUT tables that are used for - calibration. The native X11 multi-screen addressing supports this, - as does the Xinerama extension, and XRandR V1.2.
-
- The proprietary NVidia TwinView and ATI MergeFB extensions do not - currently support access to the individual screen Video LUTs, so - calibration of each screen independently is impossible if either of - these extensions are running. You can switch to using Xinerama to - solve this problem, or you can try doing a calibration for the - screens that do have accessible Video LUTs with these proprietary - extensions, or ignore calibration and rely purely on display - profiling. Use the dispwin tool to figure out what works on your - system. The NVidia ATI binary drivers do not seem to properly - support XRandR V1.2 either, even though they claim to do so. You may - have to set the ARGYLL_IGNORE_XRANDR1_2 - environment variable if the XRandR V1.2 extension is faulty.
-
- If these limitations trouble you, then as a valuable customer of - NVidia or AMD/ATI, perhaps you should contact them and urge them to - fix the problems with Video LUT access in their proprietary - multi-monitor extensions and XRandR implementation, bringing their - support for multi-monitors on X11 up to the same standards as other - operating systems. Ask them to add full and correct support for the - XRandR V1.2 extension.
-
- Fixing access to Video LUTs:
-
- Some users have noted that their default X11 installation doesn't - properly enable access to the video card Video Lookup Tables - (RAMDAC). The Video LUTs are used for display calibration purposes, - and a warning will be issues by the dispcal and dispread - tools if there is a problem with this. Without access to the - VideoLUTs, you won't be able to use display calibration.
-
- The problem may be because certain X11 extensions aren't being - loaded by default. You may want to check that you have
-
-   Load  "extmod"
-
- in the appropriate (or any) section of - your Xorg.conf file, to allow the XF86Video LUT - extensions to function correctly.
-
- Another source of problems is if the display isn't configured with a - suitable visual. Typically for high quality color you need to be - using at least 24 bits per - pixel (8 Bits for each of Red, Green and Blue channels), but more - importantly the number of entries in the the VideoLUTs needs to - match the depth of the screen. So if the VideoLUTs have 256 entries - per channel, then the screen must be using 8 bits per channel to - match. Or 64 entries and 6 bits. Or 4096 entries and 12 bits, etc. - Running "dispwin -D" may give some clues as to what the nature of - the problem is. You might have to look into your xorg.conf or XRANDR - setup, or on some distributions there will be some configuration - program that will let you choose the display configuration (ie. YaST - or SaX2 on openSUSE, etc.).
-
- Setting up instrument access:
-
- By default most Linux based systems make devices - inaccessible to user mode programs, so it is necessary to make some - modification to your permissions so that Argyll tools are able to - access the Color Measurement Instruments. In order from newest to - oldest, the following sub-systems may need to be configured to - permit this:
-
-   No device - configuration needed when running from the console:
-
-     Mandriva 2008.0 default - installation
-
-
  USB instruments - access using udev:
-     Ubuntu 10.04
-     Fedora - Core 8
-     Mandriva 2008.1
-     OpenSuSE 10.3
-     Ubuntu 7.1
-     Kubuntu 7.1
-     Debian 4.0
-
  USB instruments access using hotplug:
-    Red Hat 4.0
-    Fedora Core 4
-    Fedora Core 3
-    Fedora Core 2
-
-
  Serial instrument access:
-    All
-
- NOTE: That mtp-probe - /  libmtp been known - to interfere with device access, particularly the Spyder 3 and - DTP94. Recent versions of the libmtp should ignore any instrument - marked as COLOR_MEASUREMENT_DEVICE by the - /etc/udev/rules.d/55-Argyll.rules file, but for older systems you - probably need to disable libmtp (look in the udev configuration).
-
- The JETI specbos 1211, 1201, - 1511, 1501 and the Klien K10A makes use of the FTDI Virtual COM - Port Drivers (VCP), that should come with any recent version - of Linux. Older versions of Linux may not support the FTDI FT231XS - chip that the JETI specbos 1511, 1501 use. You may - have to add yourself to the - tty, uucp - or dialout group to have permission to open the - instrument.
-
- -
-
No - device configuration needed:
- A few systems have in place  a security configuration such that - anyone logging in at the console of a machine has access to all the - local devices.
- -
USB - instruments access using udev with existing /etc/udev/rules.d or - /usr/lib/udev/rules.d/69-cd-sensors.rules - file.
-
- Recent Fedora based - systems include Gnome Color Manager, which comes with a udev rule - for color instruments. You can check this by looking for the /etc/udev/rules.d or in /usr/lib/udev/rules.d/69-cd-sensors.rules - file. If this exists and is up to date enough to include the - instrument you want to use, then all you have to do is add yourself - to the colord group, ie:
-
-    sudo usermod -a -G colord $USER
-
- If the 69-cd-sensors.rules file is out of date and does not - include the latest instruments supported by Argyll, then the - simplest thing to do is to replace the 69-cd-sensors.rules - file with the usb/55-Argyll.rules. You will need - to do this as root, and set the owner as root, group root, - permissions 644. You may need to re-plug in your instrument to get - changes to the udev rules recognised.
-
USB - instruments access using udev, with no existing /etc/udev/rules.d or /usr/lib/udev/rules.d/69-cd-sensors.rules - file.
-
- Most recent systems use udev to manage device names and permissions, - but by default color instruments may not be accessible to normal - system users.
- To solve this a udev rule file needs to be added that modifies the - group and permission of any Color Measurement Instruments, and you - may then need to add yourself to that group.
-
- First check whether other rules are in /etc/udev/rules.d or in /usr/lib/udev/rules.d, - and use the appropriate directory.
- (You may also want to check in that directory whether - 55-Argyll.rules or some other .rules file that is setup to enable - color instruments already exists in that directory.)
-
- Copy the file usb/55-Argyll.rules from the binary or source - distribution into /etc/udev/rules.d/55-Argyll.rules + + b 100 1000 100 in your local setup, if you are running in + an X11 environment. You can check that the system bell is operating + by doing an "echo ^G", where ^G is ctrl-G.
+
+ Note on X11 multi-monitor + setups:
+
+ When working with a multi-monitor X11 configuration, note that you + will only be able to individually calibrate monitors if the + multi-window extension you are using (if any), supports access to + the individual screen Video LUT tables that are used for + calibration. The native X11 multi-screen addressing supports this, + as does the Xinerama extension, and XRandR V1.2.
+
+ The proprietary NVidia TwinView and ATI MergeFB extensions do not + currently support access to the individual screen Video LUTs, so + calibration of each screen independently is impossible if either of + these extensions are running. You can switch to using Xinerama to + solve this problem, or you can try doing a calibration for the + screens that do have accessible Video LUTs with these proprietary + extensions, or ignore calibration and rely purely on display + profiling. Use the dispwin tool to figure out what works on your + system. The NVidia ATI binary drivers do not seem to properly + support XRandR V1.2 either, even though they claim to do so. You may + have to set the ARGYLL_IGNORE_XRANDR1_2 + environment variable if the XRandR V1.2 extension is faulty.
+
+ If these limitations trouble you, then as a valuable customer of + NVidia or AMD/ATI, perhaps you should contact them and urge them to + fix the problems with Video LUT access in their proprietary + multi-monitor extensions and XRandR implementation, bringing their + support for multi-monitors on X11 up to the same standards as other + operating systems. Ask them to add full and correct support for the + XRandR V1.2 extension.
+
+ Fixing access to Video LUTs:
+
+ Some users have noted that their default X11 installation doesn't + properly enable access to the video card Video Lookup Tables + (RAMDAC). The Video LUTs are used for display calibration purposes, + and a warning will be issues by the dispcal and dispread + tools if there is a problem with this. Without access to the + VideoLUTs, you won't be able to use display calibration.
+
+ The problem may be because certain X11 extensions aren't being + loaded by default. You may want to check that you have
+
+   Load  "extmod"
+
+ in the appropriate (or any) section of + your Xorg.conf file, to allow the XF86Video LUT + extensions to function correctly.
+
+ Another source of problems is if the display isn't configured with a + suitable visual. Typically for high quality color you need to be + using at least 24 bits per + pixel (8 Bits for each of Red, Green and Blue channels), but more + importantly the number of entries in the the VideoLUTs needs to + match the depth of the screen. So if the VideoLUTs have 256 entries + per channel, then the screen must be using 8 bits per channel to + match. Or 64 entries and 6 bits. Or 4096 entries and 12 bits, etc. + Running "dispwin -D" may give some clues as to what the nature of + the problem is. You might have to look into your xorg.conf or XRANDR + setup, or on some distributions there will be some configuration + program that will let you choose the display configuration (ie. YaST + or SaX2 on openSUSE, etc.).
+
+ Setting up instrument access:
+
+ By default most Linux based systems make devices + inaccessible to user mode programs, so it is necessary to make some + modification to your permissions so that Argyll tools are able to + access the Color Measurement Instruments. In order from newest to + oldest, the following sub-systems may need to be configured to + permit this:
+
+   No device + configuration needed when running from the console:
+
+     Mandriva 2008.0 default + installation
+
+
  USB instruments + access using udev:
+     Ubuntu 10.04
+     Fedora + Core 8
+     Mandriva 2008.1
+     OpenSuSE 10.3
+     Ubuntu 7.1
+     Kubuntu 7.1
+     Debian 4.0
+
  USB instruments access using hotplug:
+    Red Hat 4.0
+    Fedora Core 4
+    Fedora Core 3
+    Fedora Core 2
+
+
  Serial instrument access:
+    All
+
+ NOTE: That mtp-probe + /  libmtp been known + to interfere with device access, particularly the Spyder 3 and + DTP94. Recent versions of the libmtp should ignore any instrument + marked as COLOR_MEASUREMENT_DEVICE by the + /etc/udev/rules.d/55-Argyll.rules file, but for older systems you + probably need to disable libmtp (look in the udev configuration).
+
+ The JETI specbos 1211, 1201, + 1511, 1501 and the Klien K10A makes use of the FTDI Virtual COM + Port Drivers (VCP), that should come with any recent version + of Linux. Older versions of Linux may not support the FTDI FT231XS + chip that the JETI specbos 1511, 1501 use. You may + have to add yourself to the + tty, uucp + or dialout group to have permission to open the + instrument.
+
+ +
+
No + device configuration needed:
+ A few systems have in place  a security configuration such that + anyone logging in at the console of a machine has access to all the + local devices.
+ +
USB + instruments access using udev with existing /etc/udev/rules.d or + /usr/lib/udev/rules.d/69-cd-sensors.rules + file.
+
+ Recent Fedora based + systems include Gnome Color Manager, which comes with a udev rule + for color instruments. You can check this by looking for the /etc/udev/rules.d or in /usr/lib/udev/rules.d/69-cd-sensors.rules + file. If this exists and is up to date enough to include the + instrument you want to use, then all you have to do is add yourself + to the colord group, ie:
+
+    sudo usermod -a -G colord $USER
+
+ If the 69-cd-sensors.rules file is out of date and does not + include the latest instruments supported by Argyll, then the + simplest thing to do is to replace the 69-cd-sensors.rules + file with the usb/55-Argyll.rules. You will need + to do this as root, and set the owner as root, group root, + permissions 644. You may need to re-plug in your instrument to get + changes to the udev rules recognised.
+
USB + instruments access using udev, with no existing /etc/udev/rules.d or /usr/lib/udev/rules.d/69-cd-sensors.rules + file.
+
+ Most recent systems use udev to manage device names and permissions, + but by default color instruments may not be accessible to normal + system users.
+ To solve this a udev rule file needs to be added that modifies the + group and permission of any Color Measurement Instruments, and you + may then need to add yourself to that group.
+
+ First check whether other rules are in /etc/udev/rules.d or in /usr/lib/udev/rules.d, + and use the appropriate directory.
+ (You may also want to check in that directory whether + 55-Argyll.rules or some other .rules file that is setup to enable + color instruments already exists in that directory.)
+
+ Copy the file usb/55-Argyll.rules from the binary or source + distribution into /etc/udev/rules.d/55-Argyll.rules or /usr/lib/udev/rules.d/55-Argyll.rules - (as appropriate) with owner root, group root, - permissions 644.
-
- If you are on an older system - that uses a udev that doesn't recognize the syntax used in - 55-Argyll.rules, or that doesn't have rules to create the libusb - /dev/bus/usb/00X/00Y device entries, you should install the usb/45-Argyll.rules file instead - - See below.
-
- On recent systems the new rules file will be notices as soon as you - plug the instrument in again.
+ + (as appropriate) with owner root, group root, + permissions 644.
+
+ If you are on an older system + that uses a udev that doesn't recognize the syntax used in + 55-Argyll.rules, or that doesn't have rules to create the libusb + /dev/bus/usb/00X/00Y device entries, you should install the usb/45-Argyll.rules file instead + - See below.
+
+ On recent systems the new rules file will be notices as soon as you + plug the instrument in again.
On older systems you may need to run /sbin/udevtrigger,  @@ -286,61 +293,62 @@ - /sbin/udevcontrol reload_rules or  /sbin/udevstart or reboot to get - the new file noticed.
-
- (You may want to refer to this - document for more guidance on modifying udev rules, as well as - this.)
-
- YOU THEN MAY NEED TO:
-
- If your system is not using - the ACL to manage device access for console users (the file /var/run/ConsoleKit/database - doesn't exist on your system), then you will need to add yourself to - the colord group, if you - are not already a member of it. You can do this either by using a - "Users and Groups" system administration tool, or on the command - line running as root:
-
-    sudo usermod -a -G colord $USER
-
- or
-     su root
-     usermod -a -G colord $USER
-
- (If the usermod program isn't found as root, it might be in - /usr/sbin, ie. use /usr/sbin/usermod .... etc.
-  If usermod doesn't recognize the -a flag try "usermod -A - colord $USER".
-  If this doesn't work you will have to run "id yourusername" to - list the current supplemental
-  groups, and add them plus colord using just "usermod -G - group1,group2,... yourusername")
-
- You may find that the colord group doesn't exist on - your system, and if so you will need to create it:
-
-   sudo groupadd -r colord
-
- and then add yourself to the colord group.
-
- You may have to log out and then in again for the groups to become - effective.
-
- You can check whether the instrument is being recognized and set to - the colord group by comparing the output of ls -l -R /dev/bus/usb without - and then with the instrument plugged in.
-
- You can test whether your instrument is accessible by plugging it in - and then running "spotread -?" and looking for it listed after the -c option.
+ + /sbin/udevcontrol reload_rules or  /sbin/udevstart or reboot to get + the new file noticed.
+
+ (You may want to refer to this + document for more guidance on modifying udev rules, as well as + this.)
+
+ YOU THEN MAY NEED TO:
+
+ If your system is not using + the ACL to manage device access for console users (the file /var/run/ConsoleKit/database + doesn't exist on your system), then you will need to add yourself to + the colord group, if you + are not already a member of it. You can do this either by using a + "Users and Groups" system administration tool, or on the command + line running as root:
+
+    sudo usermod -a -G colord $USER
+
+ or
+     su root
+     usermod -a -G colord $USER
+
+ (If the usermod program isn't found as root, it might be in + /usr/sbin, ie. use /usr/sbin/usermod .... etc.
+  If usermod doesn't recognize the -a flag try "usermod -A + colord $USER".
+  If this doesn't work you will have to run "id yourusername" to + list the current supplemental
+  groups, and add them plus colord using just "usermod -G + group1,group2,... yourusername")
+
+ You may find that the colord group doesn't exist on + your system, and if so you will need to create it:
+
+   sudo groupadd -r colord
+
+ and then add yourself to the colord group.
+
+ You may have to log out and then in again for the groups to become + effective.
+
+ You can check whether the instrument is being recognized and set to + the colord group by comparing the output of ls -l -R /dev/bus/usb without + and then with the instrument plugged in.
+
+ You can test whether your instrument is accessible by plugging it in + and then running "spotread -?" and looking for it listed after the -c option.
USB instruments @@ -356,72 +364,73 @@ instruments - access using hotplug:
-
- Under much older versions of Linux, - you should look into the hotplug system configuration for USB - devices. You know you are running this because the /etc/hotplug directory exists on - your system.
-
- Assuming we want to configure for all Argyll supported USB - instruments, copy the file usb/Argyll.usermap from the binary - or source distribution into  /etc/hotplug/usb/Argyll.usermap - with owner root, group root, permissions 644.
-
-
-  (For even older versions, append the lines above to /etc/hotplug/usb.usermap, and - you may have to run update-usb.usermap)
-
- Then copy the file usb/Argyll from the binary or source - distribution into /etc/hotplug/usb/Argyll - with owner root, group root, permissions 744.
-
- YOU THEN NEED TO:
-
- You will then need to add - yourself to the colord - group, if you are not already a member of it. You can do this either - by using a "Users and Groups" system administration tool, or on the - command line running as root:
-
-    sudo usermod -a -G colord $USER
-
- or
-     su root
-     usermod -a -G colord $USER
-
-
- (If the usermod program isn't found as root, it might be in - /usr/sbin, ie. use /usr/sbin/usermod .... etc.
-  If usermod doesn't recognize the -a flag try "usermod -A - colord $USER".
-  If this doesn't work you will have to run "id yourusername" to - list the current suplemental
-  groups, and add colord using just "usermod -G - group1,group2,... yourusername"
-  Another option may be to use gpasswd -a $USER colord))
-
- You may find that the colord - group doesn't exist on your system, and if so you will need to - create it:
-
-   sudo groupadd -r colord
-
- and then add yourself to the colord group.
-
- You may have to log out and then in again for the groups to become - effective.
-
- You can test whether your instrument is accessible by plugging it in - and then running "spotread -?" and looking for it listed after the -c option.
-  
+ + access using hotplug:
+ + Under much older versions of Linux, + you should look into the hotplug system configuration for USB + devices. You know you are running this because the /etc/hotplug directory exists on + your system.
+
+ Assuming we want to configure for all Argyll supported USB + instruments, copy the file usb/Argyll.usermap from the binary + or source distribution into  /etc/hotplug/usb/Argyll.usermap + with owner root, group root, permissions 644.
+
+
+  (For even older versions, append the lines above to /etc/hotplug/usb.usermap, and + you may have to run update-usb.usermap)
+
+ Then copy the file usb/Argyll from the binary or source + distribution into /etc/hotplug/usb/Argyll + with owner root, group root, permissions 744.
+
+ YOU THEN NEED TO:
+
+ You will then need to add + yourself to the colord + group, if you are not already a member of it. You can do this either + by using a "Users and Groups" system administration tool, or on the + command line running as root:
+
+    sudo usermod -a -G colord $USER
+
+ or
+     su root
+     usermod -a -G colord $USER
+
+
+ (If the usermod program isn't found as root, it might be in + /usr/sbin, ie. use /usr/sbin/usermod .... etc.
+  If usermod doesn't recognize the -a flag try "usermod -A + colord $USER".
+  If this doesn't work you will have to run "id yourusername" to + list the current suplemental
+  groups, and add colord using just "usermod -G + group1,group2,... yourusername"
+  Another option may be to use gpasswd -a $USER colord))
+
+ You may find that the colord + group doesn't exist on your system, and if so you will need to + create it:
+
+   sudo groupadd -r colord
+
+ and then add yourself to the colord group.
+
+ You may have to log out and then in again for the groups to become + effective.
+
+ You can test whether your instrument is accessible by plugging it in + and then running "spotread -?" and looking for it listed after the -c option.
+  
Serial instruments @@ -437,46 +446,47 @@ instruments - access:
-
- If you have a serial instrument then you may find that by default - you don't have permission to access the serial ports or a Serial to - USB adapter. Most systems make the serial ports available to any - user in the tty, uucp or dialout group, - so the best way of getting access to the serial ports is to add - yourself to the correct group. (You can identify the correct group - by looking at the group name shown by ls -l /dev/ttyS* )
-
-  You can add yourself to a group either by using a "Users - and Groups" system administration tool, or on the command line using - "usermod":
-
-     su root
-     usermod -a -G dialout $USER
-
- or
-
-    sudo usermod -a -G dialout $USER
-
- (If the usermod program isn't found as root, it might be in - /usr/sbin, ie. use /usr/sbin/usermod .... etc.
-  If usermod doesn't recognize the -a flag try "usermod -A - dialout $USER".
-  If this doesn't work you will have to run "id yourusername" to - list the current suplemental
-  groups, and add a tty, uucp or dialout group using just - "usermod -G group1,group2,... yourusername"
-  Another option may be to use gpasswd -a $USER dialout)
-
- You may have to log out and then in again for the group to become - effective.
- -

 
-  
-  
-  
-  
-  

- - + + access:
+ + If you have a serial instrument then you may find that by default + you don't have permission to access the serial ports or a Serial to + USB adapter. Most systems make the serial ports available to any + user in the tty, uucp or dialout group, + so the best way of getting access to the serial ports is to add + yourself to the correct group. (You can identify the correct group + by looking at the group name shown by ls -l /dev/ttyS* )
+
+  You can add yourself to a group either by using a "Users + and Groups" system administration tool, or on the command line using + "usermod":
+
+     su root
+     usermod -a -G dialout $USER
+
+ or
+
+    sudo usermod -a -G dialout $USER
+
+ (If the usermod program isn't found as root, it might be in + /usr/sbin, ie. use /usr/sbin/usermod .... etc.
+  If usermod doesn't recognize the -a flag try "usermod -A + dialout $USER".
+  If this doesn't work you will have to run "id yourusername" to + list the current suplemental
+  groups, and add a tty, uucp or dialout group using just + "usermod -G group1,group2,... yourusername"
+  Another option may be to use gpasswd -a $USER dialout)
+
+ You may have to log out and then in again for the group to become + effective.
+ +

 
+  
+  
+  
+  
+  

+ + diff --git a/h/aconfig.h b/h/aconfig.h index f59d8a1..c9d6fc9 100644 --- a/h/aconfig.h +++ b/h/aconfig.h @@ -24,8 +24,8 @@ /* major number = 8 bits */ #ifndef USE_NG_VERSION -# define ARGYLL_VERSION 0x01091 -# define ARGYLL_VERSION_STR "1.9.1" +# define ARGYLL_VERSION 0x01092 +# define ARGYLL_VERSION_STR "1.9.2" #else # define ARGYLL_VERSION NG_VERSION # define ARGYLL_VERSION_STR "NG_VERSION_STR" diff --git a/log.txt b/log.txt index b203f57..28a02c4 100644 --- a/log.txt +++ b/log.txt @@ -2,6 +2,13 @@ Argyll CMS change log ===================== +Version 1.9.2 14th October 2016 +------------- + +* Fix oeminst for OS X save location. + +* Fix oeminst for OS X Spyder 4 CD calibration file location. + Version 1.9.1 28th September 2016 ------------- diff --git a/spectro/oemarch.c b/spectro/oemarch.c index be9abf3..c8775bf 100644 --- a/spectro/oemarch.c +++ b/spectro/oemarch.c @@ -119,7 +119,8 @@ oem_target oemtargs = { { "/PhotoCAL/PhotoCAL Setup.exe", targ_spyd2_pld }, { "/OptiCAL/OptiCAL Setup.exe", targ_spyd2_pld }, { "/setup/setup.exe", targ_spyd2_pld }, - { "/Data/setup.exe", targ_spyd_cal }, +// { "/Data/setup.exe", targ_spyd_cal }, + { "/Data/Setup.exe", targ_spyd_cal }, { "/Installer/Setup.exe", targ_i1d3_edr }, { "/Installer/ColorMunkiDisplaySetup.exe", targ_i1d3_edr }, { NULL } diff --git a/spectro/usbio_lx.c b/spectro/usbio_lx.c index 6d001a2..6edcb29 100644 --- a/spectro/usbio_lx.c +++ b/spectro/usbio_lx.c @@ -839,7 +839,7 @@ static int icoms_usb_transaction( bp += req.urbs[i].urb.buffer_length; req.urbs[i].urb.status = -EINPROGRESS; } - a1logd(p->log, 8, "icoms_usb_transaction: reset req %p nourbs to %d\n",&req,req.nourbs); + a1logd(p->log, 8, "icoms_usb_transaction: set req %p nourbs to %d\n",&req,req.nourbs); /* Add our request to the req list so that it can be cancelled on reap failure */ pthread_mutex_lock(&p->usbd->lock); diff --git a/spectro/xdg_bds.c b/spectro/xdg_bds.c index e24e4ab..03f7561 100644 --- a/spectro/xdg_bds.c +++ b/spectro/xdg_bds.c @@ -114,6 +114,12 @@ #endif #include #include +#ifndef SALONEINSTLIB +# include "copyright.h" +# include "aconfig.h" +#else +# include "sa_config.h" +#endif #include "numsup.h" #include "conv.h" #include "aglob.h" diff --git a/spectro/xdg_bds.h b/spectro/xdg_bds.h index 4fedbea..18101b0 100644 --- a/spectro/xdg_bds.h +++ b/spectro/xdg_bds.h @@ -32,9 +32,9 @@ /* Which type of storage */ typedef enum { - xdg_data, - xdg_conf, - xdg_cache /* Note there is no xdg_local cache */ + xdg_data, /* User/System Application related data */ + xdg_conf, /* User/System Application configuration settings */ + xdg_cache /* User Application cache storage area */ } xdg_storage_type; /* What operation is being performed */ @@ -48,7 +48,7 @@ typedef enum { /* the user context then the local system context.) */ typedef enum { xdg_user, /* User context */ - xdg_local /* Local system wide context */ + xdg_local /* Local System wide context */ } xdg_scope; /* An error code */ diff --git a/target/targen.c b/target/targen.c index 74bbe96..96cda6c 100644 --- a/target/targen.c +++ b/target/targen.c @@ -725,9 +725,19 @@ double xpow /* Extra device power, default = none */ /* Get details of conversion (Arguments may be NULL if info not needed) */ s->luo->spaces(s->luo, &ins, NULL, &outs, NULL, NULL, NULL, NULL, NULL, NULL); +//printf("~1 xmask = 0x%x, ins = %s\n",xmask,icm2str(icmColorSpaceSignature, ins)); if (icx_colorant_comb_match_icc(xmask, ins) == 0) { - s->luo->del(s->luo); - error("ICC profile doesn't match device!"); + + /* Should really see if ICC profile has ColorantTable tag, */ + /* and match them against targen specs. For now, */ + /* simply make sure the channel counts match and issue */ + /* a warning. */ + if (icx_noofinks(xmask) != icmCSSig2nchan(ins)) { + s->luo->del(s->luo); + error("ICC profile doesn't match device!"); + } else { + warning("Profile '%s' no. channels match, but colorant types have not been checked",profName); + } } /* Grab any device calibration curves */ 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) -- cgit v1.2.3