From 22f703cab05b7cd368f4de9e03991b7664dc5022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Sep 2014 13:56:46 +0200 Subject: Initial import of argyll version 1.5.1-8 --- tweak/Jamfile | 26 ++ tweak/License.txt | 662 ++++++++++++++++++++++++++++ tweak/Makefile.am | 11 + tweak/Readme.txt | 5 + tweak/afiles | 5 + tweak/refine.c | 1269 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1978 insertions(+) create mode 100644 tweak/Jamfile create mode 100644 tweak/License.txt create mode 100644 tweak/Makefile.am create mode 100644 tweak/Readme.txt create mode 100644 tweak/afiles create mode 100644 tweak/refine.c (limited to 'tweak') diff --git a/tweak/Jamfile b/tweak/Jamfile new file mode 100644 index 0000000..ec5beba --- /dev/null +++ b/tweak/Jamfile @@ -0,0 +1,26 @@ +# JAM style makefile for tweak tools + +PREF_CCFLAGS += $(CCOPTFLAG) ; # Turn optimisation on +#PREF_CCFLAGS += $(CCDEBUGFLAG) ; # Debugging flags +#PREF_CCFLAGS += $(CCPROFFLAG) ; # Profile flags +#PREF_LINKFLAGS += $(LINKPROFFLAG) ; # Profile flags +#PREF_CCFLAGS += $(CCHEAPDEBUG) ; # Heap Debugging flags +PREF_LINKFLAGS += $(LINKDEBUGFLAG) ; # Link debugging flags + +#Products +Executables = refine ; + +#Install +InstallBin $(DESTDIR)$(PREFIX)/bin : $(Executables) ; + +HDRS = ../h ../icc ../cgats ../xicc ../spectro ../gamut + ../rspl ../numlib ../plot ; +LINKLIBS = ../icc/libicc ../xicc/libxicc + ../spectro/libinsttypes ../gamut/libgamut + ../gamut/libgammap ../rspl/librspl + ../cgats/libcgats ../numlib/libnum + ../plot/libplot ../plot/libvrml $(LibWin) ; + +# Profile refiner +Main refine : refine.c ; + diff --git a/tweak/License.txt b/tweak/License.txt new file mode 100644 index 0000000..a871fcf --- /dev/null +++ b/tweak/License.txt @@ -0,0 +1,662 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. + diff --git a/tweak/Makefile.am b/tweak/Makefile.am new file mode 100644 index 0000000..4cb59ba --- /dev/null +++ b/tweak/Makefile.am @@ -0,0 +1,11 @@ +include $(top_srcdir)/Makefile.shared + +LDADD = ../spectro/libinsttypes.la ../gamut/libgamut.la \ + ../gamut/libgammap.la ../plot/libvrml.la ../xicc/libxutils.la \ + ../xicc/libxicc.la ../rspl/librspl.la ../gamut/libgamut.la \ + ../gamut/libgammap.la $(ICC_LIBS) ../cgats/libcgats.la \ + ../numlib/libargyllnum.la $(TIFF_LIBS) + +bin_PROGRAMS = refine + +EXTRA_DIST = License.txt Readme.txt diff --git a/tweak/Readme.txt b/tweak/Readme.txt new file mode 100644 index 0000000..a409b90 --- /dev/null +++ b/tweak/Readme.txt @@ -0,0 +1,5 @@ +This direcory holds general profile and device link +tweaking, refining & adjustment code. + +refine allows the colorimetric B2A table of a profile to be refined + in the light of target and measured patch values. diff --git a/tweak/afiles b/tweak/afiles new file mode 100644 index 0000000..e455547 --- /dev/null +++ b/tweak/afiles @@ -0,0 +1,5 @@ +Readme.txt +License.txt +afiles +Jamfile +refine.c diff --git a/tweak/refine.c b/tweak/refine.c new file mode 100644 index 0000000..2d931ca --- /dev/null +++ b/tweak/refine.c @@ -0,0 +1,1269 @@ + +/* + * Create/modify an abstract ICC transformation that will + * correct measured color inacuracies of a proof reproduction. + * Input is a list of target and actual CIE values. + * + * Author: Graeme W. Gill + * Date: 12/5/05 + * Version: 1.00 + * + * Copyright 2005, 2008 Graeme W. Gill + * Please refer to License.txt file for details. + */ + +/* TTBD: + * + */ + +/* Basic idea: + + Given to .ti3 files (or equivalent CGATS files), one containing a + spread of target patch values (XYZ, Lab or spectral), and the + other containing the corresponding measured values, a PCS->PCS + correction RSPL mapping is created to adjust for any innacuracy + in the B2A table, which is then used to refine an existing abstract + correction profile. (Any device values in the .ti3 tables are ignored.) + + The refined abstract profile can then be used to create an adjusted + device profile, or an adjusted device link. + + Complications are: + + Measurements are absolute, while an abstract profile + is relative. + - use flag to mark this when abstract is used, or mark in profile header ? + + Corrections shouldn't go outside the target devices gamut, or + they will lead to out of control regions on the gamut surface. + - need output profile to clip changes to gamut surface. + + Refinement feedback could go unstable. + - use a damping factor to improve stability. + + Currently the way out of gamut value are handled is to + allow a full attempt at correction for the first round, + and then constrain any subsequent corrections to be + of no greater magnitude than that first correction. + Subsequent corrections can change the direction of + correction, but cannot increase its magnitude. This + seems to work OK with light out of gamut colors, + but dark CMYK out of gamut colors sometimes regress at + the first step, possibly because of the gamut boundary + topolgy in those regions. + + Interestingly, for CMYK the results are most stable (in simulation) + when applied to the simple linked device link, and tends to + be slightly unstable when applied to inverse A2B lookups + that are used in profile and icclink -G. This could be a symptom + of the black generation non-uniformity problem causing instability + in the black inversion. Moving to optimised separation CMYK + profile generation might overcome this problem. + + NOTE:- the current value for the rspl weak default weight seems OK + for a reasonable number of points, but if refine was to be used for + arbitrary tweaking, it should probably be made a tunable parameter + that affects the radius of influence of each adjustment point. +*/ + + +#include +#include +#include +#include +#include +#include +#include "copyright.h" +#include "aconfig.h" +#include "numlib.h" +#include "rspl.h" +#include "xicc.h" +#include "xicc.h" + +#define COMPLOOKUP /* Compound with previous in ICM lookup rather than rspl */ +#undef WARN_CLUT_CLIPPING /* [Undef] Print warning if setting clut clips */ +#undef DEBUG1 /* Print each correction value */ +#undef DEBUG2 /* Print each value changed */ +#undef DEBUG3 /* Trace history of particular points */ + +#define verbo stdout + +#define RSPLFLAGS (0 /* | RSPL_2PASSSMTH | RSPL_EXTRAFIT2 */) + +#define DEF_DAMP1 0.95 /* Initial */ +#define DEF_DAMP2 0.70 /* Subsequent */ +#define DEF_CLUTRES 33 +#define GAMRES 10.0 +#define SMOOTHF 0.3 /* RSPL smoothing factor */ +#define AVGDEV 0.003 /* Average deviation of input values */ +#define WWEIGHT 1.0 /* weak default function weight */ +#define WHITEWEIGHT 5.0 /* Weight to put on discovered white correction */ + +#ifdef DEBUG3 +/* Debug points of interest */ +int poi[] = { + 8, + 15, + 10, + 14, + 380, + 274, + 562, + 172, + 510, + 331, + 297, + 494, + 102, + 18, + 13, + 6, + 305, + 61, + 455, + 63, + 461, + 68, + 7, + 369, + 211, + 42, + 427, + 113, + 204, + 224, + 334, + 28, + 175, + 330, + 273, + 376, + 318, + 44, + 57, + 469, + 9, + 85, + 278, + 414, + 124, + -1 +}; + +#endif /* DEBUG3 */ + +void usage(char *diag, ...) { + fprintf(stderr,"Create abstract correction profile given table of absolute CIE correction values, Version %s\n",ARGYLL_VERSION_STR); + fprintf(stderr,"Author: Graeme W. Gill, licensed under the AGPL Version 3\n"); + if (diag != NULL) { + va_list args; + fprintf(stderr,"Diagnostic: "); + va_start(args, diag); + vfprintf(stderr, diag, args); + va_end(args); + fprintf(stderr,"\n"); + } + fprintf(stderr,"usage: refine [-options] cietarget ciecurrent [outdevicc] [inabs] outabs\n"); + fprintf(stderr," -v Verbose\n"); + fprintf(stderr," -c Create initial abstract correction profile\n"); + fprintf(stderr," -g Don't impose output device gamut limit\n"); + fprintf(stderr," -r res Set abstract profile clut resolution (default %d)\n",DEF_CLUTRES); + fprintf(stderr," -d factor Override default damping factor (default %f, then %f)\n",DEF_DAMP1,DEF_DAMP2); + fprintf(stderr," -R Aim for white point relative match rather than absolute\n"); + fprintf(stderr," -f [illum] Use Fluorescent Whitening Agent compensation [opt. simulated inst. illum.:\n"); + fprintf(stderr," M0, M1, M2, A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp]\n"); + fprintf(stderr," -i illum Choose illuminant for computation of CIE XYZ from spectral data & FWA:\n"); + fprintf(stderr," A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp\n"); + fprintf(stderr," -o observ Choose CIE Observer for spectral data:\n"); + fprintf(stderr," 1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2\n"); + fprintf(stderr," cietarget Target CIE or spectral values, CGATS file (e.g. .ti3)\n"); + fprintf(stderr," ciecurrent Actual CIE or spectral values, CGATS file (e.g. .ti3)\n"); + fprintf(stderr," [outdevicc] Output device ICC profile to set gamut limit (not used if -g)\n"); + fprintf(stderr," [inabs] Previous abstract correction ICC profile (not used if -c)\n"); + fprintf(stderr," outabs Created/refined abstract correction ICC profile\n"); + exit(1); +} + +/* ------------------------------------------- */ +/* structure to support icc Lut initialisation/modification calbacks */ + +struct _callback { + int verb; /* Verbosity */ + int total, count, last; /* Progress count information */ + rspl *r; /* correction transform */ + icmLuBase *rd_luo; /* Existing abstract profile (NULL if none) */ + gamut *dev_gam; /* Gamut of output device (NULL if none) */ +}; typedef struct _callback callback; + + +/* - - - - */ +/* clut */ + +/* New CLUT table */ +/* Correct for PCS errors */ +void PCSp_PCSp(void *cntx, double *out, double *in) { + callback *p = (callback *)cntx; + co pp; + +#ifdef DEBUG2 + printf("Got Lab in %f %f %f\n",in[0],in[1],in[2]); +#endif + + pp.p[0] = in[0]; + pp.p[1] = in[1]; + pp.p[2] = in[2]; + p->r->interp(p->r, &pp); /* This correction */ + out[0] = pp.v[0]; + out[1] = pp.v[1]; + out[2] = pp.v[2]; + +#ifdef COMPLOOKUP + /* Compound with previous correction */ + if (p->rd_luo != NULL) { + p->rd_luo->lookup(p->rd_luo, out, out); /* Previous correction */ + } +#endif + +#ifdef DEBUG2 + printf("Got Lab out %f %f %f\n",out[0],out[1],out[2]); + printf("\n"); +#endif + + if (p->verb) { /* Output percent intervals */ + int pc; + p->count++; + pc = p->count * 100.0/p->total + 0.5; + if (pc != p->last) { + printf("%c%2d%%",cr_char,pc), fflush(stdout); + p->last = pc; + } + } +} + +/* ------------------------------------------- */ + +/* Patch value type */ +typedef struct { + char sid[50]; /* sample id */ + double v[3]; /* CIE value */ + double de; /* Delta E */ +} pval; + +/* Weak default function */ +static void wfunc(void *cbntx, double *out, double *in) { + out[0] = in[0]; + out[1] = in[1]; + out[2] = in[2]; +} + +int +main(int argc, char *argv[]) { + int fa,nfa; /* argument we're looking at */ + struct { + char name[MAXNAMEL+1]; /* Patch filename */ + int npat; /* Number of patches */ + pval *pat; /* patch values */ + } cg[2]; /* Target and current patch file information */ + char dev_name[MAXNAMEL+1]; /* Output device ICC filename for gamut */ + char rd_name[MAXNAMEL+1]; /* Abstract profile ICC to modify */ + char wr_name[MAXNAMEL+1]; /* Modified/created abstract profile ICC */ + + int dorel = 0; /* Do white point relative match */ + int *match; /* Array mapping first list indexes to corresponding second */ + int fwacomp = 0; /* FWA compensation on spectral ? */ + int spec = 0; /* Use spectral data flag */ + icxIllumeType tillum = icxIT_none; /* Target/simulated instrument illuminant */ + xspect cust_tillum, *tillump = NULL; /* Custom target/simulated illumination spectrum */ + icxIllumeType illum = icxIT_D50; /* Spectral defaults */ + xspect cust_illum; /* Custom illumination spectrum */ + icxObserverType observ = icxOT_Judd_Voss_2; + callback cb; /* Callback support stucture for setting abstract profile */ + + icmFile *rd_fp = NULL; /* Existing abstract profile to modify */ + icc *rd_icc = NULL; + + icmFile *wr_fp; /* Modified/created abstract profile to write */ + icc *wr_icc; + + int verb = 0; + int nogamut = 0; /* Don't impose a gamut limit */ + int docreate = 0; /* Create an initial abstract correction profile */ + int clutres = DEF_CLUTRES; /* Output abstract profile clut resolution */ + double damp1 = DEF_DAMP1; /* Initial damping factor */ + double damp2 = DEF_DAMP2; /* Subsequent damping factor */ + double smoothf = SMOOTHF; /* RSPL Smoothing factor */ + double avgdev[MXDO]; /* RSPL Average Deviation */ + double wweight = WWEIGHT; /* weak default function weight */ + int whitepatch = -1; /* Index of white patch */ + double merr = 0.0, aerr = 0.0; /* Stats on color change */ + int i, j, e, n, rv = 0; + + error_program = argv[0]; + check_if_not_interactive(); + + if (argc < 6) + usage("Too few arguments"); + + /* Process the arguments */ + for(fa = 1;fa < argc;fa++) { + nfa = fa; /* skip to nfa if next argument is used */ + if (argv[fa][0] == '-') { /* Look for any flags */ + char *na = NULL; /* next argument after flag, null if none */ + + if (argv[fa][2] != '\000') + na = &argv[fa][2]; /* next is directly after flag */ + else { + if ((fa+1) < argc) { + if (argv[fa+1][0] != '-') { + nfa = fa + 1; + na = argv[nfa]; /* next is seperate non-flag argument */ + } + } + } + + if (argv[fa][1] == '?') + usage("Usage requested"); + + /* Verbosity */ + else if (argv[fa][1] == 'v') { + verb = 1; + } + /* Create initial abstract correction profile */ + else if (argv[fa][1] == 'c') { + docreate = 1; + } + /* Don't impose a gamut limit */ + else if (argv[fa][1] == 'g') { + nogamut = 1; + } + /* Override the correction clut resolution */ + else if (argv[fa][1] == 'r') { + fa = nfa; + if (na == NULL) usage("Expect argument to -r"); + clutres = atoi(na); + } + /* Override the damping factor */ + else if (argv[fa][1] == 'd') { + fa = nfa; + if (na == NULL) usage("Expect argument to -d"); + damp2 = atof(na); + } + /* Aim for white point relative match */ + else if (argv[fa][1] == 'R') { + dorel = 1; + } + + /* FWA compensation */ + else if (argv[fa][1] == 'f') { + fwacomp = 1; + + if (na != NULL) { /* Argument is present - target/simulated instr. illum. */ + fa = nfa; + if (strcmp(na, "A") == 0 + || strcmp(na, "M0") == 0) { + spec = 1; + tillum = icxIT_A; + } else if (strcmp(na, "C") == 0) { + spec = 1; + tillum = icxIT_C; + } else if (strcmp(na, "D50") == 0 + || strcmp(na, "M1") == 0) { + spec = 1; + tillum = icxIT_D50; + } else if (strcmp(na, "D50M2") == 0 + || strcmp(na, "M2") == 0) { + spec = 1; + tillum = icxIT_D50M2; + } else if (strcmp(na, "D65") == 0) { + spec = 1; + tillum = icxIT_D65; + } else if (strcmp(na, "F5") == 0) { + spec = 1; + tillum = icxIT_F5; + } else if (strcmp(na, "F8") == 0) { + spec = 1; + tillum = icxIT_F8; + } else if (strcmp(na, "F10") == 0) { + spec = 1; + tillum = icxIT_F10; + } else { /* Assume it's a filename */ + spec = 1; + tillum = icxIT_custom; + if (read_xspect(&cust_tillum, na) != 0) + usage("Unable to read custom spectrum '%s'",na); + } + } + } + + /* Spectral to CIE Illuminant type */ + else if (argv[fa][1] == 'i') { + fa = nfa; + if (na == NULL) usage("Expect argument to -i"); + if (strcmp(na, "A") == 0) { + spec = 1; + illum = icxIT_A; + } else if (strcmp(na, "C") == 0) { + spec = 1; + illum = icxIT_C; + } else if (strcmp(na, "D50") == 0) { + spec = 1; + illum = icxIT_D50; + } else if (strcmp(na, "D50M2") == 0) { + spec = 1; + illum = icxIT_D50M2; + } else if (strcmp(na, "D65") == 0) { + spec = 1; + illum = icxIT_D65; + } else if (strcmp(na, "F5") == 0) { + spec = 1; + illum = icxIT_F5; + } else if (strcmp(na, "F8") == 0) { + spec = 1; + illum = icxIT_F8; + } else if (strcmp(na, "F10") == 0) { + spec = 1; + illum = icxIT_F10; + } else { /* Assume it's a filename */ + spec = 1; + illum = icxIT_custom; + if (read_xspect(&cust_illum, na) != 0) + usage("Unable to read custom spectrum '%s'",na); + } + } + + /* Spectral Observer type */ + else if (argv[fa][1] == 'o') { + fa = nfa; + if (na == NULL) usage("Expected argument to -o"); + if (strcmp(na, "1931_2") == 0) { /* Classic 2 degree */ + spec = 1; + observ = icxOT_CIE_1931_2; + } else if (strcmp(na, "1964_10") == 0) { /* Classic 10 degree */ + spec = 1; + observ = icxOT_CIE_1964_10; + } else if (strcmp(na, "1955_2") == 0) { /* Stiles and Burch 1955 2 degree */ + spec = 1; + observ = icxOT_Stiles_Burch_2; + } else if (strcmp(na, "1978_2") == 0) { /* Judd and Voss 1978 2 degree */ + spec = 1; + observ = icxOT_Judd_Voss_2; + } else if (strcmp(na, "shaw") == 0) { /* Shaw and Fairchilds 1997 2 degree */ + spec = 1; + observ = icxOT_Shaw_Fairchild_2; + } else + usage("Unrecogised argument '%s' to -o",na); + } + + else + usage("Unrecognised flag -%c",argv[fa][1]); + } else + break; + } + + /* Grab all the filenames: */ + + /* The two CIE value files */ + if (fa >= argc || argv[fa][0] == '-') usage("Expected cietarget file argument"); + strncpy(cg[0].name,argv[fa++],MAXNAMEL); cg[0].name[MAXNAMEL] = '\000'; + + if (fa >= argc || argv[fa][0] == '-') usage("Expected ciecurrent file argument"); + strncpy(cg[1].name,argv[fa++],MAXNAMEL); cg[1].name[MAXNAMEL] = '\000'; + + /* Optional output device name */ + if (nogamut == 0) { + if (fa >= argc || argv[fa][0] == '-') usage("Expected outdevicc file argument"); + strncpy(dev_name,argv[fa++],MAXNAMEL); dev_name[MAXNAMEL] = '\000'; + } + + /* Optional input abstract profile name */ + if (docreate == 0) { + if (fa >= argc || argv[fa][0] == '-') usage("Expected inabs file argument"); + strncpy(rd_name,argv[fa++],MAXNAMEL); rd_name[MAXNAMEL] = '\000'; + } + + /* Output abstract profile name */ + if (fa >= argc || argv[fa][0] == '-') usage("Expected outabs file argument"); + strncpy(wr_name,argv[fa++],MAXNAMEL); wr_name[MAXNAMEL] = '\000'; + + /* ======================= */ + /* Open up each CIE file in turn, target then measured, */ + /* and read in the CIE values. */ + for (n = 0; n < 2; n++) { + cgats *cgf = NULL; /* cgats file data */ + int isLab = 0; /* 0 if file CIE is XYZ, 1 if is Lab */ + int sidx; /* Sample ID index */ + int xix, yix, zix; + + /* Open CIE target values */ + cgf = new_cgats(); /* Create a CGATS structure */ + cgf->add_other(cgf, ""); /* Allow any signature file */ + + if (cgf->read_name(cgf, cg[n].name)) + error("CGATS file '%s' read error : %s",cg[n].name,cgf->err); + + if (cgf->ntables < 1) + error ("Input file '%s' doesn't contain at least one table",cg[n].name); + + /* Check if the file is suitable */ + if (!spec + && cgf->find_field(cgf, 0, "LAB_L") < 0 + && cgf->find_field(cgf, 0, "XYZ_X") < 0) { + + if (cgf->find_kword(cgf, 0, "SPECTRAL_BANDS") < 0) + error ("Neither CIE nor spectral data found in file '%s'",cg[n].name); + + /* Switch to using spectral information */ + if (verb) + printf("No CIE data found, switching to spectral with standard observer & D50 for file '%s'\n",cg[n].name); + spec = 1; + illum = icxIT_D50; + observ = icxOT_CIE_1931_2; + } + if (spec && cgf->find_kword(cgf, 0, "SPECTRAL_BANDS") < 0) + error ("No spectral data data found in file '%s' when spectral expected",cg[n].name); + + if (!spec && cgf->find_field(cgf, 0, "LAB_L") >= 0) + isLab = 1; + + cg[n].npat = cgf->t[0].nsets; /* Number of patches */ + + /* Read all the target patches */ + if (cg[n].npat <= 0) + error("No sets of data in file '%s'",cg[n].name); + + if (verb && n == 0) { + fprintf(verbo,"No of test patches = %d\n",cg[n].npat); + } + + /* Allocate arrays to hold test patch input and output values */ + if ((cg[n].pat = (pval *)malloc(sizeof(pval) * cg[n].npat)) == NULL) + error("Malloc failed - pat[]"); + + /* Read in the CGATs fields */ + if ((sidx = cgf->find_field(cgf, 0, "SAMPLE_ID")) < 0 + && (sidx = cgf->find_field(cgf, 0, "SampleName")) < 0 + && (sidx = cgf->find_field(cgf, 0, "Sample_Name")) < 0 + && (sidx = cgf->find_field(cgf, 0, "SAMPLE_NAME")) < 0 + && (sidx = cgf->find_field(cgf, 0, "SAMPLE_LOC")) < 0) + error("Input file '%s' doesn't contain field SAMPLE_ID, SampleName, Sample_Name, SAMPLE_NAME or SAMPLE_LOC",cg[n].name); + if (cgf->t[0].ftype[sidx] != nqcs_t + && cgf->t[0].ftype[sidx] != cs_t) + error("Sample ID/Name field isn't a quoted or non quoted character string"); + + if (spec == 0) { /* Using instrument tristimulous value */ + + if (isLab) { /* Expect Lab */ + if ((xix = cgf->find_field(cgf, 0, "LAB_L")) < 0) + error("Input file '%s' doesn't contain field LAB_L",cg[n].name); + if (cgf->t[0].ftype[xix] != r_t) + error("Field LAB_L is wrong type"); + if ((yix = cgf->find_field(cgf, 0, "LAB_A")) < 0) + error("Input file '%s' doesn't contain field LAB_A",cg[n].name); + if (cgf->t[0].ftype[yix] != r_t) + error("Field LAB_A is wrong type"); + if ((zix = cgf->find_field(cgf, 0, "LAB_B")) < 0) + error("Input file '%s' doesn't contain field LAB_B",cg[n].name); + if (cgf->t[0].ftype[zix] != r_t) + error("Field LAB_B is wrong type"); + + } else { /* Expect XYZ */ + if ((xix = cgf->find_field(cgf, 0, "XYZ_X")) < 0) + error("Input file '%s' doesn't contain field XYZ_X",cg[n].name); + if (cgf->t[0].ftype[xix] != r_t) + error("Field XYZ_X is wrong type"); + if ((yix = cgf->find_field(cgf, 0, "XYZ_Y")) < 0) + error("Input file '%s' doesn't contain field XYZ_Y",cg[n].name); + if (cgf->t[0].ftype[yix] != r_t) + error("Field XYZ_Y is wrong type"); + if ((zix = cgf->find_field(cgf, 0, "XYZ_Z")) < 0) + error("Input file '%s' doesn't contain field XYZ_Z",cg[n].name); + if (cgf->t[0].ftype[zix] != r_t) + error("Field XYZ_Z is wrong type"); + } + + for (i = 0; i < cg[n].npat; i++) { + strcpy(cg[n].pat[i].sid, (char *)cgf->t[0].fdata[i][sidx]); + cg[n].pat[i].v[0] = *((double *)cgf->t[0].fdata[i][xix]); + cg[n].pat[i].v[1] = *((double *)cgf->t[0].fdata[i][yix]); + cg[n].pat[i].v[2] = *((double *)cgf->t[0].fdata[i][zix]); + if (!isLab) { + cg[n].pat[i].v[0] /= 100.0; /* Normalise XYZ to range 0.0 - 1.0 */ + cg[n].pat[i].v[1] /= 100.0; + cg[n].pat[i].v[2] /= 100.0; + } + if (!isLab) { /* Convert test patch result XYZ to PCS (D50 Lab) */ + icmXYZ2Lab(&icmD50, cg[n].pat[i].v, cg[n].pat[i].v); + } + } + + } else { /* Using spectral data */ + int ii; + xspect sp; + char buf[100]; + int spi[XSPECT_MAX_BANDS]; /* CGATS indexes for each wavelength */ + xsp2cie *sp2cie; /* Spectral conversion object */ + + if ((ii = cgf->find_kword(cgf, 0, "SPECTRAL_BANDS")) < 0) + error ("Input file doesn't contain keyword SPECTRAL_BANDS"); + sp.spec_n = atoi(cgf->t[0].kdata[ii]); + if ((ii = cgf->find_kword(cgf, 0, "SPECTRAL_START_NM")) < 0) + error ("Input file doesn't contain keyword SPECTRAL_START_NM"); + sp.spec_wl_short = atof(cgf->t[0].kdata[ii]); + if ((ii = cgf->find_kword(cgf, 0, "SPECTRAL_END_NM")) < 0) + error ("Input file doesn't contain keyword SPECTRAL_END_NM"); + sp.spec_wl_long = atof(cgf->t[0].kdata[ii]); + sp.norm = 100.0; + + /* Find the fields for spectral values */ + for (j = 0; j < sp.spec_n; j++) { + int nm; + + /* Compute nearest integer wavelength */ + nm = (int)(sp.spec_wl_short + ((double)j/(sp.spec_n-1.0)) + * (sp.spec_wl_long - sp.spec_wl_short) + 0.5); + + sprintf(buf,"SPEC_%03d",nm); + + if ((spi[j] = cgf->find_field(cgf, 0, buf)) < 0) + error("Input file doesn't contain field %s",buf); + } + + /* Figure out what sort of device it is */ + { + int ti; + + if ((ti = cgf->find_kword(cgf, 0, "DEVICE_CLASS")) < 0) + error ("Input file '%s' doesn't contain keyword DEVICE_CLASS",cg[n].name); + + if (strcmp(cgf->t[0].kdata[ti],"DISPLAY") == 0) { + illum = icxIT_none; /* Displays are assumed to be self luminous */ + } + } + + /* Create a spectral conversion object */ + if ((sp2cie = new_xsp2cie(illum, illum == icxIT_none ? NULL : &cust_illum, + observ, NULL, icSigLabData, icxClamp)) == NULL) + error("Creation of spectral conversion object failed"); + + if (fwacomp) { + int ti; + xspect mwsp; /* Medium spectrum */ + instType itype; /* Spectral instrument type */ + xspect insp; /* Instrument illuminant */ + + mwsp = sp; /* Struct copy */ + + if ((ti = cgf->find_kword(cgf, 0, "TARGET_INSTRUMENT")) < 0) + error ("Can't find target instrument in '%s' needed for FWA compensation",cg[n].name); + + if ((itype = inst_enum(cgf->t[0].kdata[ti])) == instUnknown) + error ("Unrecognised target instrument '%s'", cgf->t[0].kdata[ti]); + + if (inst_illuminant(&insp, itype) != 0) + error ("Instrument doesn't have an FWA illuminent"); + + /* Determine a media white spectral reflectance */ + for (j = 0; j < mwsp.spec_n; j++) + mwsp.spec[j] = 0.0; + + /* Track the maximum reflectance for any band to determine white. */ + /* This might silently fail, if there isn't white in the sampe set. */ + for (i = 0; i < cg[0].npat; i++) { + for (j = 0; j < mwsp.spec_n; j++) { + double rv = *((double *)cgf->t[0].fdata[i][spi[j]]); + if (rv > mwsp.spec[j]) + mwsp.spec[j] = rv; + } + } + + /* If we are setting a specific simulated instrument illuminant */ + if (tillum != icxIT_none) { + tillump = &cust_tillum; + if (tillum != icxIT_custom) { + if (standardIlluminant(tillump, tillum, 0.0)) { + error("simulated inst. illum. not recognised"); + } + } + } + + if (sp2cie->set_fwa(sp2cie, &insp, tillump, &mwsp)) + error ("Set FWA on sp2cie failed"); + } + + for (i = 0; i < cg[0].npat; i++) { + + strcpy(cg[n].pat[i].sid, (char *)cgf->t[0].fdata[i][sidx]); + + /* Read the spectral values for this patch */ + for (j = 0; j < sp.spec_n; j++) { + sp.spec[j] = *((double *)cgf->t[0].fdata[i][spi[j]]); + } + + /* Convert it to CIE space */ + sp2cie->convert(sp2cie, cg[n].pat[i].v, &sp); + } + + sp2cie->del(sp2cie); /* Done with this */ + + } /* End of reading in CGATs file */ + cgf->del(cgf); /* Clean up */ + } + + /* Check that the number of test patches matches */ + if (cg[0].npat != cg[1].npat) + error("Number of patches between '%s' and '%s' doesn't match",cg[0].name,cg[1].name); + + /* Create a list to map the second list (measured) of patches to the first (target) */ + if ((match = (int *)malloc(sizeof(int) * cg[0].npat)) == NULL) + error("Malloc failed - match[]"); + for (i = 0; i < cg[0].npat; i++) { + for (j = 0; j < cg[1].npat; j++) { + if (strcmp(cg[0].pat[i].sid, cg[1].pat[j].sid) == 0) + break; /* Found it */ + } + if (j < cg[1].npat) { + match[i] = j; + } else { + error("Failed to find matching patch to '%s'",cg[0].pat[i].sid); + } + } + + /* Try and figure out which is the white patch */ + { + double hL = -1.0; + for (i = 0; i < cg[0].npat; i++) { + if (cg[0].pat[i].v[0] > hL) { + hL = cg[0].pat[i].v[0]; + whitepatch = i; + } + } + } + + /* If we are aiming for a white point relative match, adjust the */ + /* measured and target values to have a D50 white point */ + if (dorel) { + for (n = 0; n < 2; n++) { + int wpix; /* White patch index */ + double wp_xyz[3]; + icmXYZNumber wp; /* White value */ + double mat[3][3]; /* Chromatic transform */ + + if (n == 0) + wpix = whitepatch; + else + wpix = match[whitepatch]; + + + /* Compute a chromatic correction matrix */ + icmLab2XYZ(&icmD50, wp_xyz, cg[n].pat[wpix].v); + icmAry2XYZ(wp, wp_xyz); + + icmChromAdaptMatrix(ICM_CAM_BRADFORD, icmD50, wp, mat); + + for (i = 0; i < cg[n].npat; i++) { + icmLab2XYZ(&icmD50, cg[n].pat[i].v, cg[n].pat[i].v); + icmMulBy3x3(cg[n].pat[i].v, mat, cg[n].pat[i].v); + icmXYZ2Lab(&icmD50, cg[n].pat[i].v, cg[n].pat[i].v); +//printf("Table %d, patch %d, Lab %f %f %f\n",n,i,cg[n].pat[i].v[0],cg[n].pat[i].v[1],cg[n].pat[i].v[2]); + } + } + } + + /* Compute the delta E's just for information */ + for (i = 0; i < cg[0].npat; i++) { + double de = icmLabDE(cg[0].pat[i].v, cg[1].pat[match[i]].v); + cg[0].pat[i].de = de; + if (de > merr) + merr = de; + aerr += de; + } + if (cg[0].npat > 0) + aerr /= (double)cg[0].npat; + + if (verb) { + fprintf(verbo,"No of correction patches = %d\n",cg[0].npat); + fprintf(verbo,"Average dE = %f, Maximum dE = %f\n",aerr,merr); + fprintf(verbo,"White patch assumed to be patch %s\n",cg[0].pat[whitepatch].sid); + } + + /* ======================= */ + /* Possible limiting gamut */ + if (nogamut == 0) { + icmFile *dev_fp; + icc *dev_icc; + xicc *dev_xicc; + icxLuBase *dev_luo; + icxInk ink; /* Ink parameters */ + + /* Open up the device ICC profile, so that we can create a gamut */ + /* and get an absolute PCS->device conversion */ + if ((dev_fp = new_icmFileStd_name(dev_name,"r")) == NULL) + error ("Can't open file '%s'",dev_name); + + if ((dev_icc = new_icc()) == NULL) + error("Creation of ICC object failed"); + + /* Read header etc. */ + if ((rv = dev_icc->read(dev_icc,dev_fp,0)) != 0) + error("Reading profile '%s' failed: %d, %s",dev_name,rv,dev_icc->err); + + /* Check that the profile is appropriate */ + if (dev_icc->header->deviceClass != icSigInputClass + && dev_icc->header->deviceClass != icSigDisplayClass + && dev_icc->header->deviceClass != icSigOutputClass) + error("Device Profile '%s' isn't a device profile",dev_name); + + ink.tlimit = -1.0; /* No ink limit by default */ + ink.klimit = -1.0; + + /* Wrap with an expanded icc */ + if ((dev_xicc = new_xicc(dev_icc)) == NULL) + error ("Creation of xicc failed"); + + /* Use a heuristic to guess the ink limit */ + icxGetLimits(dev_xicc, &ink.tlimit, &ink.klimit); + ink.tlimit += 0.05; /* allow a slight margine */ + + if (verb) + printf("Estimated Total inklimit is %f%%, Black %f%% \n",100.0 * ink.tlimit,ink.klimit < 0.0 ? 100.0 : 100.0 * ink.klimit); + + /* Get a expanded color conversion object suitable for gamut */ + if ((dev_luo = dev_xicc->get_luobj(dev_xicc, ICX_CLIP_NEAREST, icmFwd, + dorel ? icRelativeColorimetric : icAbsoluteColorimetric, + icSigLabData, icmLuOrdNorm, NULL, &ink)) == NULL) + error ("%d, %s",dev_xicc->errc, dev_xicc->err); + + /* Creat a gamut surface */ + if ((cb.dev_gam = dev_luo->get_gamut(dev_luo, GAMRES)) == NULL) + error ("%d, %s",dev_xicc->errc, dev_xicc->err); + + dev_luo->del(dev_luo); + dev_xicc->del(dev_xicc); + dev_icc->del(dev_icc); + dev_fp->del(dev_fp); + } else { + cb.dev_gam = NULL; + } + + /* ======================= */ + /* Open up the existing abstract profile that is to be refined. */ + if (docreate == 0) { + if ((rd_fp = new_icmFileStd_name(rd_name,"r")) == NULL) + error ("Can't open file '%s'",rd_name); + + if ((rd_icc = new_icc()) == NULL) + error ("Creation of ICC object failed"); + + /* Read header etc. */ + if ((rv = rd_icc->read(rd_icc,rd_fp,0)) != 0) + error ("%d, %s",rv,rd_icc->err); + + if (rd_icc->header->deviceClass != icSigAbstractClass) + error("Input Profile '%s' isn't abstract type",rd_name); + + if ((cb.rd_luo = rd_icc->get_luobj(rd_icc, icmFwd, + dorel ? icRelativeColorimetric : icAbsoluteColorimetric, + icSigLabData, icmLuOrdNorm)) == NULL) + error ("%d, %s",rd_icc->errc, rd_icc->err); + } else { + cb.rd_luo = NULL; + } + + /* ======================= */ + /* Create refining rspl */ + { + cow *rp; /* rspl setup points */ + int npnts = 0; /* Total number of test points */ + int gres[MXDI]; /* rspl grid resolution */ + double damp; + datai mn, mx; + + if ((rp = (cow *)malloc(sizeof(cow) * cg[0].npat)) == NULL) + error("Malloc failed - rp[]"); + + /* Create mapping points */ + for (i = 0; i < cg[0].npat; i++) { + double temp[3]; + double ccor[3], cmag; /* Current correction vector */ + double ncor[3], nmag; /* New correction vector */ + + /* Input is target [0] */ + for (j = 0; j < 3; j++) + rp[i].p[j] = cg[0].pat[i].v[j]; + + /* Cull out of range points */ + if (rp[i].p[0] < 0.0 || rp[i].p[0] > 100.0 + || rp[i].p[1] < -127.0 || rp[i].p[1] > 127.0 + || rp[i].p[2] < -127.0 || rp[i].p[2] > 127.0) { +#ifdef DEBUG1 + printf("Ignoring %f %f %f\n",rp[i].p[0],rp[i].p[1],rp[i].p[2]); +#endif + continue; + } + +#ifdef DEBUG1 + printf("%d: Target %f %f %f\n",i,rp[i].p[0],rp[i].p[1],rp[i].p[2]); +#endif + + damp = cb.rd_luo != NULL ? damp2 : damp1; + ccor[0] = ccor[1] = ccor[2] = 0.0; + cmag = 0.0; + + /* Lookup the current correction applied to the target */ + if (cb.rd_luo != NULL) { /* Subsequent pass */ + double corval[3]; + cb.rd_luo->lookup(cb.rd_luo, corval, cg[0].pat[i].v); + icmSub3(ccor, corval, cg[0].pat[i].v); + cmag = icmNorm3(ccor); +#ifdef DEBUG1 + printf("%d: ccor %f %f %f, mag %f\n",i, ccor[0],ccor[1],ccor[2],cmag); +#endif + } + + /* Create a trial 100% full correction point */ + for (j = 0; j < 3; j++) + rp[i].v[j] = ccor[j] + 2.0 * cg[0].pat[i].v[j] - cg[1].pat[match[i]].v[j]; + + /* If a first pass and the target or the correction are out of gamut, */ + /* use a damping factor of 1.0 */ + if (cb.rd_luo == NULL + && cb.dev_gam != NULL + && cb.dev_gam->nradial(cb.dev_gam, temp, rp[i].p) > 1.0 + && cb.dev_gam->nradial(cb.dev_gam, temp, rp[i].v) > 1.0) { + damp = 1.0; + } + +#ifdef DEBUG1 + printf("%d: damp = %f\n",i, damp); +#endif + + /* Create a new correction that does a damped correction to the current error */ + /* [0] = target, [1] = measured */ + for (j = 0; j < 3; j++) + ncor[j] = ccor[j] + damp * (cg[0].pat[i].v[j] - cg[1].pat[match[i]].v[j]); + nmag = icmNorm3(ncor); + +#ifdef DEBUG1 + printf("%d: ncor %f %f %f, mag %f\n",i, ncor[0],ncor[1],ncor[2],nmag); +#endif + + /* If this is not the first pass, limit the new correction */ + /* to be 1 + damp as big as the previous correction */ + if (cb.rd_luo != NULL) { + if ((nmag/cmag) > (1.0 + damp2)) { +#ifdef DEBUG1 + printf("%d: Limited cor mag from %f to %f\n",i, nmag, (1.0 + damp2) * cmag); +#endif + icmScale3(ncor, ncor, (1.0 + damp2) * cmag/nmag); + } + } + + /* Create correction point */ + for (j = 0; j < 3; j++) + rp[i].v[j] = cg[0].pat[i].v[j] + ncor[j]; + + /* If the target point or corrected point is likely to be outside */ + /* the gamut, limit the magnitude of the correction to be the same */ + /* as the previous correction. */ + if (cb.rd_luo != NULL && cb.dev_gam != NULL) { + if (cb.dev_gam->nradial(cb.dev_gam, temp, rp[i].p) > 1.0 + || cb.dev_gam->nradial(cb.dev_gam, temp, rp[i].v) > 1.0) { +#ifdef DEBUG1 + printf("%d: Limited cor mag from %f to %f\n",i, nmag, cmag); +#endif + icmScale3(ncor, ncor, cmag/nmag); + } + /* Create correction point again */ + for (j = 0; j < 3; j++) + rp[i].v[j] = cg[0].pat[i].v[j] + ncor[j]; + } + +#ifdef DEBUG1 + printf("%d: Was %f %f %f\n",i, cg[1].pat[match[i]].v[0], cg[1].pat[match[i]].v[1], cg[1].pat[match[i]].v[2]); + printf("%d: Correction to %f %f %f\n",i, rp[i].v[0], rp[i].v[1], rp[i].v[2]); +#endif + +#ifdef COMPLOOKUP + /* Remove current correction from new change */ + for (j = 0; j < 3; j++) + rp[i].v[j] -= ccor[j]; +#endif + /* Set weighting */ + if (i == whitepatch) + rp[i].w = WHITEWEIGHT; + else + rp[i].w = 1.0; + npnts++; + +#ifdef DEBUG3 + { + char fname[50], tmp[50]; + FILE *lf; + int mi = match[i]; + double tig, cig, rig; + double vv[3], temp[3]; + double del[3], delt; + double corrdel[3], corrdelt; + double pcval[3], pcorrdel[3], pcorrdelt; + + for (j = 0;; j++) { + if (poi[j] == (i+1) || poi[j] < 0) + break; + } + if (poi[j] < 0) { + continue; + } + +#ifdef COMPLOOKUP + /* Compute total correction point */ + for (j = 0; j < 3; j++) + vv[j] = rp[i].v[j] + ccor[j]; +#else + for (j = 0; j < 3; j++) + vv[j] = rp[i].v[j]; +#endif + sprintf(fname,"patch%04d.log",i+1); + if ((lf = fopen(fname, "a")) == NULL) + error("Unable to open debug3 log file '%s'\n",fname); + + cig = cb.dev_gam->nradial(cb.dev_gam, temp, cg[1].pat[mi].v) - 1.0; + if (cig > 0.0) + sprintf(tmp, " OUT %f",cig); + else + sprintf(tmp, ""); + fprintf(lf,"Currently %f %f %f%s\n", cg[1].pat[mi].v[0], cg[1].pat[mi].v[1], cg[1].pat[mi].v[2], tmp); + + tig = cb.dev_gam->nradial(cb.dev_gam, temp, cg[0].pat[i].v) - 1.0; + if (tig > 0.0) + sprintf(tmp, " OUT %f",tig); + else + sprintf(tmp, ""); + fprintf(lf,"Target %f %f %f%s\n", cg[0].pat[i].v[0], cg[0].pat[i].v[1], cg[0].pat[i].v[2], tmp); + + icmSub3(del, cg[1].pat[mi].v, cg[0].pat[i].v); + delt = icmNorm3(del); + fprintf(lf,"DE %f %f %f (%f)\n", del[0], del[1], del[2], delt); + + rig = cb.dev_gam->nradial(cb.dev_gam, temp, vv) - 1.0; + if (rig > 0.0) + sprintf(tmp, " OUT %f",rig); + else + sprintf(tmp, ""); + fprintf(lf,"Correction %f %f %f%s\n", vv[0], vv[1], vv[2], tmp); + icmSub3(corrdel, vv, cg[0].pat[i].v); + corrdelt = icmNorm3(corrdel); + fprintf(lf,"CorrDelta %f %f %f (%f)\n", corrdel[0], corrdel[1], corrdel[2], corrdelt); + /* Note the previous correction we're compunded with */ + if (cb.rd_luo != NULL) { + cb.rd_luo->lookup(cb.rd_luo, pcval, cg[0].pat[i].v); + icmSub3(pcorrdel, pcval, cg[0].pat[i].v); + pcorrdelt = icmNorm3(pcorrdel); + fprintf(lf,"PrevCorrDelta %f %f %f (%f)\n", pcorrdel[0], pcorrdel[1], pcorrdel[2], pcorrdelt); + } + fprintf(lf,"\n"); + + fclose(lf); + } +#endif /* DEBUG3 */ + } + + /* Create refining rspl */ + mn[0] = 0.0, mn[1] = mn[2] = -128.0; /* Allow for 16 bit grid range */ + mx[0] = 100.0, mx[1] = mx[2] = (65535.0 * 255.0)/65280.0 - 128.0; + cb.verb = verb; + if ((cb.r = new_rspl(RSPL_NOFLAGS, 3, 3)) == NULL) + error("new_rspl failed"); + + for (e = 0; e < 3; e++) + gres[e] = clutres; + for (e = 0; e < 3; e++) + avgdev[e] = AVGDEV; + + cb.r->fit_rspl_w_df(cb.r, + RSPLFLAGS /* Extra flags */ + | verb ? RSPL_VERBOSE : 0, + rp, /* Test points */ + npnts, /* Number of test points */ + mn, mx, gres, /* Low, high, resolution of grid */ + NULL, NULL, /* Default data scale */ + smoothf, /* Smoothing */ + avgdev, /* Average Deviation */ + NULL, /* Grid width */ + wweight, /* weak default function weight */ + NULL, /* No context */ + wfunc /* Weak function */ + ); + if (verb) printf("\n"); + + /* Report how good the fit is */ + if (verb) { + co tco; /* Test point */ + double maxe = -1e6, avge = 0.0; + + for (i = 0; i < npnts; i++) { + double de; + + icmAry2Ary(tco.p, rp[i].p); + cb.r->interp(cb.r, &tco); + + de = icmLabDE(tco.v, rp[i].v); + if (de > maxe) + maxe = de; + avge += de; + } + avge /= (double)npnts; + printf("Refining transform has error to defining points avg: %f, max %f\n",avge,maxe); + } + free(rp); + } + + /* ======================= */ + /* Create new abstract ICC profile */ + if ((wr_fp = new_icmFileStd_name(wr_name,"w")) == NULL) + error ("Can't open file '%s' for writing",wr_name); + + if ((wr_icc = new_icc()) == NULL) + error ("Creation of write ICC object failed"); + + /* Add all the tags required */ + + /* The header: */ + { + icmHeader *wh = wr_icc->header; + + /* Values that must be set before writing */ + wh->deviceClass = icSigAbstractClass; + wh->colorSpace = icSigLabData; + wh->pcs = icSigLabData; + if (dorel) + wh->renderingIntent = icRelativeColorimetric; /* White point relative */ + else + wh->renderingIntent = icAbsoluteColorimetric; /* Instrument reading based */ + } + /* Profile Description Tag: */ + { + icmTextDescription *wo; + char *dst = "Argyll refine output"; + if ((wo = (icmTextDescription *)wr_icc->add_tag( + wr_icc, icSigProfileDescriptionTag, icSigTextDescriptionType)) == NULL) + error("add_tag failed: %d, %s",wr_icc->errc,wr_icc->err); + + wo->size = strlen(dst)+1; /* Allocated and used size of desc, inc null */ + wo->allocate((icmBase *)wo);/* Allocate space */ + strcpy(wo->desc, dst); /* Copy the string in */ + } + /* Copyright Tag: */ + { + icmText *wo; + char *crt = "Copyright the user who created it"; + if ((wo = (icmText *)wr_icc->add_tag( + wr_icc, icSigCopyrightTag, icSigTextType)) == NULL) + error("add_tag failed: %d, %s",wr_icc->errc,wr_icc->err); + + wo->size = strlen(crt)+1; /* Allocated and used size of text, inc null */ + wo->allocate((icmBase *)wo);/* Allocate space */ + strcpy(wo->data, crt); /* Copy the text in */ + } + /* White Point Tag: */ + { + icmXYZArray *wo; + /* Note that tag types icSigXYZType and icSigXYZArrayType are identical */ + if ((wo = (icmXYZArray *)wr_icc->add_tag( + wr_icc, icSigMediaWhitePointTag, icSigXYZArrayType)) == NULL) + error("add_tag failed: %d, %s",wr_icc->errc,wr_icc->err); + + wo->size = 1; + wo->allocate((icmBase *)wo); /* Allocate space */ + wo->data[0] = icmD50; /* So absolute/relative rendering is the same */ + } + /* 16 bit pcs -> pcs lut: */ + { + icmLut *wo; + int flags = ICM_CLUT_SET_EXACT; /* Assume we're setting from RSPL's */ + + /* Intent 0 = default/perceptual */ + if ((wo = (icmLut *)wr_icc->add_tag( + wr_icc, icSigAToB0Tag, icSigLut16Type)) == NULL) + error("add_tag failed: %d, %s",wr_icc->errc,wr_icc->err); + + wo->inputChan = 3; + wo->outputChan = 3; + wo->clutPoints = clutres; + wo->inputEnt = 256; /* Not actually used */ + wo->outputEnt = 256; + wo->allocate((icmBase *)wo);/* Allocate space */ + + /* The matrix is only applicable to XYZ input space, */ + /* so it is not used here. */ + + /* Use helper function to do the hard work. */ + if (cb.verb) { + int extra; + for (cb.total = 1, i = 0; i < 3; i++, cb.total *= wo->clutPoints) + ; + /* Add in cell center points */ + for (extra = 1, i = 0; i < wo->inputChan; i++, extra *= (wo->clutPoints-1)) + ; + cb.total += extra; + cb.count = 0; + cb.last = -1; + printf(" 0%%"), fflush(stdout); + } + +#ifdef COMPLOOKUP + /* Compound with previous correction */ + if (cb.rd_luo != NULL) + flags = ICM_CLUT_SET_APXLS; /* Won't be least squares, so do extra sampling */ +#endif + + if (wo->set_tables(wo, + flags, + &cb, + icSigLabData, /* Input color space */ + icSigLabData, /* Output color space */ + NULL, /* Linear input transform Lab->Lab' (NULL = default) */ + NULL, NULL, /* Use default Maximum range of Lab' values */ + PCSp_PCSp, /* Lab' -> Lab' transfer function */ + NULL, NULL, /* Use default Maximum range of Lab' values */ + NULL /* Linear output transform Lab'->Lab */ + ) != 0) + error("Setting 16 bit Lab->Lab Lut failed: %d, %s",wr_icc->errc,wr_icc->err); + + if (verb) + printf("\n"); +#ifdef WARN_CLUT_CLIPPING + if (wr_icc->warnc) + warning("Values clipped in setting abstract LUT"); +#endif /* WARN_CLUT_CLIPPING */ + if (verb) + printf("Done filling abstract table\n"); + } + /* Write the file out */ + if ((rv = wr_icc->write(wr_icc,wr_fp,0)) != 0) + error ("Write file: %d, %s",rv,wr_icc->err); + + /* ======================================= */ + + /* Clean everything up */ + wr_icc->del(wr_icc); + wr_fp->del(wr_fp); + + if (docreate == 0) { + cb.rd_luo->del(cb.rd_luo); + rd_icc->del(rd_icc); + rd_fp->del(rd_fp); + } + + if (nogamut == 0) { + cb.dev_gam->del(cb.dev_gam); + } + + cb.r->del(cb.r); + + free(match); + free(cg[0].pat); + free(cg[1].pat); + + return 0; +} + -- cgit v1.2.3