1diff -ru misc/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in 2--- misc/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in 2007-08-20 15:10:34.000000000 -0500 3+++ misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in 2012-01-24 10:39:23.000000000 -0500 4@@ -102,15 +102,11 @@ 5 install_sh = @install_sh@ 6 7 SUBDIRS = \ 8- create_CLUT_profile \ 9- create_CLUT_profile_from_probe \ 10- create_display_profile 11+ create_sRGB_profile 12 13 14 DIST_SUBDIRS = \ 15- create_CLUT_profile \ 16- create_CLUT_profile_from_probe \ 17- create_display_profile 18+ create_sRGB_profile 19 20 subdir = Contrib/CmdLine 21 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 22Only in misc/build/SampleICC-1.3.2/Contrib/CmdLine: create_sRGB_profile 23diff -ru misc/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp misc/build/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp 24--- misc/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp 2007-08-20 15:04:53.000000000 -0500 25+++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp 2012-01-24 10:39:23.000000000 -0500 26@@ -77,6 +77,8 @@ 27 // 28 ////////////////////////////////////////////////////////////////////// 29 30+#include <stdlib.h> 31+#include <string.h> 32 #include <iostream> 33 #include <fstream> 34 #include <sstream> 35diff -ru misc/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h misc/build/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h 36--- misc/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h 2007-08-20 15:04:54.000000000 -0500 37+++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h 2012-01-24 10:39:23.000000000 -0500 38@@ -83,6 +83,7 @@ 39 #ifndef __DEFINED_ICC_TOOL_EXCEPTION_H__ 40 #define __DEFINED_ICC_TOOL_EXCEPTION_H__ 41 42+#include <string.h> 43 #include <exception> 44 #include <string> 45 46diff -ru misc/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in 47--- misc/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in 2007-08-20 15:10:35.000000000 -0500 48+++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in 2012-01-24 10:39:23.000000000 -0500 49@@ -133,7 +133,7 @@ 50 CONFIG_CLEAN_FILES = 51 LTLIBRARIES = $(lib_LTLIBRARIES) 52 53-libICC_utils_la_LIBADD = 54+libICC_utils_la_LIBADD = $(LDADD) 55 am_libICC_utils_la_OBJECTS = Stubs.lo CAT.lo CLUT.lo CLUT_stuffer.lo \ 56 ICC_tool_exception.lo Vetters.lo 57 libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS) 58diff -ru misc/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h 59--- misc/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h 2007-08-20 15:04:53.000000000 -0500 60+++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h 2012-01-24 10:39:23.000000000 -0500 61@@ -130,7 +130,7 @@ 62 63 // use one of these to force desired sort order in assoc. containers of DPX 64 bool 65- DPX::operator<(const DPX& p) const 66+ operator<(const DPX& p) const 67 { 68 return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_)); 69 } 70diff -ru misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp 71--- misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp 2007-08-20 15:04:54.000000000 -0500 72+++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp 2012-01-24 10:39:23.000000000 -0500 73@@ -1,322 +1,329 @@ 74-/* 75- File: Vetters.cpp 76- 77- Contains: Utility functions to handle common argument-checking tasks, in a 78- way that hides platform-specific details from higher-level code. 79- 80- Version: V1 81- 82- Copyright: ?? see below 83- */ 84- 85-/* 86- * The ICC Software License, Version 0.1 87- * 88- * 89- * Copyright (c) 2003-2006 The International Color Consortium. All rights 90- * reserved. 91- * 92- * Redistribution and use in source and binary forms, with or without 93- * modification, are permitted provided that the following conditions 94- * are met: 95- * 96- * 1. Redistributions of source code must retain the above copyright 97- * notice, this list of conditions and the following disclaimer. 98- * 99- * 2. Redistributions in binary form must reproduce the above copyright 100- * notice, this list of conditions and the following disclaimer in 101- * the documentation and/or other materials provided with the 102- * distribution. 103- * 104- * 3. The end-user documentation included with the redistribution, 105- * if any, must include the following acknowledgment: 106- * "This product includes software developed by the 107- * The International Color Consortium (www.color.org)" 108- * Alternately, this acknowledgment may appear in the software itself, 109- * if and wherever such third-party acknowledgments normally appear. 110- * 111- * 4. The names "ICC" and "The International Color Consortium" must 112- * not be used to imply that the ICC organization endorses or 113- * promotes products derived from this software without prior 114- * written permission. For written permission, please see 115- * <http://www.color.org/>. 116- * 117- * 118- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 119- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 120- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 121- * DISCLAIMED. IN NO EVENT SHALL THE INTERNATIONAL COLOR CONSORTIUM OR 122- * ITS CONTRIBUTING MEMBERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 123- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 124- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 125- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 126- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 127- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 128- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 129- * SUCH DAMAGE. 130- * ==================================================================== 131- * 132- * This software consists of voluntary contributions made by many 133- * individuals on behalf of the The International Color Consortium. 134- * 135- * 136- * Membership in the ICC is encouraged when this software is used for 137- * commercial purposes. 138- * 139- * 140- * For more information on The International Color Consortium, please 141- * see <http://www.color.org/>. 142- * 143- * 144- */ 145- 146-////////////////////////////////////////////////////////////////////// 147-// HISTORY: 148-// 149-// -Initial implementation by Joseph Goldstone sumer 2007 150-// 151-////////////////////////////////////////////////////////////////////// 152- 153-#include "Vetters.h" 154- 155-#include <sstream> 156-using namespace std; 157- 158-#ifndef WIN32 159-#include <sys/errno.h> 160-#else 161-#include <string.h> 162-int strerror_r(int errnum, char *str, int strsize) 163-{ 164- const char *errstr = strerror(errnum); 165- 166- if (errstr) { 167- strncpy(str, errstr, strsize); 168- return 0; 169- } 170- 171- return -1; 172-} 173-#define stat _stat 174-#endif 175- 176-#include "ICC_tool_exception.h" 177- 178-const char* 179-path_tail(const char* const s) 180-{ 181- const char* tail = strdup(s); 182- const char* last_slash = strrchr(tail, '/'); 183- if (last_slash != NULL) 184- tail = last_slash + 1; 185- return tail; 186-} 187- 188-void 189-vet_as_int(const char* const s, const string& name, 190- const string& description) 191-{ 192- istringstream ss(s); 193- int i; 194- ss >> i; 195- if (ss.fail()) 196- { 197- ostringstream oss; 198- oss << "The " << name << " argument given, `" << s << "', cannot be parsed as" 199- << " an integer. It should be an integer representing " 200- << description << "."; 201- throw ICC_tool_exception(oss.str()); 202- } 203-} 204- 205-void 206-vet_as_float(const char* const s, const string& name, 207- const string& description) 208-{ 209- istringstream ss(s); 210- float i; 211- ss >> i; 212- if (ss.fail()) 213- { 214- ostringstream oss; 215- oss << "The " << name << " argument given, `" << s << "', cannot be parsed as" 216- << " a floating-point number. It should be a floating-point number" 217- << " representing " << description << "."; 218- throw ICC_tool_exception(oss.str()); 219- } 220-} 221- 222-#define STRERROR_BUF_SIZE 256 223-off_t 224-get_size(const char* const s) 225-{ 226- struct stat sb; 227- int stat_returned = stat(s, &sb); 228- if (stat_returned < 0) 229- { 230- int stat_errno = errno; 231- char strerror_buf[STRERROR_BUF_SIZE]; 232- strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE); 233- ostringstream oss; 234- oss << "Could not access information for file `" << s << "': " 235- << strerror_buf; 236- throw ICC_tool_exception(oss.str()); 237- } 238- return sb.st_size; 239-} 240- 241-bool 242-check_mode(const char* const s, mode_t mode) 243-{ 244- struct stat sb; 245- int stat_returned = stat(s, &sb); 246- if (stat_returned < 0) 247- { 248- int stat_errno = errno; 249- char strerror_buf[STRERROR_BUF_SIZE]; 250- strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE); 251- ostringstream oss; 252- oss << "Could not access information for file `" << s << "': " 253- << strerror_buf; 254- throw ICC_tool_exception(oss.str()); 255- } 256- return (sb.st_mode & mode) != 0; 257-} 258- 259-bool 260-is_existent_file_pathname(const char* const s) 261-{ 262- struct stat sb; 263- return stat(s, &sb) == 0; 264-} 265- 266-bool 267-is_plain_file_pathname(const char* const s) 268-{ 269- return check_mode(s, S_IFREG); 270-} 271- 272-bool 273-is_directory(const char* const s) 274-{ 275- return check_mode(s, S_IFDIR); 276-} 277- 278-const char* const 279-containing_directory(const char* const s) 280-{ 281- if (strlen(s) == 0) 282- throw ICC_tool_exception("name of directory passed to containing_directory" 283- " function was zero-length."); 284- char* tmp = strdup(s); 285- // lop off any trailing seperator 286- if (tmp[strlen(tmp) - 1] == '/') 287- tmp[strlen(tmp) - 1] = 0; 288- if (strlen(tmp) == 0) 289- throw ICC_tool_exception("root directory (which has no containing" 290- " directory) passed to containing_directory" 291- " function"); 292- char* idx = strrchr(tmp, '/'); 293- if (idx != NULL) 294- { 295- *idx = 0; 296- return tmp; 297- } 298- char* current_directory = getenv("PWD"); 299- if (current_directory == NULL) 300- throw ICC_tool_exception("pathname passed to containing_directory has no" 301- " embedded seperator, and there is no value for" 302- " PWD defined in the environment"); 303- return strdup(current_directory); 304-} 305- 306-bool 307-is_readable_pathname(const char* const s) 308-{ 309- return check_mode(s, S_IRUSR) 310- || check_mode(s, S_IRGRP) 311- || check_mode(s, S_IROTH); 312-} 313- 314-bool 315-is_writable_pathname(const char* const s) 316-{ 317- return check_mode(s, S_IWUSR) 318- || check_mode(s, S_IWGRP) 319- || check_mode(s, S_IWOTH); 320-} 321- 322-bool 323-is_pathname_of_empty_file(const char* const s) 324-{ 325- return get_size(s) > 0; 326-} 327- 328-void 329-vet_input_file_pathname(const char* const s, const string& name, 330- const string& description) 331-{ 332- if (! is_plain_file_pathname(s)) 333- { 334- ostringstream oss; 335- oss << "The " << name << " argument given, `" << s << "', is not the pathname" 336- << " of a plain file (i.e. it is the pathname of a directory, or of a" 337- << " symbolic link, or of some other sort of special file.) It should be" 338- << " " << description << "."; 339- throw ICC_tool_exception(oss.str()); 340- } 341- if (! is_readable_pathname(s)) 342- { 343- ostringstream oss; 344- oss << "The " << name << " argument given, `" << s << "', is not the pathname" 345- << " of a readable file (i.e. you do not have permission to read that" 346- << " file, or you do not have permission to read some directory" 347- << " containing that file."; 348- throw ICC_tool_exception(oss.str()); 349- } 350- if (! is_pathname_of_empty_file(s)) 351- { 352- ostringstream oss; 353- oss << "The " << name << " argument given, `" << s << "', is not the pathname" 354- << " of an existing readable file, but that file is of zero length." 355- << " The argument should be " << description << "."; 356- throw ICC_tool_exception(oss.str()); 357- } 358-} 359- 360-void 361-vet_output_file_pathname(const char* const s, const string& name, 362- const string& description, 363- bool silent_overwrite_OK) 364-{ 365- const char* const container = containing_directory(s); 366- if (! is_writable_pathname(container)) 367- { 368- ostringstream oss; 369- oss << "The " << name << " argument given, `" << s << "', has a directory" 370- << " component which is not writable." 371- << " The argument should be " << description << "."; 372- throw ICC_tool_exception(oss.str()); 373- } 374- if (is_existent_file_pathname(s)) 375- { 376- if (is_plain_file_pathname(s)) 377- if (is_writable_pathname(s)) 378- { 379- if (! silent_overwrite_OK) 380- { 381- ostringstream oss; 382- oss << "The " << name << " argument given, `" << s << "' is of an existing" 383- << " file." 384- << " The argument should be " << description << "."; 385- throw ICC_tool_exception(oss.str()); 386- } 387- } else { 388- ostringstream oss; 389- oss << "The " << name << " argument given, `" << s << "' is of an existing" 390- << " file which is not writable." 391- << " The argument should be " << description << "."; 392- throw ICC_tool_exception(oss.str()); 393- } 394- } 395-} 396\ No newline at end of file 397+/* 398+ File: Vetters.cpp 399+ 400+ Contains: Utility functions to handle common argument-checking tasks, in a 401+ way that hides platform-specific details from higher-level code. 402+ 403+ Version: V1 404+ 405+ Copyright: ?? see below 406+ */ 407+ 408+/* 409+ * The ICC Software License, Version 0.1 410+ * 411+ * 412+ * Copyright (c) 2003-2006 The International Color Consortium. All rights 413+ * reserved. 414+ * 415+ * Redistribution and use in source and binary forms, with or without 416+ * modification, are permitted provided that the following conditions 417+ * are met: 418+ * 419+ * 1. Redistributions of source code must retain the above copyright 420+ * notice, this list of conditions and the following disclaimer. 421+ * 422+ * 2. Redistributions in binary form must reproduce the above copyright 423+ * notice, this list of conditions and the following disclaimer in 424+ * the documentation and/or other materials provided with the 425+ * distribution. 426+ * 427+ * 3. The end-user documentation included with the redistribution, 428+ * if any, must include the following acknowledgment: 429+ * "This product includes software developed by the 430+ * The International Color Consortium (www.color.org)" 431+ * Alternately, this acknowledgment may appear in the software itself, 432+ * if and wherever such third-party acknowledgments normally appear. 433+ * 434+ * 4. The names "ICC" and "The International Color Consortium" must 435+ * not be used to imply that the ICC organization endorses or 436+ * promotes products derived from this software without prior 437+ * written permission. For written permission, please see 438+ * <http://www.color.org/>. 439+ * 440+ * 441+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 442+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 443+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 444+ * DISCLAIMED. IN NO EVENT SHALL THE INTERNATIONAL COLOR CONSORTIUM OR 445+ * ITS CONTRIBUTING MEMBERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 446+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 447+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 448+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 449+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 450+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 451+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 452+ * SUCH DAMAGE. 453+ * ==================================================================== 454+ * 455+ * This software consists of voluntary contributions made by many 456+ * individuals on behalf of the The International Color Consortium. 457+ * 458+ * 459+ * Membership in the ICC is encouraged when this software is used for 460+ * commercial purposes. 461+ * 462+ * 463+ * For more information on The International Color Consortium, please 464+ * see <http://www.color.org/>. 465+ * 466+ * 467+ */ 468+ 469+////////////////////////////////////////////////////////////////////// 470+// HISTORY: 471+// 472+// -Initial implementation by Joseph Goldstone sumer 2007 473+// 474+////////////////////////////////////////////////////////////////////// 475+ 476+#include "Vetters.h" 477+ 478+#include <sstream> 479+using namespace std; 480+ 481+#ifndef WIN32 482+#ifdef sun 483+#include <errno.h> 484+#else 485+#include <sys/errno.h> 486+#endif 487+#else 488+#include <string.h> 489+#define stat _stat 490+#endif 491+ 492+#if defined WIN32 || defined sun 493+int strerror_r(int errnum, char *str, int strsize) 494+{ 495+ const char *errstr = strerror(errnum); 496+ 497+ if (errstr) { 498+ strncpy(str, errstr, strsize); 499+ return 0; 500+ } 501+ 502+ return -1; 503+} 504+#endif 505+ 506+#include "ICC_tool_exception.h" 507+ 508+const char* 509+path_tail(const char* const s) 510+{ 511+ const char* tail = strdup(s); 512+ const char* last_slash = strrchr(tail, '/'); 513+ if (last_slash != NULL) 514+ tail = last_slash + 1; 515+ return tail; 516+} 517+ 518+void 519+vet_as_int(const char* const s, const string& name, 520+ const string& description) 521+{ 522+ istringstream ss(s); 523+ int i; 524+ ss >> i; 525+ if (ss.fail()) 526+ { 527+ ostringstream oss; 528+ oss << "The " << name << " argument given, `" << s << "', cannot be parsed as" 529+ << " an integer. It should be an integer representing " 530+ << description << "."; 531+ throw ICC_tool_exception(oss.str()); 532+ } 533+} 534+ 535+void 536+vet_as_float(const char* const s, const string& name, 537+ const string& description) 538+{ 539+ istringstream ss(s); 540+ float i; 541+ ss >> i; 542+ if (ss.fail()) 543+ { 544+ ostringstream oss; 545+ oss << "The " << name << " argument given, `" << s << "', cannot be parsed as" 546+ << " a floating-point number. It should be a floating-point number" 547+ << " representing " << description << "."; 548+ throw ICC_tool_exception(oss.str()); 549+ } 550+} 551+ 552+#define STRERROR_BUF_SIZE 256 553+off_t 554+get_size(const char* const s) 555+{ 556+ struct stat sb; 557+ int stat_returned = stat(s, &sb); 558+ if (stat_returned < 0) 559+ { 560+ int stat_errno = errno; 561+ char strerror_buf[STRERROR_BUF_SIZE]; 562+ strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE); 563+ ostringstream oss; 564+ oss << "Could not access information for file `" << s << "': " 565+ << strerror_buf; 566+ throw ICC_tool_exception(oss.str()); 567+ } 568+ return sb.st_size; 569+} 570+ 571+bool 572+check_mode(const char* const s, mode_t mode) 573+{ 574+ struct stat sb; 575+ int stat_returned = stat(s, &sb); 576+ if (stat_returned < 0) 577+ { 578+ int stat_errno = errno; 579+ char strerror_buf[STRERROR_BUF_SIZE]; 580+ strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE); 581+ ostringstream oss; 582+ oss << "Could not access information for file `" << s << "': " 583+ << strerror_buf; 584+ throw ICC_tool_exception(oss.str()); 585+ } 586+ return (sb.st_mode & mode) != 0; 587+} 588+ 589+bool 590+is_existent_file_pathname(const char* const s) 591+{ 592+ struct stat sb; 593+ return stat(s, &sb) == 0; 594+} 595+ 596+bool 597+is_plain_file_pathname(const char* const s) 598+{ 599+ return check_mode(s, S_IFREG); 600+} 601+ 602+bool 603+is_directory(const char* const s) 604+{ 605+ return check_mode(s, S_IFDIR); 606+} 607+ 608+const char* const 609+containing_directory(const char* const s) 610+{ 611+ if (strlen(s) == 0) 612+ throw ICC_tool_exception("name of directory passed to containing_directory" 613+ " function was zero-length."); 614+ char* tmp = strdup(s); 615+ // lop off any trailing seperator 616+ if (tmp[strlen(tmp) - 1] == '/') 617+ tmp[strlen(tmp) - 1] = 0; 618+ if (strlen(tmp) == 0) 619+ throw ICC_tool_exception("root directory (which has no containing" 620+ " directory) passed to containing_directory" 621+ " function"); 622+ char* idx = strrchr(tmp, '/'); 623+ if (idx != NULL) 624+ { 625+ *idx = 0; 626+ return tmp; 627+ } 628+ char* current_directory = getenv("PWD"); 629+ if (current_directory == NULL) 630+ throw ICC_tool_exception("pathname passed to containing_directory has no" 631+ " embedded seperator, and there is no value for" 632+ " PWD defined in the environment"); 633+ return strdup(current_directory); 634+} 635+ 636+bool 637+is_readable_pathname(const char* const s) 638+{ 639+ return check_mode(s, S_IRUSR) 640+ || check_mode(s, S_IRGRP) 641+ || check_mode(s, S_IROTH); 642+} 643+ 644+bool 645+is_writable_pathname(const char* const s) 646+{ 647+ return check_mode(s, S_IWUSR) 648+ || check_mode(s, S_IWGRP) 649+ || check_mode(s, S_IWOTH); 650+} 651+ 652+bool 653+is_pathname_of_empty_file(const char* const s) 654+{ 655+ return get_size(s) > 0; 656+} 657+ 658+void 659+vet_input_file_pathname(const char* const s, const string& name, 660+ const string& description) 661+{ 662+ if (! is_plain_file_pathname(s)) 663+ { 664+ ostringstream oss; 665+ oss << "The " << name << " argument given, `" << s << "', is not the pathname" 666+ << " of a plain file (i.e. it is the pathname of a directory, or of a" 667+ << " symbolic link, or of some other sort of special file.) It should be" 668+ << " " << description << "."; 669+ throw ICC_tool_exception(oss.str()); 670+ } 671+ if (! is_readable_pathname(s)) 672+ { 673+ ostringstream oss; 674+ oss << "The " << name << " argument given, `" << s << "', is not the pathname" 675+ << " of a readable file (i.e. you do not have permission to read that" 676+ << " file, or you do not have permission to read some directory" 677+ << " containing that file."; 678+ throw ICC_tool_exception(oss.str()); 679+ } 680+ if (! is_pathname_of_empty_file(s)) 681+ { 682+ ostringstream oss; 683+ oss << "The " << name << " argument given, `" << s << "', is not the pathname" 684+ << " of an existing readable file, but that file is of zero length." 685+ << " The argument should be " << description << "."; 686+ throw ICC_tool_exception(oss.str()); 687+ } 688+} 689+ 690+void 691+vet_output_file_pathname(const char* const s, const string& name, 692+ const string& description, 693+ bool silent_overwrite_OK) 694+{ 695+ const char* const container = containing_directory(s); 696+ if (! is_writable_pathname(container)) 697+ { 698+ ostringstream oss; 699+ oss << "The " << name << " argument given, `" << s << "', has a directory" 700+ << " component which is not writable." 701+ << " The argument should be " << description << "."; 702+ throw ICC_tool_exception(oss.str()); 703+ } 704+ if (is_existent_file_pathname(s)) 705+ { 706+ if (is_plain_file_pathname(s)) 707+ if (is_writable_pathname(s)) 708+ { 709+ if (! silent_overwrite_OK) 710+ { 711+ ostringstream oss; 712+ oss << "The " << name << " argument given, `" << s << "' is of an existing" 713+ << " file." 714+ << " The argument should be " << description << "."; 715+ throw ICC_tool_exception(oss.str()); 716+ } 717+ } else { 718+ ostringstream oss; 719+ oss << "The " << name << " argument given, `" << s << "' is of an existing" 720+ << " file which is not writable." 721+ << " The argument should be " << description << "."; 722+ throw ICC_tool_exception(oss.str()); 723+ } 724+ } 725+} 726diff -ru misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h 727--- misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h 2007-08-20 15:04:53.000000000 -0500 728+++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h 2012-01-24 10:39:23.000000000 -0500 729@@ -83,6 +83,7 @@ 730 #include <string> 731 #include <sys/types.h> 732 #include <sys/stat.h> 733+#include <stdlib.h> 734 735 #ifdef WIN32 736 typedef unsigned short mode_t; 737Only in misc/build/SampleICC-1.3.2/Contrib/ICC_utils: makefile.mk 738diff -ru misc/SampleICC-1.3.2/Contrib/Makefile.in misc/build/SampleICC-1.3.2/Contrib/Makefile.in 739--- misc/SampleICC-1.3.2/Contrib/Makefile.in 2007-08-20 15:10:37.000000000 -0500 740+++ misc/build/SampleICC-1.3.2/Contrib/Makefile.in 2012-01-24 10:39:23.000000000 -0500 741@@ -103,18 +103,12 @@ 742 743 SUBDIRS = \ 744 ICC_utils \ 745- CmdLine \ 746- examples \ 747- Mac_OS_X \ 748- tests 749+ CmdLine 750 751 752 DIST_SUBDIRS = \ 753 ICC_utils \ 754- CmdLine \ 755- examples \ 756- Mac_OS_X \ 757- tests 758+ CmdLine 759 760 subdir = Contrib 761 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 762diff -ru misc/SampleICC-1.3.2/IccProfLib/IccCmm.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccCmm.cpp 763--- misc/SampleICC-1.3.2/IccProfLib/IccCmm.cpp 2007-08-20 15:05:00.000000000 -0500 764+++ misc/build/SampleICC-1.3.2/IccProfLib/IccCmm.cpp 2012-01-24 10:39:23.000000000 -0500 765@@ -79,6 +79,8 @@ 766 #pragma warning( disable: 4786) //disable warning in <list.h> 767 #endif 768 769+#include <stdlib.h> 770+#include <string.h> 771 #include "IccCmm.h" 772 #include "IccTag.h" 773 #include "IccIO.h" 774diff -ru misc/SampleICC-1.3.2/IccProfLib/IccIO.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp 775--- misc/SampleICC-1.3.2/IccProfLib/IccIO.cpp 2007-08-20 15:05:00.000000000 -0500 776+++ misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp 2012-01-24 10:39:23.000000000 -0500 777@@ -78,7 +78,7 @@ 778 #include "IccIO.h" 779 #include "IccUtil.h" 780 #include <stdlib.h> 781-#include <memory.h> 782+#include <memory> 783 #include <string.h> 784 785 #ifndef __max 786diff -ru misc/SampleICC-1.3.2/IccProfLib/IccIO.h misc/build/SampleICC-1.3.2/IccProfLib/IccIO.h 787--- misc/SampleICC-1.3.2/IccProfLib/IccIO.h 2007-08-20 15:05:00.000000000 -0500 788+++ misc/build/SampleICC-1.3.2/IccProfLib/IccIO.h 2012-01-24 10:39:23.000000000 -0500 789@@ -79,6 +79,7 @@ 790 #define _ICCIO_H 791 792 #include "IccDefs.h" 793+#include "memory" 794 #include "stdio.h" 795 796 #ifdef USESAMPLEICCNAMESPACE 797diff -ru misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp 798--- misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp 2007-08-20 15:05:00.000000000 -0500 799+++ misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp 2012-01-24 10:39:23.000000000 -0500 800@@ -136,17 +136,17 @@ 801 icChar sigBuf[30]; 802 803 if (GetBAcsSig()) 804- sDescription += "ELEM_bACS\r\n"; 805+ sDescription += "ELEM_bACS\n"; 806 else 807- sDescription += "ELEM_eACS\r\n"; 808+ sDescription += "ELEM_eACS\n"; 809 810 icGetSig(sigBuf, m_signature); 811 sDescription += " Signature = "; 812 sDescription += sigBuf; 813- sDescription += "\r\n"; 814+ sDescription += "\n"; 815 816 if (m_pData) { 817- sDescription += "\r\nData Follows:\r\n"; 818+ sDescription += "\nData Follows:\n"; 819 820 icMemDump(sDescription, m_pData, m_nDataSize); 821 } 822diff -ru misc/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp 823--- misc/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp 2007-08-20 15:05:00.000000000 -0500 824+++ misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp 2012-01-24 10:39:23.000000000 -0500 825@@ -218,43 +218,43 @@ 826 sprintf(buf, "%.8f", m_endPoint); 827 sDescription += buf; 828 } 829- sprintf(buf, "]\r\nFunctionType: %04Xh\r\n", m_nFunctionType); 830+ sprintf(buf, "]\nFunctionType: %04Xh\n", m_nFunctionType); 831 sDescription += buf; 832 833 switch(m_nFunctionType) { 834 case 0x0000: 835 if (m_params[1]==0.0 && m_params[2]==0.0) 836- sprintf(buf, "Y = %.8f\r\n\r\n", m_params[3]); 837+ sprintf(buf, "Y = %.8f\n\n", m_params[3]); 838 else if (m_params[0]==1.0 && m_params[1]==1.0 && m_params[2]==0.0 && m_params[3]==0.0) 839- sprintf(buf, "Y = X\r\n\r\n"); 840+ sprintf(buf, "Y = X\n\n"); 841 else if (m_params[0]==1.0 && m_params[2]==0.0) 842- sprintf(buf, "Y = %.8f * X + %.8f\r\n\r\n", 843+ sprintf(buf, "Y = %.8f * X + %.8f\n\n", 844 m_params[1], m_params[3]); 845 else 846- sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\r\n\r\n", 847+ sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\n\n", 848 m_params[1], m_params[2], m_params[0], m_params[3]); 849 sDescription += buf; 850 return; 851 852 case 0x0001: 853- sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f) + %.8f) + %.8f\r\n\r\n", 854+ sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f) + %.8f) + %.8f\n\n", 855 m_params[1], m_params[2], m_params[0], m_params[3], m_params[4]); 856 sDescription += buf; 857 return; 858 859 case 0x0002: 860- sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\r\n\r\n", 861+ sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\n\n", 862 m_params[0], m_params[1], m_params[2], m_params[3], m_params[4]); 863 sDescription += buf; 864 return; 865 866 default: 867 int i; 868- sprintf(buf, "Unknown Function with %d parameters:\r\n\r\n", m_nParameters); 869+ sprintf(buf, "Unknown Function with %d parameters:\n\n", m_nParameters); 870 sDescription += buf; 871 872 for (i=0; i<m_nParameters; i++) { 873- sprintf(buf, "Param[%d] = %.8lf\r\n\r\n", i, m_params[i]); 874+ sprintf(buf, "Param[%d] = %.8lf\n\n", i, m_params[i]); 875 sDescription += buf; 876 } 877 } 878@@ -496,7 +496,7 @@ 879 if (m_nReserved || m_nReserved2) { 880 sReport += icValidateWarningMsg; 881 sReport += sSigName; 882- sReport += " formula curve has non zero reserved data.\r\n"; 883+ sReport += " formula curve has non zero reserved data.\n"; 884 rv = icValidateWarning; 885 } 886 887@@ -505,13 +505,13 @@ 888 if (!m_params || m_nParameters<4) { 889 sReport += icValidateCriticalErrorMsg; 890 sReport += sSigName; 891- sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n"; 892+ sReport += " formula curve has Invalid formulaCurveSegment parameters.\n"; 893 rv = icValidateCriticalError; 894 } 895 else if (m_nParameters > 4) { 896 sReport += icValidateWarningMsg; 897 sReport += sSigName; 898- sReport += " formula curve has too many formulaCurveSegment parameters.\r\n"; 899+ sReport += " formula curve has too many formulaCurveSegment parameters.\n"; 900 rv = icValidateWarning; 901 } 902 break; 903@@ -520,13 +520,13 @@ 904 if (!m_params || m_nParameters<5) { 905 sReport += icValidateCriticalErrorMsg; 906 sReport += sSigName; 907- sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n"; 908+ sReport += " formula curve has Invalid formulaCurveSegment parameters.\n"; 909 rv = icValidateCriticalError; 910 } 911 else if (m_nParameters > 5) { 912 sReport += icValidateWarningMsg; 913 sReport += sSigName; 914- sReport += " formula curve has too many formulaCurveSegment parameters.\r\n"; 915+ sReport += " formula curve has too many formulaCurveSegment parameters.\n"; 916 rv = icValidateWarning; 917 } 918 break; 919@@ -535,13 +535,13 @@ 920 if (!m_params || m_nParameters<5) { 921 sReport += icValidateCriticalErrorMsg; 922 sReport += sSigName; 923- sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n"; 924+ sReport += " formula curve has Invalid formulaCurveSegment parameters.\n"; 925 rv = icValidateCriticalError; 926 } 927 else if (m_nParameters > 5) { 928 sReport += icValidateWarningMsg; 929 sReport += sSigName; 930- sReport += " formula curve has too many formulaCurveSegment parameters.\r\n"; 931+ sReport += " formula curve has too many formulaCurveSegment parameters.\n"; 932 rv = icValidateWarning; 933 } 934 break; 935@@ -551,7 +551,7 @@ 936 icChar buf[128]; 937 sReport += icValidateCriticalErrorMsg; 938 sReport += sSigName; 939- sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\r\n", m_nFunctionType); 940+ sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\n", m_nFunctionType); 941 sReport += buf; 942 rv = icValidateCriticalError; 943 } 944@@ -727,7 +727,7 @@ 945 sDescription += buf; 946 } 947 948- sprintf(buf, "]\r\n"); 949+ sprintf(buf, "]\n"); 950 sDescription += buf; 951 } 952 else { 953@@ -744,9 +744,9 @@ 954 sprintf(buf, "%.8f", m_endPoint); 955 sDescription += buf; 956 } 957- sprintf(buf, "]\r\n"); 958+ sprintf(buf, "]\n"); 959 sDescription += buf; 960- sDescription += "IN OUT\r\n"; 961+ sDescription += "IN OUT\n"; 962 963 icUInt32Number i; 964 965@@ -754,11 +754,11 @@ 966 icFloatNumber last = (icFloatNumber)(m_nCount-1); 967 968 for (i=0; i<m_nCount; i++) { 969- sprintf(buf, "%.8f %.8f\r\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]); 970+ sprintf(buf, "%.8f %.8f\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]); 971 sDescription += buf; 972 } 973 } 974- sDescription += "\r\n"; 975+ sDescription += "\n"; 976 } 977 978 /** 979@@ -910,20 +910,20 @@ 980 if (m_nReserved) { 981 sReport += icValidateWarningMsg; 982 sReport += sSigName; 983- sReport += " sampled curve has non zero reserved data.\r\n"; 984+ sReport += " sampled curve has non zero reserved data.\n"; 985 rv = icValidateWarning; 986 } 987 988 if (m_nCount<2) { 989 sReport += icValidateCriticalErrorMsg; 990 sReport += sSigName; 991- sReport += " sampled curve has too few sample points.\r\n"; 992+ sReport += " sampled curve has too few sample points.\n"; 993 rv = icValidateCriticalError; 994 } 995 else if (m_endPoint-m_startPoint == 0.0) { 996 sReport += icValidateWarningMsg; 997 sReport += sSigName; 998- sReport += " sampled curve has a range of zero.\r\n"; 999+ sReport += " sampled curve has a range of zero.\n"; 1000 rv = icMaxStatus(rv, icValidateWarning); 1001 } 1002 1003@@ -1054,7 +1054,7 @@ 1004 { 1005 CIccCurveSegmentList::iterator i; 1006 1007- sDescription += "BEGIN_CURVE\r\n"; 1008+ sDescription += "BEGIN_CURVE\n"; 1009 for (i=m_list->begin(); i!=m_list->end(); i++) { 1010 (*i)->Describe(sDescription); 1011 } 1012@@ -1342,14 +1342,14 @@ 1013 if (m_nReserved1 || m_nReserved2) { 1014 sReport += icValidateWarningMsg; 1015 sReport += sSigName; 1016- sReport += " Segmented curve has non zero reserved data.\r\n"; 1017+ sReport += " Segmented curve has non zero reserved data.\n"; 1018 rv = icValidateWarning; 1019 } 1020 1021 if (m_list->size()==0) { 1022 sReport += icValidateCriticalErrorMsg; 1023 sReport += sSigName; 1024- sReport += " Has Empty CurveSegment!\r\n"; 1025+ sReport += " Has Empty CurveSegment!\n"; 1026 return icValidateCriticalError; 1027 } 1028 1029@@ -1599,11 +1599,11 @@ 1030 icChar buf[81]; 1031 int i; 1032 1033- sprintf(buf, "BEGIN_CURVE_SET %d\r\n", m_nInputChannels); 1034+ sprintf(buf, "BEGIN_CURVE_SET %d\n", m_nInputChannels); 1035 sDescription += buf; 1036 1037 for (i=0; i<m_nInputChannels; i++) { 1038- sprintf(buf, "Curve %d of %d\r\n", i+1, m_nInputChannels); 1039+ sprintf(buf, "Curve %d of %d\n", i+1, m_nInputChannels); 1040 sDescription += buf; 1041 if (m_curve[i]) { 1042 m_curve[i]->Describe(sDescription); 1043@@ -1877,7 +1877,7 @@ 1044 sReport += " - Element "; 1045 sSigName = Info.GetSigName(GetType()); 1046 sReport += sSigName; 1047- sReport += " Has Empty Curve Element(s)!\r\n"; 1048+ sReport += " Has Empty Curve Element(s)!\n"; 1049 return icValidateCriticalError; 1050 } 1051 1052@@ -2042,7 +2042,7 @@ 1053 int i, j; 1054 icFloatNumber *data = m_pMatrix; 1055 1056- sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\r\n", m_nInputChannels, m_nOutputChannels); 1057+ sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\n", m_nInputChannels, m_nOutputChannels); 1058 sDescription += buf; 1059 1060 for (j=0; j<m_nOutputChannels; j++) { 1061@@ -2052,7 +2052,7 @@ 1062 sprintf(buf, "%12.8lf", data[i]); 1063 sDescription += buf; 1064 } 1065- sprintf(buf, " + %12.8lf\r\n", m_pConstants[j]); 1066+ sprintf(buf, " + %12.8lf\n", m_pConstants[j]); 1067 sDescription += buf; 1068 data += i; 1069 } 1070@@ -2273,7 +2273,7 @@ 1071 sReport += " - Element "; 1072 sSigName = Info.GetSigName(GetType()); 1073 sReport += sSigName; 1074- sReport += " Has Empty Matrix data!\r\n"; 1075+ sReport += " Has Empty Matrix data!\n"; 1076 return icValidateCriticalError; 1077 } 1078 1079@@ -2620,7 +2620,7 @@ 1080 sReport += " - Element "; 1081 sSigName = Info.GetSigName(GetType()); 1082 sReport += sSigName; 1083- sReport += " Has No CLUT!\r\n"; 1084+ sReport += " Has No CLUT!\n"; 1085 return icValidateCriticalError; 1086 } 1087 1088diff -ru misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h 1089--- misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h 2007-08-20 15:05:00.000000000 -0500 1090+++ misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h 2012-01-24 10:39:23.000000000 -0500 1091@@ -107,20 +107,23 @@ 1092 1093 #else // non-PC, perhaps Mac or Linux 1094 1095- #define ICCUINT64 unsigned long long 1096- #define ICCINT64 long long 1097- #define ICUINT64TYPE unsigned long long 1098- #define ICINT64TYPE long long 1099- 1100- #if defined(__APPLE__) 1101- #if defined(__LITTLE_ENDIAN__) 1102- #define ICC_BYTE_ORDER_LITTLE_ENDIAN 1103- #else 1104- #define ICC_BYTE_ORDER_BIG_ENDIAN 1105- #endif 1106- #else 1107- #define ICC_BYTE_ORDER_LITTLE_ENDIAN 1108- #endif 1109+#include <sal/types.h> 1110+#include <osl/endian.h> 1111+ 1112+ #define ICCUINT64 sal_uInt64 1113+ #define ICCINT64 sal_Int64 1114+ #define ICUINT64TYPE sal_uInt64 1115+ #define ICINT64TYPE sal_Int64 1116+ #define ICINT32TYPE sal_Int32 1117+ #define ICUINT32TYPE sal_uInt32 1118+ 1119+#if defined(_LITTLE_ENDIAN) 1120+# define ICC_BYTE_ORDER_LITTLE_ENDIAN 1121+#elif defined(_BIG_ENDIAN) 1122+# define ICC_BYTE_ORDER_BIG_ENDIAN 1123+#else 1124+# error "ENDIAN unknown" 1125+#endif 1126 1127 #define ICCPROFLIB_API 1128 #define ICCPROFLIB_EXTERN 1129diff -ru misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp 1130--- misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp 2007-08-20 15:05:00.000000000 -0500 1131+++ misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp 2012-01-24 10:39:23.000000000 -0500 1132@@ -567,7 +567,7 @@ 1133 1134 if (!ReadBasic(pIO)) { 1135 sReport += icValidateCriticalErrorMsg; 1136- sReport += " - Unable to read profile!**\r\n\tProfile has invalid structure!\r\n"; 1137+ sReport += " - Unable to read profile!**\n\tProfile has invalid structure!\n"; 1138 Cleanup(); 1139 1140 return icValidateCriticalError; 1141@@ -576,7 +576,7 @@ 1142 // Check profile header 1143 if (!CheckFileSize(pIO)) { 1144 sReport += icValidateNonCompliantMsg; 1145- sReport += "Bad Header File Size\r\n"; 1146+ sReport += "Bad Header File Size\n"; 1147 rv = icMaxStatus(rv, icValidateNonCompliant); 1148 } 1149 1150@@ -588,7 +588,7 @@ 1151 CalcProfileID(pIO, &profileID); 1152 if (strncmp((char*)profileID.ID8, (char*)m_Header.profileID.ID8, 16) != 0) { 1153 sReport += icValidateNonCompliantMsg; 1154- sReport += "Bad Profile ID\r\n"; 1155+ sReport += "Bad Profile ID\n"; 1156 1157 rv = icMaxStatus(rv, icValidateNonCompliant); 1158 } 1159@@ -601,7 +601,7 @@ 1160 sReport += icValidateCriticalErrorMsg; 1161 sReport += " - "; 1162 sReport += Info.GetTagSigName(i->TagInfo.sig); 1163- sReport += " - Tag has invalid structure!\r\n"; 1164+ sReport += " - Tag has invalid structure!\n"; 1165 1166 rv = icMaxStatus(rv, icValidateCriticalError); 1167 } 1168@@ -1026,14 +1026,14 @@ 1169 1170 default: 1171 sReport += icValidateCriticalErrorMsg; 1172- sprintf(buf, " - %s: Unknown profile class!\r\n", Info.GetProfileClassSigName(m_Header.deviceClass)); 1173+ sprintf(buf, " - %s: Unknown profile class!\n", Info.GetProfileClassSigName(m_Header.deviceClass)); 1174 sReport += buf; 1175 rv = icMaxStatus(rv, icValidateCriticalError); 1176 } 1177 1178 if (!Info.IsValidSpace(m_Header.colorSpace)) { 1179 sReport += icValidateCriticalErrorMsg; 1180- sprintf(buf, " - %s: Unknown color space!\r\n", Info.GetColorSpaceSigName(m_Header.colorSpace)); 1181+ sprintf(buf, " - %s: Unknown color space!\n", Info.GetColorSpaceSigName(m_Header.colorSpace)); 1182 sReport += buf; 1183 rv = icMaxStatus(rv, icValidateCriticalError); 1184 } 1185@@ -1041,7 +1041,7 @@ 1186 if (m_Header.deviceClass==icSigLinkClass) { 1187 if (!Info.IsValidSpace(m_Header.pcs)) { 1188 sReport += icValidateCriticalErrorMsg; 1189- sprintf(buf, " - %s: Unknown pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs)); 1190+ sprintf(buf, " - %s: Unknown pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs)); 1191 sReport += buf; 1192 rv = icMaxStatus(rv, icValidateCriticalError); 1193 } 1194@@ -1049,7 +1049,7 @@ 1195 else { 1196 if (m_Header.pcs!=icSigXYZData && m_Header.pcs!=icSigLabData) { 1197 sReport += icValidateCriticalErrorMsg; 1198- sprintf(buf, " - %s: Invalid pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs)); 1199+ sprintf(buf, " - %s: Invalid pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs)); 1200 sReport += buf; 1201 rv = icMaxStatus(rv, icValidateCriticalError); 1202 } 1203@@ -1068,7 +1068,7 @@ 1204 1205 default: 1206 sReport += icValidateWarningMsg; 1207- sprintf(buf, " - %s: Unknown platform signature.\r\n", Info.GetPlatformSigName(m_Header.platform)); 1208+ sprintf(buf, " - %s: Unknown platform signature.\n", Info.GetPlatformSigName(m_Header.platform)); 1209 sReport += buf; 1210 rv = icMaxStatus(rv, icValidateWarning); 1211 } 1212@@ -1095,7 +1095,7 @@ 1213 1214 default: 1215 sReport += icValidateWarningMsg; 1216- sprintf(buf, " - %s: Unregisterd CMM signature.\r\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId)); 1217+ sprintf(buf, " - %s: Unregisterd CMM signature.\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId)); 1218 sReport += buf; 1219 rv = icMaxStatus(rv, icValidateWarning); 1220 } 1221@@ -1109,7 +1109,7 @@ 1222 1223 default: 1224 sReport += icValidateCriticalErrorMsg; 1225- sprintf(buf, " - %s: Unknown rendering intent!\r\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent)); 1226+ sprintf(buf, " - %s: Unknown rendering intent!\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent)); 1227 sReport += buf; 1228 rv = icMaxStatus(rv, icValidateCriticalError); 1229 } 1230@@ -1120,7 +1120,7 @@ 1231 icFloatNumber Z = icFtoD(m_Header.illuminant.Z); 1232 if (X<0.9640 || X>0.9644 || Y!=1.0 || Z<0.8247 || Z>0.8251) { 1233 sReport += icValidateNonCompliantMsg; 1234- sReport += " - Non D50 Illuminant XYZ values.\r\n"; 1235+ sReport += " - Non D50 Illuminant XYZ values.\n"; 1236 rv = icMaxStatus(rv, icValidateNonCompliant); 1237 } 1238 1239@@ -1130,7 +1130,7 @@ 1240 } 1241 if (sum) { 1242 sReport += icValidateNonCompliantMsg; 1243- sReport += " - Reserved value must be zero.\r\n"; 1244+ sReport += " - Reserved value must be zero.\n"; 1245 rv = icMaxStatus(rv, icValidateNonCompliant); 1246 } 1247 1248@@ -1163,7 +1163,7 @@ 1249 { 1250 sReport += icValidateWarningMsg; 1251 sReport += buf; 1252- sReport += " - Tag exclusion test failed.\r\n"; 1253+ sReport += " - Tag exclusion test failed.\n"; 1254 rv = false; 1255 } 1256 } 1257@@ -1177,7 +1177,7 @@ 1258 { 1259 sReport += icValidateWarningMsg; 1260 sReport += buf; 1261- sReport += " - Tag exclusion test failed.\r\n"; 1262+ sReport += " - Tag exclusion test failed.\n"; 1263 rv = false; 1264 } 1265 break; 1266@@ -1192,7 +1192,7 @@ 1267 { 1268 sReport += icValidateWarningMsg; 1269 sReport += buf; 1270- sReport += " - Tag exclusion test failed.\r\n"; 1271+ sReport += " - Tag exclusion test failed.\n"; 1272 rv = false; 1273 } 1274 break; 1275@@ -1234,7 +1234,7 @@ 1276 if (!IsTypeValid(tagsig, typesig)) { 1277 sReport += icValidateNonCompliantMsg; 1278 sReport += buf; 1279- sprintf(buf," - %s: Invalid tag type (Might be critical!).\r\n", Info.GetTagTypeSigName(typesig)); 1280+ sprintf(buf," - %s: Invalid tag type (Might be critical!).\n", Info.GetTagTypeSigName(typesig)); 1281 sReport += buf; 1282 rv = icMaxStatus(rv, icValidateNonCompliant); 1283 } 1284@@ -1477,7 +1477,7 @@ 1285 { 1286 if (m_Tags->size() <= 0) { 1287 sReport += icValidateCriticalErrorMsg; 1288- sReport += "No tags present.\r\n"; 1289+ sReport += "No tags present.\n"; 1290 return icValidateCriticalError; 1291 } 1292 1293@@ -1486,7 +1486,7 @@ 1294 if (!GetTag(icSigProfileDescriptionTag) || 1295 !GetTag(icSigCopyrightTag)) { 1296 sReport += icValidateNonCompliantMsg; 1297- sReport += "Required tags missing.\r\n"; 1298+ sReport += "Required tags missing.\n"; 1299 rv = icMaxStatus(rv, icValidateNonCompliant); 1300 } 1301 1302@@ -1495,7 +1495,7 @@ 1303 if (sig != icSigLinkClass) { 1304 if (!GetTag(icSigMediaWhitePointTag)) { 1305 sReport += icValidateCriticalErrorMsg; 1306- sReport += "Media white point tag missing.\r\n"; 1307+ sReport += "Media white point tag missing.\n"; 1308 rv = icMaxStatus(rv, icValidateCriticalError); 1309 } 1310 } 1311@@ -1505,7 +1505,7 @@ 1312 if (m_Header.colorSpace == icSigGrayData) { 1313 if (!GetTag(icSigGrayTRCTag)) { 1314 sReport += icValidateCriticalErrorMsg; 1315- sReport += "Gray TRC tag missing.\r\n"; 1316+ sReport += "Gray TRC tag missing.\n"; 1317 rv = icMaxStatus(rv, icValidateCriticalError); 1318 } 1319 } 1320@@ -1515,7 +1515,7 @@ 1321 !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) || 1322 !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) { 1323 sReport += icValidateCriticalErrorMsg; 1324- sReport += "Critical tag(s) missing.\r\n"; 1325+ sReport += "Critical tag(s) missing.\n"; 1326 rv = icMaxStatus(rv, icValidateCriticalError); 1327 } 1328 } 1329@@ -1526,7 +1526,7 @@ 1330 if (m_Header.colorSpace == icSigGrayData) { 1331 if (!GetTag(icSigGrayTRCTag)) { 1332 sReport += icValidateCriticalErrorMsg; 1333- sReport += "Gray TRC tag missing.\r\n"; 1334+ sReport += "Gray TRC tag missing.\n"; 1335 rv = icMaxStatus(rv, icValidateCriticalError); 1336 } 1337 } 1338@@ -1536,7 +1536,7 @@ 1339 !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) || 1340 !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) { 1341 sReport += icValidateCriticalErrorMsg; 1342- sReport += "Critical tag(s) missing.\r\n"; 1343+ sReport += "Critical tag(s) missing.\n"; 1344 rv = icMaxStatus(rv, icValidateCriticalError); 1345 } 1346 } 1347@@ -1547,7 +1547,7 @@ 1348 if (m_Header.colorSpace == icSigGrayData) { 1349 if (!GetTag(icSigGrayTRCTag)) { 1350 sReport += icValidateCriticalErrorMsg; 1351- sReport += "Gray TRC tag missing.\r\n"; 1352+ sReport += "Gray TRC tag missing.\n"; 1353 rv = icMaxStatus(rv, icValidateCriticalError); 1354 } 1355 } 1356@@ -1556,13 +1556,13 @@ 1357 !GetTag(icSigAToB1Tag) || !GetTag(icSigBToA1Tag) || 1358 !GetTag(icSigAToB2Tag) || !GetTag(icSigBToA2Tag)) { 1359 sReport += icValidateCriticalErrorMsg; 1360- sReport += "Critical tag(s) missing.\r\n"; 1361+ sReport += "Critical tag(s) missing.\n"; 1362 rv = icMaxStatus(rv, icValidateCriticalError); 1363 } 1364 1365 if (!GetTag(icSigGamutTag)) { 1366 sReport += icValidateNonCompliantMsg; 1367- sReport += "Gamut tag missing.\r\n"; 1368+ sReport += "Gamut tag missing.\n"; 1369 rv = icMaxStatus(rv, icValidateNonCompliant); 1370 } 1371 1372@@ -1585,7 +1585,7 @@ 1373 case icSig16colorData: 1374 if (!GetTag(icSigColorantTableTag)) { 1375 sReport += icValidateNonCompliantMsg; 1376- sReport += "xCLR output profile is missing colorantTableTag\r\n"; 1377+ sReport += "xCLR output profile is missing colorantTableTag\n"; 1378 rv = icMaxStatus(rv, icValidateNonCompliant); 1379 } 1380 1381@@ -1599,14 +1599,14 @@ 1382 case icSigLinkClass: 1383 if (!GetTag(icSigAToB0Tag) || !GetTag(icSigProfileSequenceDescTag)) { 1384 sReport += icValidateCriticalErrorMsg; 1385- sReport += "Critical tag(s) missing.\r\n"; 1386+ sReport += "Critical tag(s) missing.\n"; 1387 rv = icMaxStatus(rv, icValidateCriticalError); 1388 } 1389 1390 if (icIsSpaceCLR(m_Header.colorSpace)) { 1391 if (!GetTag(icSigColorantTableTag)) { 1392 sReport += icValidateNonCompliantMsg; 1393- sReport += "Required tag(s) missing.\r\n"; 1394+ sReport += "Required tag(s) missing.\n"; 1395 rv = icMaxStatus(rv, icValidateNonCompliant); 1396 } 1397 } 1398@@ -1614,7 +1614,7 @@ 1399 if (icIsSpaceCLR(m_Header.pcs)) { 1400 if (!GetTag(icSigColorantTableOutTag)) { 1401 sReport += icValidateNonCompliantMsg; 1402- sReport += "Required tag(s) missing.\r\n"; 1403+ sReport += "Required tag(s) missing.\n"; 1404 rv = icMaxStatus(rv, icValidateNonCompliant); 1405 } 1406 } 1407@@ -1623,7 +1623,7 @@ 1408 case icSigColorSpaceClass: 1409 if (!GetTag(icSigAToB0Tag) || !GetTag(icSigBToA0Tag)) { 1410 sReport += icValidateCriticalErrorMsg; 1411- sReport += "Critical tag(s) missing.\r\n"; 1412+ sReport += "Critical tag(s) missing.\n"; 1413 rv = icMaxStatus(rv, icValidateCriticalError); 1414 } 1415 break; 1416@@ -1631,7 +1631,7 @@ 1417 case icSigAbstractClass: 1418 if (!GetTag(icSigAToB0Tag)) { 1419 sReport += icValidateCriticalErrorMsg; 1420- sReport += "Critical tag(s) missing.\r\n"; 1421+ sReport += "Critical tag(s) missing.\n"; 1422 rv = icMaxStatus(rv, icValidateCriticalError); 1423 } 1424 break; 1425@@ -1639,7 +1639,7 @@ 1426 case icSigNamedColorClass: 1427 if (!GetTag(icSigNamedColor2Tag)) { 1428 sReport += icValidateCriticalErrorMsg; 1429- sReport += "Critical tag(s) missing.\r\n"; 1430+ sReport += "Critical tag(s) missing.\n"; 1431 rv = icMaxStatus(rv, icValidateCriticalError); 1432 } 1433 1434@@ -1647,7 +1647,7 @@ 1435 1436 default: 1437 sReport += icValidateCriticalErrorMsg; 1438- sReport += "Unknown Profile Class.\r\n"; 1439+ sReport += "Unknown Profile Class.\n"; 1440 rv = icMaxStatus(rv, icValidateCriticalError); 1441 break; 1442 } 1443@@ -1724,7 +1724,7 @@ 1444 // Check for duplicate tags 1445 if (!AreTagsUnique()) { 1446 sReport += icValidateWarning; 1447- sReport += " - There are duplicate tags.\r\n"; 1448+ sReport += " - There are duplicate tags.\n"; 1449 rv =icMaxStatus(rv, icValidateWarning); 1450 } 1451 1452@@ -1979,7 +1979,7 @@ 1453 sReport = icValidateCriticalErrorMsg; 1454 sReport += " - "; 1455 sReport += szFilename; 1456- sReport += "- Invalid Filename\r\n"; 1457+ sReport += "- Invalid Filename\n"; 1458 delete pFileIO; 1459 return NULL; 1460 } 1461diff -ru misc/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp 1462--- misc/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp 2007-08-20 15:05:00.000000000 -0500 1463+++ misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp 2012-01-24 10:39:23.000000000 -0500 1464@@ -166,7 +166,7 @@ 1465 CIccInfo Info; 1466 sReport += icValidateNonCompliantMsg; 1467 sReport += Info.GetSigName(sig); 1468- sReport += " - Reserved Value must be zero.\r\n"; 1469+ sReport += " - Reserved Value must be zero.\n"; 1470 1471 rv = icValidateNonCompliant; 1472 } 1473@@ -340,7 +340,7 @@ 1474 sprintf(buf, "%u Bytes.", m_nSize-4); 1475 sDescription += buf; 1476 1477- sDescription += "\r\n\r\nData Follows:\r\n"; 1478+ sDescription += "\n\nData Follows:\n"; 1479 1480 icMemDump(sDescription, m_pData+4, m_nSize-4); 1481 } 1482@@ -511,7 +511,7 @@ 1483 if (m_szText && *m_szText) 1484 sDescription += m_szText; 1485 1486- sDescription += "\"\r\n"; 1487+ sDescription += "\"\n"; 1488 } 1489 1490 1491@@ -629,14 +629,14 @@ 1492 if (m_nBufSize<7) { 1493 sReport += icValidateNonCompliantMsg; 1494 sReport += sSigName; 1495- sReport += " - Tag must have at least seven text characters.\r\n"; 1496+ sReport += " - Tag must have at least seven text characters.\n"; 1497 rv = icMaxStatus(rv, icValidateNonCompliant); 1498 } 1499 break; 1500 default: 1501 sReport += icValidateWarningMsg; 1502 sReport += sSigName; 1503- sReport += " - Unknown Tag.\r\n"; 1504+ sReport += " - Unknown Tag.\n"; 1505 rv = icMaxStatus(rv, icValidateWarning); 1506 } 1507 int i; 1508@@ -644,14 +644,14 @@ 1509 if (m_szText[i]&0x80) { 1510 sReport += icValidateWarning; 1511 sReport += sSigName; 1512- sReport += " - Text do not contain 7bit data.\r\n"; 1513+ sReport += " - Text do not contain 7bit data.\n"; 1514 } 1515 } 1516 } 1517 else { 1518 sReport += icValidateWarningMsg; 1519 sReport += sSigName; 1520- sReport += " - Empty Tag.\r\n"; 1521+ sReport += " - Empty Tag.\n"; 1522 rv = icMaxStatus(rv, icValidateWarning); 1523 } 1524 1525@@ -941,7 +941,7 @@ 1526 if (m_szText && *m_szText) 1527 sDescription += m_szText; 1528 1529- sDescription += "\"\r\n"; 1530+ sDescription += "\"\n"; 1531 } 1532 1533 1534@@ -1101,7 +1101,7 @@ 1535 if (m_nScriptSize>67) { 1536 sReport += icValidateNonCompliantMsg; 1537 sReport += sSigName; 1538- sReport += " - ScriptCode count must not be greater than 67.\r\n"; 1539+ sReport += " - ScriptCode count must not be greater than 67.\n"; 1540 1541 rv =icMaxStatus(rv, icValidateNonCompliant); 1542 } 1543@@ -1260,7 +1260,7 @@ 1544 CIccInfo Fmt; 1545 1546 sDescription += Fmt.GetSigName(m_nSig); 1547- sDescription += "\r\n"; 1548+ sDescription += "\n"; 1549 } 1550 1551 1552@@ -1320,7 +1320,7 @@ 1553 { 1554 sReport += icValidateNonCompliantMsg; 1555 sReport += sSigName; 1556- sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(m_nSig)); 1557+ sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(m_nSig)); 1558 sReport += buf; 1559 rv = icMaxStatus(rv, icValidateNonCompliant); 1560 } 1561@@ -1336,7 +1336,7 @@ 1562 { 1563 sReport += icValidateNonCompliantMsg; 1564 sReport += sSigName; 1565- sprintf(buf, " - %s: Unknown Reference Medium Gamut.\r\n", Info.GetSigName(m_nSig)); 1566+ sprintf(buf, " - %s: Unknown Reference Medium Gamut.\n", Info.GetSigName(m_nSig)); 1567 sReport += buf; 1568 rv = icMaxStatus(rv, icValidateNonCompliant); 1569 } 1570@@ -1355,7 +1355,7 @@ 1571 { 1572 sReport += icValidateNonCompliantMsg; 1573 sReport += sSigName; 1574- sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\r\n", Info.GetSigName(m_nSig)); 1575+ sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\n", Info.GetSigName(m_nSig)); 1576 sReport += buf; 1577 rv = icMaxStatus(rv, icValidateNonCompliant); 1578 } 1579@@ -1686,7 +1686,7 @@ 1580 1581 sDescription.reserve(sDescription.size() + m_nSize*79); 1582 1583- sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\r\n", m_nVendorFlags, m_nSize, m_nDeviceCoords); 1584+ sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\n", m_nVendorFlags, m_nSize, m_nDeviceCoords); 1585 sDescription += buf; 1586 1587 for (i=0; i<m_nSize; i++) { 1588@@ -1717,7 +1717,7 @@ 1589 sDescription += buf; 1590 } 1591 } 1592- sDescription += "\r\n"; 1593+ sDescription += "\n"; 1594 1595 pNamedColor = (SIccNamedColorEntry*)((icChar*)pNamedColor + m_nColorEntrySize); 1596 } 1597@@ -2082,7 +2082,7 @@ 1598 if (!m_nSize) { 1599 sReport += icValidateWarningMsg; 1600 sReport += sSigName; 1601- sReport += " - Empty tag!\r\n"; 1602+ sReport += " - Empty tag!\n"; 1603 rv = icMaxStatus(rv, icValidateWarning); 1604 } 1605 1606@@ -2092,14 +2092,14 @@ 1607 if (m_nDeviceCoords != nCoords) { 1608 sReport += icValidateNonCompliantMsg; 1609 sReport += sSigName; 1610- sReport += " - Incorrect number of device co-ordinates.\r\n"; 1611+ sReport += " - Incorrect number of device co-ordinates.\n"; 1612 rv = icMaxStatus(rv, icValidateNonCompliant); 1613 } 1614 } 1615 else { 1616 sReport += icValidateWarningMsg; 1617 sReport += sSigName; 1618- sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n"; 1619+ sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n"; 1620 rv = icMaxStatus(rv, icValidateWarning); 1621 } 1622 } 1623@@ -2285,7 +2285,7 @@ 1624 icChar buf[128]; 1625 1626 if (m_nSize == 1 ) { 1627- sprintf(buf, "X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", icFtoD(m_XYZ[0].X), icFtoD(m_XYZ[0].Y), icFtoD(m_XYZ[0].Z)); 1628+ sprintf(buf, "X=%.4lf, Y=%.4lf, Z=%.4lf\n", icFtoD(m_XYZ[0].X), icFtoD(m_XYZ[0].Y), icFtoD(m_XYZ[0].Z)); 1629 sDescription += buf; 1630 } 1631 else { 1632@@ -2293,7 +2293,7 @@ 1633 sDescription.reserve(sDescription.size() + m_nSize*79); 1634 1635 for (i=0; i<m_nSize; i++) { 1636- sprintf(buf, "value[%u]: X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", i, icFtoD(m_XYZ[i].X), icFtoD(m_XYZ[i].Y), icFtoD(m_XYZ[i].Z)); 1637+ sprintf(buf, "value[%u]: X=%.4lf, Y=%.4lf, Z=%.4lf\n", i, icFtoD(m_XYZ[i].X), icFtoD(m_XYZ[i].Y), icFtoD(m_XYZ[i].Z)); 1638 sDescription += buf; 1639 } 1640 } 1641@@ -2347,7 +2347,7 @@ 1642 if (!m_nSize) { 1643 sReport += icValidateWarningMsg; 1644 sReport += sSigName; 1645- sReport += " - Empty tag.\r\n"; 1646+ sReport += " - Empty tag.\n"; 1647 1648 rv = icMaxStatus(rv, icValidateWarning); 1649 return rv; 1650@@ -2553,14 +2553,14 @@ 1651 1652 icUInt32Number i; 1653 //sDescription.reserve(sDescription.size() + m_nChannels*79); 1654- sprintf(buf, "Number of Channels : %u\r\n", m_nChannels); 1655+ sprintf(buf, "Number of Channels : %u\n", m_nChannels); 1656 sDescription += buf; 1657 1658- sprintf(buf, "Colorant Encoding : %s\r\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType)); 1659+ sprintf(buf, "Colorant Encoding : %s\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType)); 1660 sDescription += buf; 1661 1662 for (i=0; i<m_nChannels; i++) { 1663- sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\r\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y)); 1664+ sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y)); 1665 sDescription += buf; 1666 } 1667 1668@@ -2617,7 +2617,7 @@ 1669 if (m_nChannels!=3) { 1670 sReport += icValidateCriticalErrorMsg; 1671 sReport += sSigName; 1672- sReport += " - Number of device channels must be three.\r\n"; 1673+ sReport += " - Number of device channels must be three.\n"; 1674 rv = icMaxStatus(rv, icValidateCriticalError); 1675 } 1676 1677@@ -2629,7 +2629,7 @@ 1678 (m_xy[2].x != icDtoUF((icFloatNumber)0.150)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.060)) ) { 1679 sReport += icValidateNonCompliantMsg; 1680 sReport += sSigName; 1681- sReport += " - Chromaticity data does not match specification.\r\n"; 1682+ sReport += " - Chromaticity data does not match specification.\n"; 1683 rv = icMaxStatus(rv, icValidateNonCompliant); 1684 } 1685 break; 1686@@ -2642,7 +2642,7 @@ 1687 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) { 1688 sReport += icValidateNonCompliantMsg; 1689 sReport += sSigName; 1690- sReport += " - Chromaticity data does not match specification.\r\n"; 1691+ sReport += " - Chromaticity data does not match specification.\n"; 1692 rv = icMaxStatus(rv, icValidateNonCompliant); 1693 } 1694 break; 1695@@ -2655,7 +2655,7 @@ 1696 (m_xy[2].x != icDtoUF((icFloatNumber)0.15)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.06)) ) { 1697 sReport += icValidateNonCompliantMsg; 1698 sReport += sSigName; 1699- sReport += " - Chromaticity data does not match specification.\r\n"; 1700+ sReport += " - Chromaticity data does not match specification.\n"; 1701 rv = icMaxStatus(rv, icValidateNonCompliant); 1702 } 1703 break; 1704@@ -2668,7 +2668,7 @@ 1705 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) { 1706 sReport += icValidateNonCompliantMsg; 1707 sReport += sSigName; 1708- sReport += " - Chromaticity data does not match specification.\r\n"; 1709+ sReport += " - Chromaticity data does not match specification.\n"; 1710 rv = icMaxStatus(rv, icValidateNonCompliant); 1711 } 1712 break; 1713@@ -2678,7 +2678,7 @@ 1714 { 1715 sReport += icValidateNonCompliantMsg; 1716 sReport += sSigName; 1717- sReport += " - Invalid colorant type encoding.\r\n"; 1718+ sReport += " - Invalid colorant type encoding.\n"; 1719 rv = icMaxStatus(rv, icValidateNonCompliant); 1720 } 1721 } 1722@@ -2884,27 +2884,27 @@ 1723 1724 if (m_nSize == 1 ) { 1725 if (Tsig==icSigS15Fixed16ArrayType) 1726- sprintf(buf, "Value = %.4lf\r\n", icFtoD(m_Num[0])); 1727+ sprintf(buf, "Value = %.4lf\n", icFtoD(m_Num[0])); 1728 else 1729- sprintf(buf, "Value = %.4lf\r\n", icUFtoD(m_Num[0])); 1730+ sprintf(buf, "Value = %.4lf\n", icUFtoD(m_Num[0])); 1731 sDescription += buf; 1732 } 1733 else { 1734 icUInt32Number i; 1735 1736 if (Tsig==icSigS15Fixed16ArrayType && m_nSize==9) { 1737- sDescription += "Matrix Form:\r\n"; 1738+ sDescription += "Matrix Form:\n"; 1739 icMatrixDump(sDescription, (icS15Fixed16Number*)m_Num); 1740 1741- sDescription += "\r\nArrayForm:\r\n"; 1742+ sDescription += "\nArrayForm:\n"; 1743 } 1744 sDescription.reserve(sDescription.size() + m_nSize*79); 1745 1746 for (i=0; i<m_nSize; i++) { 1747 if (Tsig==icSigS15Fixed16ArrayType) 1748- sprintf(buf, "Value[%u] = %.4lf\r\n", i, icFtoD(m_Num[i])); 1749+ sprintf(buf, "Value[%u] = %.4lf\n", i, icFtoD(m_Num[i])); 1750 else 1751- sprintf(buf, "Value[%u] = %.4lf\r\n", i, icUFtoD(m_Num[i])); 1752+ sprintf(buf, "Value[%u] = %.4lf\n", i, icUFtoD(m_Num[i])); 1753 sDescription += buf; 1754 } 1755 } 1756@@ -3172,7 +3172,7 @@ 1757 icChar buf[128]; 1758 1759 if (m_nSize == 1 ) { 1760- sprintf(buf, "Value = %u (0x%x)\r\n", m_Num[0], m_Num[0]); 1761+ sprintf(buf, "Value = %u (0x%x)\n", m_Num[0], m_Num[0]); 1762 sDescription += buf; 1763 } 1764 else { 1765@@ -3180,7 +3180,7 @@ 1766 sDescription.reserve(sDescription.size() + m_nSize*79); 1767 1768 for (i=0; i<m_nSize; i++) { 1769- sprintf(buf, "Value[%u] = %u (0x%x)\r\n", i, m_Num[i], m_Num[i]); 1770+ sprintf(buf, "Value[%u] = %u (0x%x)\n", i, m_Num[i], m_Num[i]); 1771 sDescription += buf; 1772 } 1773 } 1774@@ -3374,15 +3374,15 @@ 1775 CIccInfo Fmt; 1776 icChar buf[128]; 1777 1778- sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\r\n"; 1779- sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", 1780+ sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\n"; 1781+ sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\n", 1782 icFtoD(m_Data.backing.X), 1783 icFtoD(m_Data.backing.Y), 1784 icFtoD(m_Data.backing.Z)); 1785 sDescription += buf; 1786- sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\r\n"; 1787- sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\r\n"; 1788- sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\r\n"; 1789+ sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\n"; 1790+ sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\n"; 1791+ sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\n"; 1792 } 1793 1794 1795@@ -3416,7 +3416,7 @@ 1796 default: 1797 sReport += icValidateNonCompliantMsg; 1798 sReport += sSigName; 1799- sReport += " - Invalid standard observer encoding.\r\n"; 1800+ sReport += " - Invalid standard observer encoding.\n"; 1801 rv = icMaxStatus(rv, icValidateNonCompliant); 1802 } 1803 1804@@ -3429,7 +3429,7 @@ 1805 default: 1806 sReport += icValidateNonCompliantMsg; 1807 sReport += sSigName; 1808- sReport += " - Invalid measurement geometry encoding.\r\n"; 1809+ sReport += " - Invalid measurement geometry encoding.\n"; 1810 rv = icMaxStatus(rv, icValidateNonCompliant); 1811 } 1812 1813@@ -3448,7 +3448,7 @@ 1814 default: 1815 sReport += icValidateNonCompliantMsg; 1816 sReport += sSigName; 1817- sReport += " - Invalid standard illuminant encoding.\r\n"; 1818+ sReport += " - Invalid standard illuminant encoding.\n"; 1819 rv = icMaxStatus(rv, icValidateNonCompliant); 1820 } 1821 1822@@ -3902,9 +3902,9 @@ 1823 1824 for (i=m_Strings->begin(); i!=m_Strings->end(); i++) { 1825 if (i!=m_Strings->begin()) 1826- sDescription += "\r\n"; 1827+ sDescription += "\n"; 1828 1829- sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\r\n", 1830+ sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\n", 1831 i->m_nLanguageCode>>8, i->m_nLanguageCode, 1832 i->m_nCountryCode>>8, i->m_nCountryCode); 1833 1834@@ -3919,7 +3919,7 @@ 1835 i->GetAnsi(szBuf, nSize); 1836 sDescription += "\""; 1837 sDescription += szBuf; 1838- sDescription += "\"\r\n"; 1839+ sDescription += "\"\n"; 1840 } 1841 } 1842 1843@@ -3948,7 +3948,7 @@ 1844 if (!m_Strings->size()) { 1845 sReport += icValidateWarningMsg; 1846 sReport += sSigName; 1847- sReport += " - Empty tag!\r\n"; 1848+ sReport += " - Empty tag!\n"; 1849 rv = icMaxStatus(rv, icValidateWarning); 1850 } 1851 1852@@ -4246,15 +4246,15 @@ 1853 { 1854 icChar buf[128]; 1855 1856- sDescription = "\r\nData:\r\n"; 1857+ sDescription = "\nData:\n"; 1858 1859 if (IsTypeAscii()) { 1860- sprintf(buf, "%s\r\n", (icChar*)m_pData); 1861+ sprintf(buf, "%s\n", (icChar*)m_pData); 1862 sDescription += buf; 1863 } 1864 else 1865 for (int i = 0; i<(int)m_nSize; i++) { 1866- sprintf(buf, "%d\r\n", m_pData[i]); 1867+ sprintf(buf, "%d\n", m_pData[i]); 1868 sDescription += buf; 1869 } 1870 1871@@ -4312,7 +4312,7 @@ 1872 default: 1873 sReport += icValidateNonCompliantMsg; 1874 sReport += sSigName; 1875- sReport += " - Invalid data flag encoding.\r\n"; 1876+ sReport += " - Invalid data flag encoding.\n"; 1877 rv = icMaxStatus(rv, icValidateNonCompliant); 1878 } 1879 1880@@ -4477,11 +4477,11 @@ 1881 icChar buf[128]; 1882 1883 sDescription = "Date = "; 1884- sprintf(buf, "%u-%u-%u\r\n", m_DateTime.month, m_DateTime.day, m_DateTime.year); 1885+ sprintf(buf, "%u-%u-%u\n", m_DateTime.month, m_DateTime.day, m_DateTime.year); 1886 sDescription += buf; 1887 1888 sDescription += "Time = "; 1889- sprintf(buf, "%u:%u:%u\r\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds); 1890+ sprintf(buf, "%u:%u:%u\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds); 1891 sDescription += buf; 1892 } 1893 1894@@ -4697,12 +4697,12 @@ 1895 { 1896 icChar buf[128]; 1897 1898- sprintf(buf, "Colorant Count : %u\r\n", m_nCount); 1899+ sprintf(buf, "Colorant Count : %u\n", m_nCount); 1900 sDescription += buf; 1901- sDescription += "Order of Colorants:\r\n"; 1902+ sDescription += "Order of Colorants:\n"; 1903 1904 for (int i=0; i<(int)m_nCount; i++) { 1905- sprintf(buf, "%u\r\n", m_pData[i]); 1906+ sprintf(buf, "%u\n", m_pData[i]); 1907 sDescription += buf; 1908 } 1909 } 1910@@ -4757,7 +4757,7 @@ 1911 if (!pProfile) { 1912 sReport += icValidateWarningMsg; 1913 sReport += sSigName; 1914- sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n"; 1915+ sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n"; 1916 rv = icMaxStatus(rv, icValidateWarning); 1917 return rv; 1918 } 1919@@ -4765,7 +4765,7 @@ 1920 if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) { 1921 sReport += icValidateNonCompliantMsg; 1922 sReport += sSigName; 1923- sReport += " - Incorrect number of colorants.\r\n"; 1924+ sReport += " - Incorrect number of colorants.\n"; 1925 rv = icMaxStatus(rv, icValidateNonCompliant); 1926 } 1927 1928@@ -4977,7 +4977,7 @@ 1929 icUInt32Number i, nLen, nMaxLen=0; 1930 icFloatNumber Lab[3]; 1931 1932- sprintf(buf, "BEGIN_COLORANTS %u\r\n", m_nCount); 1933+ sprintf(buf, "BEGIN_COLORANTS %u\n", m_nCount); 1934 sDescription += buf; 1935 1936 for (i=0; i<m_nCount; i++) { 1937@@ -4988,11 +4988,11 @@ 1938 sDescription += "# NAME "; 1939 1940 if (m_PCS == icSigXYZData) { 1941- sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\r\n"); 1942+ sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\n"); 1943 sDescription += buf; 1944 } 1945 else { 1946- sprintf(buf, "Lab_L Lab_a Lab_b\r\n"); 1947+ sprintf(buf, "Lab_L Lab_a Lab_b\n"); 1948 sDescription += buf; 1949 } 1950 for (i=0; i<m_nCount; i++) { 1951@@ -5003,7 +5003,7 @@ 1952 sDescription += buf; 1953 1954 if (m_PCS == icSigXYZData) { 1955- sprintf(buf, "%7.4lf %7.4lf %7.4lf\r\n", icUSFtoD(m_pData[i].data[0]), icUSFtoD(m_pData[i].data[1]), icUSFtoD(m_pData[i].data[2])); 1956+ sprintf(buf, "%7.4lf %7.4lf %7.4lf\n", icUSFtoD(m_pData[i].data[0]), icUSFtoD(m_pData[i].data[1]), icUSFtoD(m_pData[i].data[2])); 1957 sDescription += buf; 1958 } 1959 else { 1960@@ -5011,7 +5011,7 @@ 1961 Lab[1] = icU16toF(m_pData[i].data[1]); 1962 Lab[2] = icU16toF(m_pData[i].data[2]); 1963 icLabFromPcs(Lab); 1964- sprintf(buf, "%7.4lf %8.4lf %8.4lf\r\n", Lab[0], Lab[1], Lab[2]); 1965+ sprintf(buf, "%7.4lf %8.4lf %8.4lf\n", Lab[0], Lab[1], Lab[2]); 1966 sDescription += buf; 1967 } 1968 } 1969@@ -5066,7 +5066,7 @@ 1970 if (!pProfile) { 1971 sReport += icValidateWarningMsg; 1972 sReport += sSigName; 1973- sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n"; 1974+ sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n"; 1975 rv = icMaxStatus(rv, icValidateWarning); 1976 return rv; 1977 } 1978@@ -5076,7 +5076,7 @@ 1979 if (pProfile->m_Header.deviceClass!=icSigLinkClass) { 1980 sReport += icValidateNonCompliantMsg; 1981 sReport += sSigName; 1982- sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\r\n"; 1983+ sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\n"; 1984 rv = icMaxStatus(rv, icValidateNonCompliant); 1985 } 1986 } 1987@@ -5084,7 +5084,7 @@ 1988 if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) { 1989 sReport += icValidateNonCompliantMsg; 1990 sReport += sSigName; 1991- sReport += " - Incorrect number of colorants.\r\n"; 1992+ sReport += " - Incorrect number of colorants.\n"; 1993 rv = icMaxStatus(rv, icValidateNonCompliant); 1994 } 1995 1996@@ -5261,13 +5261,13 @@ 1997 icChar buf[128]; 1998 CIccInfo Fmt; 1999 2000- sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n", 2001+ sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n", 2002 icFtoD(m_XYZIllum.X), 2003 icFtoD(m_XYZIllum.Y), 2004 icFtoD(m_XYZIllum.Z)); 2005 sDescription += buf; 2006 2007- sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n", 2008+ sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n", 2009 icFtoD(m_XYZSurround.X), 2010 icFtoD(m_XYZSurround.Y), 2011 icFtoD(m_XYZSurround.Z)); 2012@@ -5276,7 +5276,7 @@ 2013 sDescription += "Illuminant Type: "; 2014 2015 sDescription += Fmt.GetIlluminantName(m_illumType); 2016- sDescription += "\r\n"; 2017+ sDescription += "\n"; 2018 2019 } 2020 2021@@ -5800,32 +5800,32 @@ 2022 icChar buf[128], buf2[28]; 2023 icUInt32Number count=0; 2024 2025- sprintf(buf, "Number of Profile Description Structures: %u\r\n", m_Descriptions->size()); 2026+ sprintf(buf, "Number of Profile Description Structures: %u\n", m_Descriptions->size()); 2027 sDescription += buf; 2028 2029 for (i=m_Descriptions->begin(); i!=m_Descriptions->end(); i++, count++) { 2030- sDescription += "\r\n"; 2031+ sDescription += "\n"; 2032 2033- sprintf(buf, "Profile Description Structure Number [%u] follows:\r\n", count+1); 2034+ sprintf(buf, "Profile Description Structure Number [%u] follows:\n", count+1); 2035 sDescription += buf; 2036 2037- sprintf(buf, "Device Manufacturer Signature: %s\r\n", icGetSig(buf2, i->m_deviceMfg, false)); 2038+ sprintf(buf, "Device Manufacturer Signature: %s\n", icGetSig(buf2, i->m_deviceMfg, false)); 2039 sDescription += buf; 2040 2041- sprintf(buf, "Device Model Signature: %s\r\n", icGetSig(buf2, i->m_deviceModel, false)); 2042+ sprintf(buf, "Device Model Signature: %s\n", icGetSig(buf2, i->m_deviceModel, false)); 2043 sDescription += buf; 2044 2045- sprintf(buf, "Device Attributes: %08x%08x\r\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes)); 2046+ sprintf(buf, "Device Attributes: %08x%08x\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes)); 2047 sDescription += buf; 2048 2049- sprintf(buf, "Device Technology Signature: %s\r\n", icGetSig(buf2, i->m_technology, false)); 2050+ sprintf(buf, "Device Technology Signature: %s\n", icGetSig(buf2, i->m_technology, false)); 2051 sDescription += buf; 2052 2053- sprintf(buf, "Description of device manufacturer: \r\n"); 2054+ sprintf(buf, "Description of device manufacturer: \n"); 2055 sDescription += buf; 2056 i->m_deviceMfgDesc.Describe(sDescription); 2057 2058- sprintf(buf, "Description of device model: \r\n"); 2059+ sprintf(buf, "Description of device model: \n"); 2060 sDescription += buf; 2061 i->m_deviceModelDesc.Describe(sDescription); 2062 } 2063@@ -5886,7 +5886,7 @@ 2064 { 2065 sReport += icValidateNonCompliantMsg; 2066 sReport += sSigName; 2067- sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(i->m_technology)); 2068+ sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(i->m_technology)); 2069 sReport += buf; 2070 rv = icMaxStatus(rv, icValidateNonCompliant); 2071 } 2072@@ -5896,7 +5896,7 @@ 2073 sReport += icValidateNonCompliantMsg; 2074 sReport += sSigName; 2075 2076- sReport += " Contains non-aligned deviceMfgDesc text tag information\r\n"; 2077+ sReport += " Contains non-aligned deviceMfgDesc text tag information\n"; 2078 2079 rv = icMaxStatus(rv, icValidateNonCompliant); 2080 } 2081@@ -5905,7 +5905,7 @@ 2082 sReport += icValidateNonCompliantMsg; 2083 sReport += sSigName; 2084 2085- sReport += " Contains non-aligned deviceModelDesc text tag information\r\n"; 2086+ sReport += " Contains non-aligned deviceModelDesc text tag information\n"; 2087 2088 rv = icMaxStatus(rv, icValidateNonCompliant); 2089 } 2090@@ -6174,25 +6174,25 @@ 2091 CIccResponse16List::iterator j; 2092 2093 sDescription += "Measurement Unit: "; 2094- sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\r\n"; 2095+ sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\n"; 2096 2097 2098 for (int i=0; i<m_nChannels; i++) { 2099 nResponseList = m_Response16ListArray[i]; 2100 2101- sDescription += "\r\n"; 2102- sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", i+1, 2103+ sDescription += "\n"; 2104+ sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\n", i+1, 2105 icFtoD(m_maxColorantXYZ[i].X), icFtoD(m_maxColorantXYZ[i].Y), icFtoD(m_maxColorantXYZ[i].Z)); 2106 sDescription += buf; 2107 2108- sprintf(buf, "Number of Measurements for Channel-%u : %u\r\n", i+1, nResponseList.size()); 2109+ sprintf(buf, "Number of Measurements for Channel-%u : %u\n", i+1, nResponseList.size()); 2110 sDescription += buf; 2111 2112- sprintf(buf, "Measurement Data for Channel-%u follows:\r\n", i+1); 2113+ sprintf(buf, "Measurement Data for Channel-%u follows:\n", i+1); 2114 sDescription += buf; 2115 2116 for (j=nResponseList.begin(); j!=nResponseList.end(); j++) { 2117- sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\r\n", j->deviceCode, icFtoD(j->measurementValue)); 2118+ sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\n", j->deviceCode, icFtoD(j->measurementValue)); 2119 sDescription += buf; 2120 } 2121 } 2122@@ -6234,14 +6234,14 @@ 2123 default: 2124 sReport += icValidateNonCompliantMsg; 2125 sReport += sSigName; 2126- sReport += " - Unknown measurement unit signature.\r\n"; 2127+ sReport += " - Unknown measurement unit signature.\n"; 2128 rv = icMaxStatus(rv, icValidateNonCompliant); 2129 } 2130 2131 if (!m_nChannels) { 2132 sReport += icValidateNonCompliantMsg; 2133 sReport += sSigName; 2134- sReport += " - Incorrect number of channels.\r\n"; 2135+ sReport += " - Incorrect number of channels.\n"; 2136 rv = icMaxStatus(rv, icValidateNonCompliant); 2137 return rv; 2138 } 2139@@ -6479,17 +6479,17 @@ 2140 CIccResponseCurveSet::iterator i; 2141 icChar buf[128]; 2142 2143- sprintf(buf, "Number of Channels: %u\r\n", m_nChannels); 2144+ sprintf(buf, "Number of Channels: %u\n", m_nChannels); 2145 sDescription += buf; 2146 2147- sprintf(buf, "Number of Measurement Types used: %u\r\n", m_ResponseCurves->size()); 2148+ sprintf(buf, "Number of Measurement Types used: %u\n", m_ResponseCurves->size()); 2149 sDescription += buf; 2150 2151 int count = 0; 2152 for (i=m_ResponseCurves->begin(); i!=m_ResponseCurves->end(); i++, count++) { 2153- sDescription += "\r\n"; 2154+ sDescription += "\n"; 2155 2156- sprintf(buf, "Response Curve for measurement type [%u] follows:\r\n", count+1); 2157+ sprintf(buf, "Response Curve for measurement type [%u] follows:\n", count+1); 2158 sDescription += buf; 2159 2160 i->Describe(sDescription); 2161@@ -6658,7 +6658,7 @@ 2162 if (!pProfile) { 2163 sReport += icValidateWarningMsg; 2164 sReport += sSigName; 2165- sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n"; 2166+ sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n"; 2167 rv = icMaxStatus(rv, icValidateWarning); 2168 return rv; 2169 } 2170@@ -6666,13 +6666,13 @@ 2171 if (m_nChannels!=icGetSpaceSamples(pProfile->m_Header.colorSpace)) { 2172 sReport += icValidateWarningMsg; 2173 sReport += sSigName; 2174- sReport += " - Incorrect number of channels.\r\n"; 2175+ sReport += " - Incorrect number of channels.\n"; 2176 } 2177 2178 if (!GetNumResponseCurveTypes()) { 2179 sReport += icValidateWarningMsg; 2180 sReport += sSigName; 2181- sReport += " - Empty Tag!.\r\n"; 2182+ sReport += " - Empty Tag!.\n"; 2183 rv = icMaxStatus(rv, icValidateWarning); 2184 } 2185 else { 2186diff -ru misc/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp 2187--- misc/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp 2007-08-20 15:05:00.000000000 -0500 2188+++ misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp 2012-01-24 10:39:23.000000000 -0500 2189@@ -323,23 +323,23 @@ 2190 icChar buf[128], *ptr; 2191 2192 if (!m_nSize) { 2193- sprintf(buf, "BEGIN_CURVE In_Out\r\n"); 2194+ sprintf(buf, "BEGIN_CURVE In_Out\n"); 2195 sDescription += buf; 2196- sDescription += "Y = X\r\n"; 2197+ sDescription += "Y = X\n"; 2198 } 2199 else if (m_nSize==1) { 2200 icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0); 2201- sprintf(buf, "BEGIN_CURVE In_Out\r\n"); 2202+ sprintf(buf, "BEGIN_CURVE In_Out\n"); 2203 sDescription += buf; 2204- sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma); 2205+ sprintf(buf, "Y = X ^ %.4lf\n", dGamma); 2206 sDescription += buf; 2207 } 2208 else { 2209 int i; 2210 2211- sprintf(buf, "BEGIN_LUT In_Out 1 1\r\n"); 2212+ sprintf(buf, "BEGIN_LUT In_Out 1 1\n"); 2213 sDescription += buf; 2214- sDescription += "IN OUT\r\n"; 2215+ sDescription += "IN OUT\n"; 2216 2217 for (i=0; i<(int)m_nSize; i++) { 2218 ptr = buf; 2219@@ -354,12 +354,12 @@ 2220 2221 ptr += strlen(ptr); 2222 2223- strcpy(ptr, "\r\n"); 2224+ strcpy(ptr, "\n"); 2225 2226 sDescription += buf; 2227 } 2228 } 2229- sDescription += "\r\n"; 2230+ sDescription += "\n"; 2231 } 2232 2233 2234@@ -383,23 +383,23 @@ 2235 icChar buf[128], *ptr; 2236 2237 if (!m_nSize) { 2238- sprintf(buf, "BEGIN_CURVE %s\r\n", szName); 2239+ sprintf(buf, "BEGIN_CURVE %s\n", szName); 2240 sDescription += buf; 2241- sDescription += "Y = X\r\n"; 2242+ sDescription += "Y = X\n"; 2243 } 2244 else if (m_nSize==1) { 2245 icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0); 2246- sprintf(buf, "BEGIN_CURVE %s\r\n", szName); 2247+ sprintf(buf, "BEGIN_CURVE %s\n", szName); 2248 sDescription += buf; 2249- sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma); 2250+ sprintf(buf, "Y = X ^ %.4lf\n", dGamma); 2251 sDescription += buf; 2252 } 2253 else { 2254 int i; 2255 2256- sprintf(buf, "BEGIN_LUT %s 1 1\r\n", szName); 2257+ sprintf(buf, "BEGIN_LUT %s 1 1\n", szName); 2258 sDescription += buf; 2259- sDescription += "IN OUT\r\n"; 2260+ sDescription += "IN OUT\n"; 2261 2262 sDescription.reserve(sDescription.size() + m_nSize * 20); 2263 2264@@ -416,12 +416,12 @@ 2265 2266 ptr += strlen(ptr); 2267 2268- strcpy(ptr, "\r\n"); 2269+ strcpy(ptr, "\n"); 2270 2271 sDescription += buf; 2272 } 2273 } 2274- sDescription += "\r\n"; 2275+ sDescription += "\n"; 2276 } 2277 2278 2279@@ -614,7 +614,7 @@ 2280 if (m_Curve[0]>0.0 || m_Curve[m_nSize-1]<1.0) { 2281 sReport += icValidateWarningMsg; 2282 sReport += sSigName; 2283- sReport += " - Curve cannot be accurately inverted.\r\n"; 2284+ sReport += " - Curve cannot be accurately inverted.\n"; 2285 rv = icMaxStatus(rv, icValidateWarning); 2286 } 2287 } 2288@@ -822,67 +822,67 @@ 2289 { 2290 icChar buf[128]; 2291 2292- sprintf(buf, "FunctionType: %04Xh\r\n", m_nFunctionType); 2293+ sprintf(buf, "FunctionType: %04Xh\n", m_nFunctionType); 2294 sDescription += buf; 2295 2296 switch(m_nFunctionType) { 2297 case 0x0000: 2298- sprintf(buf, "Y = X ^ %.4lf\r\n", icFtoD(m_Param[0])); 2299+ sprintf(buf, "Y = X ^ %.4lf\n", icFtoD(m_Param[0])); 2300 sDescription += buf; 2301 return; 2302 2303 case 0x0001: 2304- sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf when (X >= %.4lf / %.4lf)\r\n", 2305+ sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf when (X >= %.4lf / %.4lf)\n", 2306 icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]), 2307 -icFtoD(m_Param[2]), icFtoD(m_Param[1])); 2308 sDescription += buf; 2309 2310- sprintf(buf, "Y = 0 when (X < %.4lf / %.4lf)\r\n", 2311+ sprintf(buf, "Y = 0 when (X < %.4lf / %.4lf)\n", 2312 -icFtoD(m_Param[2]), icFtoD(m_Param[1])); 2313 sDescription += buf; 2314 return; 2315 2316 case 0x0002: 2317- sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf when (X >= %.4lf / %.4lf)\r\n", 2318+ sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf when (X >= %.4lf / %.4lf)\n", 2319 icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]), 2320 icFtoD(m_Param[3]), 2321 -icFtoD(m_Param[2]), icFtoD(m_Param[1])); 2322 sDescription += buf; 2323 2324- sprintf(buf, "Y = %.4lf when (X < %.4lf / %.4lf)\r\n", icFtoD(m_Param[3]), 2325+ sprintf(buf, "Y = %.4lf when (X < %.4lf / %.4lf)\n", icFtoD(m_Param[3]), 2326 -icFtoD(m_Param[2]), icFtoD(m_Param[1])); 2327 sDescription += buf; 2328 return; 2329 2330 case 0x0003: 2331- sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf when (X >= %.4lf)\r\n", 2332+ sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf when (X >= %.4lf)\n", 2333 icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]), 2334 icFtoD(m_Param[4])); 2335 sDescription += buf; 2336 2337- sprintf(buf, "Y = %lf * X when (X < %.4lf)\r\n", 2338+ sprintf(buf, "Y = %lf * X when (X < %.4lf)\n", 2339 icFtoD(m_Param[3]), icFtoD(m_Param[4])); 2340 sDescription += buf; 2341 return; 2342 2343 case 0x0004: 2344- sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf when (X >= %.4lf)\r\n", 2345+ sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf when (X >= %.4lf)\n", 2346 icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]), 2347 icFtoD(m_Param[5]), icFtoD(m_Param[4])); 2348 sDescription += buf; 2349 2350- sprintf(buf, "Y = %lf * X + %.4lf when (X < %.4lf)\r\n", 2351+ sprintf(buf, "Y = %lf * X + %.4lf when (X < %.4lf)\n", 2352 icFtoD(m_Param[3]), icFtoD(m_Param[6]), icFtoD(m_Param[4])); 2353 sDescription += buf; 2354 return; 2355 2356 default: 2357 int i; 2358- sprintf(buf, "Unknown Function with %d parameters:\r\n"); 2359+ sprintf(buf, "Unknown Function with %d parameters:\n", m_nNumParam); 2360 sDescription += buf; 2361 2362 for (i=0; i<m_nNumParam; i++) { 2363- sprintf(buf, "Param[%d] = %.4lf\r\n", i, icFtoD(m_Param[i])); 2364+ sprintf(buf, "Param[%d] = %.4lf\n", i, icFtoD(m_Param[i])); 2365 sDescription += buf; 2366 } 2367 } 2368@@ -907,10 +907,10 @@ 2369 { 2370 icChar buf[128]; 2371 2372- sprintf(buf, "BEGIN_CURVE %s\r\n", szName); 2373+ sprintf(buf, "BEGIN_CURVE %s\n", szName); 2374 sDescription += buf; 2375 Describe(sDescription); 2376- sDescription += "\r\n"; 2377+ sDescription += "\n"; 2378 } 2379 2380 2381@@ -1106,7 +1106,7 @@ 2382 if (m_nReserved2!=0) { 2383 sReport += icValidateNonCompliantMsg; 2384 sReport += sSigName; 2385- sReport += " - Reserved Value must be zero.\r\n"; 2386+ sReport += " - Reserved Value must be zero.\n"; 2387 2388 rv = icMaxStatus(rv, icValidateNonCompliant); 2389 } 2390@@ -1116,7 +1116,7 @@ 2391 if (m_nNumParam!=1) { 2392 sReport += icValidateCriticalErrorMsg; 2393 sReport += sSigName; 2394- sReport += " - Number of parameters inconsistent with function type.\r\n"; 2395+ sReport += " - Number of parameters inconsistent with function type.\n"; 2396 rv = icMaxStatus(rv, icValidateCriticalError); 2397 } 2398 break; 2399@@ -1125,7 +1125,7 @@ 2400 if (m_nNumParam!=3) { 2401 sReport += icValidateCriticalErrorMsg; 2402 sReport += sSigName; 2403- sReport += " - Number of parameters inconsistent with function type.\r\n"; 2404+ sReport += " - Number of parameters inconsistent with function type.\n"; 2405 rv = icMaxStatus(rv, icValidateCriticalError); 2406 } 2407 break; 2408@@ -1134,7 +1134,7 @@ 2409 if (m_nNumParam!=4) { 2410 sReport += icValidateCriticalErrorMsg; 2411 sReport += sSigName; 2412- sReport += " - Number of parameters inconsistent with function type.\r\n"; 2413+ sReport += " - Number of parameters inconsistent with function type.\n"; 2414 rv = icMaxStatus(rv, icValidateCriticalError); 2415 } 2416 break; 2417@@ -1143,7 +1143,7 @@ 2418 if (m_nNumParam!=5) { 2419 sReport += icValidateCriticalErrorMsg; 2420 sReport += sSigName; 2421- sReport += " - Number of parameters inconsistent with function type.\r\n"; 2422+ sReport += " - Number of parameters inconsistent with function type.\n"; 2423 rv = icMaxStatus(rv, icValidateCriticalError); 2424 } 2425 break; 2426@@ -1152,7 +1152,7 @@ 2427 if (m_nNumParam!=7) { 2428 sReport += icValidateCriticalErrorMsg; 2429 sReport += sSigName; 2430- sReport += " - Number of parameters inconsistent with function type.\r\n"; 2431+ sReport += " - Number of parameters inconsistent with function type.\n"; 2432 rv = icMaxStatus(rv, icValidateCriticalError); 2433 } 2434 break; 2435@@ -1160,7 +1160,7 @@ 2436 default: 2437 sReport += icValidateCriticalErrorMsg; 2438 sReport += sSigName; 2439- sReport += " - Unknown function type.\r\n"; 2440+ sReport += " - Unknown function type.\n"; 2441 rv = icMaxStatus(rv, icValidateCriticalError); 2442 } 2443 2444@@ -1170,7 +1170,7 @@ 2445 if (lval>0.0 || uval<1.0) { 2446 sReport += icValidateWarningMsg; 2447 sReport += sSigName; 2448- sReport += " - Curve cannot be accurately inverted.\r\n"; 2449+ sReport += " - Curve cannot be accurately inverted.\n"; 2450 rv = icMaxStatus(rv, icValidateWarning); 2451 } 2452 } 2453@@ -1255,32 +1255,32 @@ 2454 { 2455 icChar buf[128]; 2456 2457- sprintf(buf, "BEGIN_MATRIX %s\r\n", szName); 2458+ sprintf(buf, "BEGIN_MATRIX %s\n", szName); 2459 sDescription += buf; 2460 2461 if (!m_bUseConstants) { 2462- sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", 2463+ sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", 2464 m_e[0], m_e[1], m_e[2]); 2465 sDescription += buf; 2466- sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", 2467+ sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", 2468 m_e[3], m_e[4], m_e[5]); 2469 sDescription += buf; 2470- sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", 2471+ sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", 2472 m_e[6], m_e[7], m_e[8]); 2473 sDescription += buf; 2474 } 2475 else { 2476- sprintf(buf, "%8.4lf %8.4lf %8.4lf + %8.4lf\r\n", 2477+ sprintf(buf, "%8.4lf %8.4lf %8.4lf + %8.4lf\n", 2478 m_e[0], m_e[1], m_e[2], m_e[9]); 2479 sDescription += buf; 2480- sprintf(buf, "%8.4lf %8.4lf %8.4lf + %8.4lf\r\n", 2481+ sprintf(buf, "%8.4lf %8.4lf %8.4lf + %8.4lf\n", 2482 m_e[3], m_e[4], m_e[5], m_e[10]); 2483 sDescription += buf; 2484- sprintf(buf, "%8.4lf %8.4lf %8.4lf + %8.4lf\r\n", 2485+ sprintf(buf, "%8.4lf %8.4lf %8.4lf + %8.4lf\n", 2486 m_e[6], m_e[7], m_e[8], m_e[11]); 2487 sDescription += buf; 2488 } 2489- sDescription += "\r\n"; 2490+ sDescription += "\n"; 2491 } 2492 2493 /** 2494@@ -1377,7 +1377,7 @@ 2495 if (m_e[0]!=1.0 || m_e[4]!=1.0 || m_e[9]!=1.0 || sum!=3.0) { 2496 sReport += icValidateNonCompliantMsg; 2497 sReport += sSigName; 2498- sReport += " - Matrix must be identity.\r\n"; 2499+ sReport += " - Matrix must be identity.\n"; 2500 rv = icValidateNonCompliant; 2501 } 2502 } 2503@@ -1754,7 +1754,7 @@ 2504 2505 ptr += sprintf(ptr, " %s", m_pVal); 2506 } 2507- strcpy(ptr, "\r\n"); 2508+ strcpy(ptr, "\n"); 2509 sDescription += (const icChar*)m_pOutText; 2510 2511 } 2512@@ -1866,7 +1866,7 @@ 2513 icChar szOutText[2048], szColor[40]; 2514 int i, len; 2515 2516- sprintf(szOutText, "BEGIN_LUT %s %d %d\r\n", szName, m_nInput, m_nOutput); 2517+ sprintf(szOutText, "BEGIN_LUT %s %d %d\n", szName, m_nInput, m_nOutput); 2518 sDescription += szOutText; 2519 2520 for (i=0; i<m_nInput; i++) { 2521@@ -1883,7 +1883,7 @@ 2522 sDescription += szOutText; 2523 } 2524 2525- sDescription += "\r\n"; 2526+ sDescription += "\n"; 2527 2528 len = 0; 2529 for (i=0; i<m_nInput; i++) { 2530@@ -1907,7 +1907,7 @@ 2531 2532 Iterate(sDescription, 0, 0); 2533 2534- sDescription += "\r\n"; 2535+ sDescription += "\n"; 2536 } 2537 2538 2539@@ -2693,7 +2693,7 @@ 2540 if (m_nReserved2[0]!=0 || m_nReserved2[1]!=0 || m_nReserved2[2]!=0) { 2541 sReport += icValidateNonCompliantMsg; 2542 sReport += sSigName; 2543- sReport += " - Reserved Value must be zero.\r\n"; 2544+ sReport += " - Reserved Value must be zero.\n"; 2545 2546 rv = icValidateNonCompliant; 2547 } 2548@@ -2704,7 +2704,7 @@ 2549 if (m_GridPoints[i]<2) { 2550 sReport += icValidateCriticalErrorMsg; 2551 sReport += sSigName; 2552- sprintf(temp, " - CLUT: At least 2 grid points should be present in dimension %u.\r\n",i ); 2553+ sprintf(temp, " - CLUT: At least 2 grid points should be present in dimension %u.\n",i ); 2554 sReport += temp; 2555 rv = icMaxStatus(rv, icValidateCriticalError); 2556 } 2557@@ -3122,7 +3122,7 @@ 2558 if (!pProfile) { 2559 sReport += icValidateWarningMsg; 2560 sReport += sSigName; 2561- sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n"; 2562+ sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n"; 2563 rv = icMaxStatus(rv, icValidateWarning); 2564 return rv; 2565 } 2566@@ -3138,7 +3138,7 @@ 2567 if (m_nInput!=nInput) { 2568 sReport += icValidateCriticalErrorMsg; 2569 sReport += sSigName; 2570- sReport += " - Incorrect number of input channels.\r\n"; 2571+ sReport += " - Incorrect number of input channels.\n"; 2572 rv = icMaxStatus(rv, icValidateCriticalError); 2573 } 2574 2575@@ -3146,7 +3146,7 @@ 2576 if (m_nOutput!=nOutput) { 2577 sReport += icValidateCriticalErrorMsg; 2578 sReport += sSigName; 2579- sReport += " - Incorrect number of output channels.\r\n"; 2580+ sReport += " - Incorrect number of output channels.\n"; 2581 rv = icMaxStatus(rv, icValidateCriticalError); 2582 } 2583 2584@@ -3160,7 +3160,7 @@ 2585 if (m_nInput!=nInput) { 2586 sReport += icValidateCriticalErrorMsg; 2587 sReport += sSigName; 2588- sReport += " - Incorrect number of input channels.\r\n"; 2589+ sReport += " - Incorrect number of input channels.\n"; 2590 rv = icMaxStatus(rv, icValidateCriticalError); 2591 } 2592 2593@@ -3168,7 +3168,7 @@ 2594 if (m_nOutput!=nOutput) { 2595 sReport += icValidateCriticalErrorMsg; 2596 sReport += sSigName; 2597- sReport += " - Incorrect number of output channels.\r\n"; 2598+ sReport += " - Incorrect number of output channels.\n"; 2599 rv = icMaxStatus(rv, icValidateCriticalError); 2600 } 2601 2602@@ -3180,7 +3180,7 @@ 2603 if (m_nInput!=nInput) { 2604 sReport += icValidateCriticalErrorMsg; 2605 sReport += sSigName; 2606- sReport += " - Incorrect number of input channels.\r\n"; 2607+ sReport += " - Incorrect number of input channels.\n"; 2608 rv = icMaxStatus(rv, icValidateCriticalError); 2609 } 2610 2611@@ -3188,7 +3188,7 @@ 2612 if (m_nOutput!=nOutput) { 2613 sReport += icValidateCriticalErrorMsg; 2614 sReport += sSigName; 2615- sReport += " - Incorrect number of output channels.\r\n"; 2616+ sReport += " - Incorrect number of output channels.\n"; 2617 rv = icMaxStatus(rv, icValidateCriticalError); 2618 } 2619 2620@@ -3206,7 +3206,7 @@ 2621 if (!m_CLUT) { 2622 sReport += icValidateCriticalErrorMsg; 2623 sReport += sSigName; 2624- sReport += " - CLUT must be present.\r\n"; 2625+ sReport += " - CLUT must be present.\n"; 2626 rv = icMaxStatus(rv, icValidateCriticalError); 2627 } 2628 } 2629@@ -3748,7 +3748,7 @@ 2630 else { 2631 sReport += icValidateCriticalErrorMsg; 2632 sReport += sSigName; 2633- sReport += " - Incorrect number of B-curves.\r\n"; 2634+ sReport += " - Incorrect number of B-curves.\n"; 2635 rv = icMaxStatus(rv, icValidateCriticalError); 2636 } 2637 } 2638@@ -3762,7 +3762,7 @@ 2639 else { 2640 sReport += icValidateCriticalErrorMsg; 2641 sReport += sSigName; 2642- sReport += " - Incorrect number of M-curves.\r\n"; 2643+ sReport += " - Incorrect number of M-curves.\n"; 2644 rv = icMaxStatus(rv, icValidateCriticalError); 2645 } 2646 } 2647@@ -3772,7 +3772,7 @@ 2648 if (!m_CLUT) { 2649 sReport += icValidateNonCompliantMsg; 2650 sReport += sSigName; 2651- sReport += " - CLUT must be present if using A-curves.\r\n"; 2652+ sReport += " - CLUT must be present if using A-curves.\n"; 2653 2654 rv = icMaxStatus(rv, icValidateNonCompliant); 2655 } 2656@@ -3784,7 +3784,7 @@ 2657 else { 2658 sReport += icValidateCriticalErrorMsg; 2659 sReport += sSigName; 2660- sReport += " - Incorrect number of A-curves.\r\n"; 2661+ sReport += " - Incorrect number of A-curves.\n"; 2662 rv = icMaxStatus(rv, icValidateCriticalError); 2663 } 2664 } 2665@@ -3876,7 +3876,7 @@ 2666 if (!pProfile) { 2667 sReport += icValidateWarningMsg; 2668 sReport += sSigName; 2669- sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n"; 2670+ sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n"; 2671 rv = icMaxStatus(rv, icValidateCriticalError); 2672 return rv; 2673 } 2674@@ -3900,7 +3900,7 @@ 2675 if (m_nOutput!=nOutput) { 2676 sReport += icValidateCriticalErrorMsg; 2677 sReport += sSigName; 2678- sReport += " - Incorrect number of output channels.\r\n"; 2679+ sReport += " - Incorrect number of output channels.\n"; 2680 rv = icMaxStatus(rv, icValidateCriticalError); 2681 } 2682 2683@@ -3913,7 +3913,7 @@ 2684 else { 2685 sReport += icValidateCriticalErrorMsg; 2686 sReport += sSigName; 2687- sReport += " - Incorrect number of B-curves.\r\n"; 2688+ sReport += " - Incorrect number of B-curves.\n"; 2689 rv = icMaxStatus(rv, icValidateCriticalError); 2690 } 2691 } 2692@@ -3927,7 +3927,7 @@ 2693 else { 2694 sReport += icValidateCriticalErrorMsg; 2695 sReport += sSigName; 2696- sReport += " - Incorrect number of M-curves.\r\n"; 2697+ sReport += " - Incorrect number of M-curves.\n"; 2698 rv = icMaxStatus(rv, icValidateCriticalError); 2699 } 2700 } 2701@@ -3937,7 +3937,7 @@ 2702 if (!m_CLUT) { 2703 sReport += icValidateNonCompliantMsg; 2704 sReport += sSigName; 2705- sReport += " - CLUT must be present if using A-curves.\r\n"; 2706+ sReport += " - CLUT must be present if using A-curves.\n"; 2707 2708 rv = icMaxStatus(rv, icValidateNonCompliant); 2709 } 2710@@ -3949,7 +3949,7 @@ 2711 else { 2712 sReport += icValidateCriticalErrorMsg; 2713 sReport += sSigName; 2714- sReport += " - Incorrect number of A-curves.\r\n"; 2715+ sReport += " - Incorrect number of A-curves.\n"; 2716 rv = icMaxStatus(rv, icValidateCriticalError); 2717 } 2718 } 2719@@ -4311,7 +4311,7 @@ 2720 if (pTagCurve->GetSize()==1) { 2721 sReport += icValidateCriticalErrorMsg; 2722 sReport += sSigName; 2723- sReport += " - lut8Tags do not support single entry gamma curves.\r\n"; 2724+ sReport += " - lut8Tags do not support single entry gamma curves.\n"; 2725 rv = icMaxStatus(rv, icValidateCriticalError); 2726 } 2727 } 2728@@ -4319,7 +4319,7 @@ 2729 else { 2730 sReport += icValidateCriticalErrorMsg; 2731 sReport += sSigName; 2732- sReport += " - Incorrect number of B-curves.\r\n"; 2733+ sReport += " - Incorrect number of B-curves.\n"; 2734 rv = icMaxStatus(rv, icValidateCriticalError); 2735 } 2736 } 2737@@ -4336,7 +4336,7 @@ 2738 if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) { 2739 sReport += icValidateWarningMsg; 2740 sReport += sSigName; 2741- sReport += " - Matrix must be identity.\r\n"; 2742+ sReport += " - Matrix must be identity.\n"; 2743 rv = icMaxStatus(rv, icValidateWarning); 2744 } 2745 } 2746@@ -4351,7 +4351,7 @@ 2747 if (pTagCurve->GetSize()==1) { 2748 sReport += icValidateCriticalErrorMsg; 2749 sReport += sSigName; 2750- sReport += " - lut8Tags do not support single entry gamma curves.\r\n"; 2751+ sReport += " - lut8Tags do not support single entry gamma curves.\n"; 2752 rv = icMaxStatus(rv, icValidateCriticalError); 2753 } 2754 } 2755@@ -4359,7 +4359,7 @@ 2756 else { 2757 sReport += icValidateCriticalErrorMsg; 2758 sReport += sSigName; 2759- sReport += " - Incorrect number of A-curves.\r\n"; 2760+ sReport += " - Incorrect number of A-curves.\n"; 2761 rv = icMaxStatus(rv, icValidateCriticalError); 2762 } 2763 } 2764@@ -4721,7 +4721,7 @@ 2765 if (pTagCurve->GetSize()==1) { 2766 sReport += icValidateCriticalErrorMsg; 2767 sReport += sSigName; 2768- sReport += " - lut16Tags do not support single entry gamma curves.\r\n"; 2769+ sReport += " - lut16Tags do not support single entry gamma curves.\n"; 2770 rv = icMaxStatus(rv, icValidateCriticalError); 2771 } 2772 } 2773@@ -4729,7 +4729,7 @@ 2774 else { 2775 sReport += icValidateCriticalErrorMsg; 2776 sReport += sSigName; 2777- sReport += " - Incorrect number of B-curves.\r\n"; 2778+ sReport += " - Incorrect number of B-curves.\n"; 2779 rv = icMaxStatus(rv, icValidateCriticalError); 2780 } 2781 } 2782@@ -4746,7 +4746,7 @@ 2783 if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) { 2784 sReport += icValidateWarningMsg; 2785 sReport += sSigName; 2786- sReport += " - Matrix must be identity.\r\n"; 2787+ sReport += " - Matrix must be identity.\n"; 2788 rv = icMaxStatus(rv, icValidateWarning); 2789 } 2790 } 2791@@ -4761,7 +4761,7 @@ 2792 if (pTagCurve->GetSize()==1) { 2793 sReport += icValidateCriticalErrorMsg; 2794 sReport += sSigName; 2795- sReport += " - lut16Tags do not support single entry gamma curves.\r\n"; 2796+ sReport += " - lut16Tags do not support single entry gamma curves.\n"; 2797 rv = icMaxStatus(rv, icValidateCriticalError); 2798 } 2799 } 2800@@ -4769,7 +4769,7 @@ 2801 else { 2802 sReport += icValidateCriticalErrorMsg; 2803 sReport += sSigName; 2804- sReport += " - Incorrect number of A-curves.\r\n"; 2805+ sReport += " - Incorrect number of A-curves.\n"; 2806 rv = icMaxStatus(rv, icValidateCriticalError); 2807 } 2808 } 2809diff -ru misc/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp 2810--- misc/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp 2007-08-20 15:05:00.000000000 -0500 2811+++ misc/build/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp 2012-01-24 10:39:23.000000000 -0500 2812@@ -218,7 +218,7 @@ 2813 icGetSig(sigbuf, m_sig), m_nSize); 2814 sDescription += buf; 2815 2816- sDescription += "\r\n\r\nData Follows:\r\n"; 2817+ sDescription += "\n\nData Follows:\n"; 2818 2819 icMemDump(sDescription, m_pData, m_nSize); 2820 2821@@ -364,7 +364,7 @@ 2822 sReport += " - Contains unknown processing element type ("; 2823 icGetSig(buf, m_sig, true); 2824 sReport += buf; 2825- sReport += ").\r\n"; 2826+ sReport += ").\n"; 2827 2828 return icValidateCriticalError; 2829 } 2830@@ -392,7 +392,7 @@ 2831 sReport += " - Element "; 2832 sSigName = Info.GetSigName(GetType()); 2833 sReport += sSigName; 2834- sReport += " - Reserved Value must be zero.\r\n"; 2835+ sReport += " - Reserved Value must be zero.\n"; 2836 2837 rv = icValidateNonCompliant; 2838 } 2839@@ -738,18 +738,18 @@ 2840 { 2841 icChar buf[128]; 2842 2843- sprintf(buf, "BEGIN MULTI_PROCESS_ELEMENT_TAG %d %d\r\n", m_nInputChannels, m_nOutputChannels); 2844+ sprintf(buf, "BEGIN MULTI_PROCESS_ELEMENT_TAG %d %d\n", m_nInputChannels, m_nOutputChannels); 2845 sDescription += buf; 2846- sDescription += "\r\n"; 2847+ sDescription += "\n"; 2848 2849 CIccMultiProcessElementList::iterator i; 2850 int j; 2851 2852 for (j=0, i=m_list->begin(); i!=m_list->end(); j++, i++) { 2853- sprintf(buf, "PROCESS_ELEMENT #%d\r\n", j+1); 2854+ sprintf(buf, "PROCESS_ELEMENT #%d\n", j+1); 2855 sDescription += buf; 2856 i->ptr->Describe(sDescription); 2857- sDescription += "\r\n"; 2858+ sDescription += "\n"; 2859 } 2860 } 2861 2862@@ -1207,13 +1207,13 @@ 2863 if (m_nInputChannels != m_nOutputChannels) { 2864 sReport += icValidateCriticalErrorMsg; 2865 sReport += sSigName; 2866- sReport += " No processing elements and input and output channels do not match!\r\n"; 2867+ sReport += " No processing elements and input and output channels do not match!\n"; 2868 return icValidateCriticalError; 2869 } 2870 else { 2871 sReport += icValidateWarningMsg; 2872 sReport += sSigName; 2873- sReport += " No processing elements.\r\n"; 2874+ sReport += " No processing elements.\n"; 2875 return icValidateWarning; 2876 } 2877 } 2878@@ -1224,7 +1224,7 @@ 2879 if (i->ptr->NumInputChannels() != m_nInputChannels) { 2880 sReport += icValidateCriticalErrorMsg; 2881 sReport += sSigName; 2882- sReport += " Mis-matching number of input channels!\r\n"; 2883+ sReport += " Mis-matching number of input channels!\n"; 2884 return icValidateCriticalError; 2885 } 2886 2887@@ -1239,7 +1239,7 @@ 2888 sReport += "->"; 2889 sReport += i->ptr->GetClassName(); 2890 2891- sReport += " Mis-matching number of channels!\r\n"; 2892+ sReport += " Mis-matching number of channels!\n"; 2893 return icValidateCriticalError; 2894 } 2895 } 2896@@ -1251,7 +1251,7 @@ 2897 if (last && last->NumOutputChannels() != m_nOutputChannels) { 2898 sReport += icValidateCriticalErrorMsg; 2899 sReport += sSigName; 2900- sReport += " Mis-matching number of output channels!\r\n"; 2901+ sReport += " Mis-matching number of output channels!\n"; 2902 return icValidateCriticalError; 2903 } 2904 2905diff -ru misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp 2906--- misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp 2007-08-20 15:05:00.000000000 -0500 2907+++ misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp 2012-01-24 10:39:23.000000000 -0500 2908@@ -234,7 +234,7 @@ 2909 { 2910 std::string Dump; 2911 2912- sDescription += "ProfileID:\r\n"; 2913+ sDescription += "ProfileID:\n"; 2914 2915 int i; 2916 char buf[20]; 2917@@ -244,12 +244,12 @@ 2918 sprintf(buf, "%2x", m_profileID.ID8[i]); 2919 sDescription += buf; 2920 } 2921- sDescription += "\r\n"; 2922+ sDescription += "\n"; 2923 2924- sDescription += "Description:\r\n"; 2925+ sDescription += "Description:\n"; 2926 m_desc.Describe(sDescription); 2927 2928- sDescription += "\r\n"; 2929+ sDescription += "\n"; 2930 } 2931 2932 2933@@ -434,21 +434,21 @@ 2934 { 2935 icChar buf[128]; 2936 2937- sprintf(buf, "BEGIN ProfileSequenceIdentification_TAG\r\n"); 2938+ sprintf(buf, "BEGIN ProfileSequenceIdentification_TAG\n"); 2939 sDescription += buf; 2940- sDescription += "\r\n"; 2941+ sDescription += "\n"; 2942 2943 int i; 2944 CIccProfileIdDescList::iterator j; 2945 for (i=0, j=m_list->begin(); j!=m_list->end(); i++, j++) { 2946- sprintf(buf, "ProfileDescription_%d:\r\n", i+1); 2947+ sprintf(buf, "ProfileDescription_%d:\n", i+1); 2948 sDescription += buf; 2949 j->Describe(sDescription); 2950 } 2951 2952- sprintf(buf, "END ProfileSequenceIdentification_TAG\r\n"); 2953+ sprintf(buf, "END ProfileSequenceIdentification_TAG\n"); 2954 sDescription += buf; 2955- sDescription += "\r\n"; 2956+ sDescription += "\n"; 2957 } 2958 2959 2960diff -ru misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h 2961--- misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h 2007-08-20 15:05:00.000000000 -0500 2962+++ misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h 2012-01-24 10:39:23.000000000 -0500 2963@@ -161,4 +161,4 @@ 2964 } 2965 #endif 2966 2967-#endif //_ICCTAGPROFSEQID_H 2968\ No newline at end of file 2969+#endif //_ICCTAGPROFSEQID_H 2970diff -ru misc/SampleICC-1.3.2/IccProfLib/IccUtil.cpp misc/build/SampleICC-1.3.2/IccProfLib/IccUtil.cpp 2971--- misc/SampleICC-1.3.2/IccProfLib/IccUtil.cpp 2007-08-20 15:05:00.000000000 -0500 2972+++ misc/build/SampleICC-1.3.2/IccProfLib/IccUtil.cpp 2012-01-24 10:39:23.000000000 -0500 2973@@ -79,7 +79,7 @@ 2974 #include "IccUtil.h" 2975 #include "IccTagFactory.h" 2976 #include <stdlib.h> 2977-#include <memory.h> 2978+#include <memory> 2979 #include <ctype.h> 2980 #include <math.h> 2981 #include <string.h> 2982@@ -678,11 +678,11 @@ 2983 { 2984 icChar buf[128]; 2985 2986- sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[0]), icFtoD(pMatrix[1]), icFtoD(pMatrix[2])); 2987+ sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[0]), icFtoD(pMatrix[1]), icFtoD(pMatrix[2])); 2988 sDump += buf; 2989- sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[3]), icFtoD(pMatrix[4]), icFtoD(pMatrix[5])); 2990+ sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[3]), icFtoD(pMatrix[4]), icFtoD(pMatrix[5])); 2991 sDump += buf; 2992- sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[6]), icFtoD(pMatrix[7]), icFtoD(pMatrix[8])); 2993+ sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[6]), icFtoD(pMatrix[7]), icFtoD(pMatrix[8])); 2994 sDump += buf; 2995 } 2996 2997@@ -1516,19 +1516,19 @@ 2998 2999 if (XYZ.X < 0) { 3000 sReport += icValidateNonCompliantMsg; 3001- sReport += " - XYZNumber: Negative X value!\r\n"; 3002+ sReport += " - XYZNumber: Negative X value!\n"; 3003 rv = icValidateNonCompliant; 3004 } 3005 3006 if (XYZ.Y < 0) { 3007 sReport += icValidateNonCompliantMsg; 3008- sReport += " - XYZNumber: Negative Y value!\r\n"; 3009+ sReport += " - XYZNumber: Negative Y value!\n"; 3010 rv = icMaxStatus(rv, icValidateNonCompliant); 3011 } 3012 3013 if (XYZ.Z < 0) { 3014 sReport += icValidateNonCompliantMsg; 3015- sReport += " - XYZNumber: Negative Z value!\r\n"; 3016+ sReport += " - XYZNumber: Negative Z value!\n"; 3017 rv = icMaxStatus(rv, icValidateNonCompliant); 3018 } 3019 3020@@ -1548,7 +1548,7 @@ 3021 icChar buf[128]; 3022 if (dateTime.year<1992) { 3023 sReport += icValidateWarningMsg; 3024- sprintf(buf," - %u: Invalid year!\r\n",dateTime.year); 3025+ sprintf(buf," - %u: Invalid year!\n",dateTime.year); 3026 sReport += buf; 3027 rv = icValidateWarning; 3028 } 3029@@ -1557,7 +1557,7 @@ 3030 if (newtime->tm_mon==11 && newtime->tm_mday==31) { 3031 if (dateTime.year>(year+1)) { 3032 sReport += icValidateWarningMsg; 3033- sprintf(buf," - %u: Invalid year!\r\n",dateTime.year); 3034+ sprintf(buf," - %u: Invalid year!\n",dateTime.year); 3035 sReport += buf; 3036 rv = icMaxStatus(rv, icValidateWarning); 3037 } 3038@@ -1565,7 +1565,7 @@ 3039 else { 3040 if (dateTime.year>year) { 3041 sReport += icValidateWarningMsg; 3042- sprintf(buf," - %u: Invalid year!\r\n",dateTime.year); 3043+ sprintf(buf," - %u: Invalid year!\n",dateTime.year); 3044 sReport += buf; 3045 rv = icMaxStatus(rv, icValidateWarning); 3046 } 3047@@ -1573,14 +1573,14 @@ 3048 3049 if (dateTime.month<1 || dateTime.month>12) { 3050 sReport += icValidateWarningMsg; 3051- sprintf(buf," - %u: Invalid month!\r\n",dateTime.month); 3052+ sprintf(buf," - %u: Invalid month!\n",dateTime.month); 3053 sReport += buf; 3054 rv = icMaxStatus(rv, icValidateWarning); 3055 } 3056 3057 if (dateTime.day<1 || dateTime.day>31) { 3058 sReport += icValidateWarningMsg; 3059- sprintf(buf," - %u: Invalid day!\r\n",dateTime.day); 3060+ sprintf(buf," - %u: Invalid day!\n",dateTime.day); 3061 sReport += buf; 3062 rv = icMaxStatus(rv, icValidateWarning); 3063 } 3064@@ -1588,7 +1588,7 @@ 3065 if (dateTime.month==2) { 3066 if (dateTime.day>29) { 3067 sReport += icValidateWarningMsg; 3068- sprintf(buf," - %u: Invalid day for February!\r\n",dateTime.day); 3069+ sprintf(buf," - %u: Invalid day for February!\n",dateTime.day); 3070 sReport += buf; 3071 rv = icMaxStatus(rv, icValidateWarning); 3072 } 3073@@ -1596,7 +1596,7 @@ 3074 if (dateTime.day==29) { 3075 if ((dateTime.year%4)!=0) { 3076 sReport += icValidateWarningMsg; 3077- sprintf(buf," - %u: Invalid day for February, year is not a leap year(%u)!\r\n",dateTime.day, dateTime.year); 3078+ sprintf(buf," - %u: Invalid day for February, year is not a leap year(%u)!\n",dateTime.day, dateTime.year); 3079 sReport += buf; 3080 rv = icMaxStatus(rv, icValidateWarning); 3081 } 3082@@ -1605,21 +1605,21 @@ 3083 3084 if (dateTime.hours>23) { 3085 sReport += icValidateWarningMsg; 3086- sprintf(buf," - %u: Invalid hour!\r\n",dateTime.hours); 3087+ sprintf(buf," - %u: Invalid hour!\n",dateTime.hours); 3088 sReport += buf; 3089 rv = icMaxStatus(rv, icValidateWarning); 3090 } 3091 3092 if (dateTime.minutes>59) { 3093 sReport += icValidateWarningMsg; 3094- sprintf(buf," - %u: Invalid minutes!\r\n",dateTime.minutes); 3095+ sprintf(buf," - %u: Invalid minutes!\n",dateTime.minutes); 3096 sReport += buf; 3097 rv = icMaxStatus(rv, icValidateWarning); 3098 } 3099 3100 if (dateTime.seconds>59) { 3101 sReport += icValidateWarningMsg; 3102- sprintf(buf," - %u: Invalid seconds!\r\n",dateTime.hours); 3103+ sprintf(buf," - %u: Invalid seconds!\n",dateTime.hours); 3104 sReport += buf; 3105 rv = icMaxStatus(rv, icValidateWarning); 3106 } 3107diff -ru misc/SampleICC-1.3.2/IccProfLib/icProfileHeader.h misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h 3108--- misc/SampleICC-1.3.2/IccProfLib/icProfileHeader.h 2007-08-20 15:05:00.000000000 -0500 3109+++ misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h 2012-01-24 10:39:23.000000000 -0500 3110@@ -659,10 +659,11 @@ 3111 typedef enum { 3112 icFlare0 = 0x00000000, /* 0% flare */ 3113 icFlare100 = 0x00000001, /* 100% flare */ 3114+ icMaxEnumFlare = 0xFFFFFFFF 3115 } icMeasurementFlare; 3116 3117 /** Convenience Enum Definition - Not defined in ICC specification*/ 3118-#define icMaxEnumFlare ((icMeasurementFlare) 0xFFFFFFFF) 3119+/*#define icMaxEnumFlare ((icMeasurementFlare) 0xFFFFFFFF)*/ 3120 #define icMaxFlare ((icMeasurementFlare) 0xFFFFFFFF) /* as defined by earlier versions */ 3121 3122 3123diff -ru misc/SampleICC-1.3.2/Tools/CmdLine/Makefile.in misc/build/SampleICC-1.3.2/Tools/CmdLine/Makefile.in 3124--- misc/SampleICC-1.3.2/Tools/CmdLine/Makefile.in 2007-08-20 15:10:42.000000000 -0500 3125+++ misc/build/SampleICC-1.3.2/Tools/CmdLine/Makefile.in 2012-01-24 10:39:23.000000000 -0500 3126@@ -101,17 +101,13 @@ 3127 am__quote = @am__quote@ 3128 install_sh = @install_sh@ 3129 3130-SUBDIRS = IccApplyNamedCmm \ 3131- @SICC_ICC_APPLY_PROFILES@ \ 3132- IccDumpProfile \ 3133+SUBDIRS = IccDumpProfile \ 3134 IccProfLibTest \ 3135 IccStripUnknownTags \ 3136 IccV4ToMPE 3137 3138 3139-DIST_SUBDIRS = IccApplyNamedCmm \ 3140- IccApplyProfiles \ 3141- IccDumpProfile \ 3142+DIST_SUBDIRS = IccDumpProfile \ 3143 IccProfLibTest \ 3144 IccStripUnknownTags \ 3145 IccV4ToMPE 3146diff -ru misc/SampleICC-1.3.2/configure misc/build/SampleICC-1.3.2/configure 3147--- misc/SampleICC-1.3.2/configure 2007-08-20 15:10:59.000000000 -0500 3148+++ misc/build/SampleICC-1.3.2/configure 2012-01-24 10:39:23.000000000 -0500 3149@@ -19991,7 +19991,7 @@ 3150 3151 3152 3153- ac_config_files="$ac_config_files Makefile IccProfLib/Makefile Tools/Makefile Tools/CmdLine/Makefile Tools/CmdLine/IccApplyNamedCmm/Makefile Tools/CmdLine/IccApplyProfiles/Makefile Tools/CmdLine/IccDumpProfile/Makefile Tools/CmdLine/IccProfLibTest/Makefile Tools/CmdLine/IccStripUnknownTags/Makefile Tools/CmdLine/IccV4ToMPE/Makefile Contrib/Makefile Contrib/CmdLine/Makefile Contrib/CmdLine/create_CLUT_profile/Makefile Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile Contrib/CmdLine/create_display_profile/Makefile Contrib/ICC_utils/Makefile Contrib/Mac_OS_X/Makefile Contrib/Mac_OS_X/create_probe/Makefile Contrib/Mac_OS_X/extract_probe_data/Makefile Contrib/examples/Makefile Contrib/examples/RSR/Makefile Contrib/tests/Makefile Contrib/tests/flatten_AToB_tag/Makefile Contrib/tests/generate_device_codes/Makefile Contrib/tests/reconstruct_measurements/Makefile Contrib/tests/round_trip_PCS_LAB/Makefile" 3154+ ac_config_files="$ac_config_files Makefile IccProfLib/Makefile Tools/Makefile Tools/CmdLine/Makefile Tools/CmdLine/IccDumpProfile/Makefile Tools/CmdLine/IccProfLibTest/Makefile Tools/CmdLine/IccStripUnknownTags/Makefile Tools/CmdLine/IccV4ToMPE/Makefile Contrib/Makefile Contrib/CmdLine/Makefile Contrib/ICC_utils/Makefile Contrib/CmdLine/create_sRGB_profile/Makefile" 3155 cat >confcache <<\_ACEOF 3156 # This file is a shell script that caches the results of configure 3157 # tests run on this system so they can be shared between configure 3158@@ -20571,28 +20571,14 @@ 3159 "IccProfLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES IccProfLib/Makefile" ;; 3160 "Tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/Makefile" ;; 3161 "Tools/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/Makefile" ;; 3162- "Tools/CmdLine/IccApplyNamedCmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccApplyNamedCmm/Makefile" ;; 3163- "Tools/CmdLine/IccApplyProfiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccApplyProfiles/Makefile" ;; 3164 "Tools/CmdLine/IccDumpProfile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccDumpProfile/Makefile" ;; 3165 "Tools/CmdLine/IccProfLibTest/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccProfLibTest/Makefile" ;; 3166 "Tools/CmdLine/IccStripUnknownTags/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccStripUnknownTags/Makefile" ;; 3167 "Tools/CmdLine/IccV4ToMPE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccV4ToMPE/Makefile" ;; 3168 "Contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Makefile" ;; 3169 "Contrib/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/Makefile" ;; 3170- "Contrib/CmdLine/create_CLUT_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_CLUT_profile/Makefile" ;; 3171- "Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile" ;; 3172- "Contrib/CmdLine/create_display_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_display_profile/Makefile" ;; 3173+ "Contrib/CmdLine/create_sRGB_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_sRGB_profile/Makefile" ;; 3174 "Contrib/ICC_utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/ICC_utils/Makefile" ;; 3175- "Contrib/Mac_OS_X/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/Makefile" ;; 3176- "Contrib/Mac_OS_X/create_probe/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/create_probe/Makefile" ;; 3177- "Contrib/Mac_OS_X/extract_probe_data/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/extract_probe_data/Makefile" ;; 3178- "Contrib/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/examples/Makefile" ;; 3179- "Contrib/examples/RSR/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/examples/RSR/Makefile" ;; 3180- "Contrib/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/Makefile" ;; 3181- "Contrib/tests/flatten_AToB_tag/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/flatten_AToB_tag/Makefile" ;; 3182- "Contrib/tests/generate_device_codes/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/generate_device_codes/Makefile" ;; 3183- "Contrib/tests/reconstruct_measurements/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/reconstruct_measurements/Makefile" ;; 3184- "Contrib/tests/round_trip_PCS_LAB/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/round_trip_PCS_LAB/Makefile" ;; 3185 "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; 3186 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 3187 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 3188