[Libreoffice-commits] .: config_host.mk.in configure.in icc/makefile.mk icc/prj icc/README icc/SampleICC-1.3.2-fmtargs.patch icc/SampleICC-1.3.2.patch icc/SampleICC-makefiles.patch icc/source Makefile.top ooo.lst.in tail_build/prj vcl/Library_vcl.mk vcl/prj vcl/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Mon Jun 4 02:45:03 PDT 2012
Makefile.top | 1
config_host.mk.in | 3
configure.in | 25
icc/README | 35
icc/SampleICC-1.3.2-fmtargs.patch | 20
icc/SampleICC-1.3.2.patch | 4543 -----------------
icc/SampleICC-makefiles.patch | 175
icc/makefile.mk | 66
icc/prj/build.lst | 4
icc/prj/d.lst | 3
icc/source/create_sRGB_profile/create_sRGB_profile.cpp | 558 --
icc/source/create_sRGB_profile/makefile.mk | 89
ooo.lst.in | 1
tail_build/prj/build.lst | 2
vcl/Library_vcl.mk | 1
vcl/prj/build.lst | 2
vcl/source/gdi/pdfwriter_impl.cxx | 12
17 files changed, 13 insertions(+), 5527 deletions(-)
New commits:
commit 086abe9eddd55573d8c04728649b574338176410
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sun Jun 3 15:33:36 2012 +0200
Replace the module icc functionality by a use of lcms2
Change-Id: I989af1147711f0175bf889bc55043b2d84a49b38
diff --git a/Makefile.top b/Makefile.top
index 448f281..7362bbc 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -188,7 +188,6 @@ helpcontent2 \
hsqldb\
hunspell\
hyphen\
-icc\
icu\
instsetoo_native\
jfreereport\
diff --git a/config_host.mk.in b/config_host.mk.in
index 11b3a16..ef798eb 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -428,8 +428,6 @@ export RTL_OS=@RTL_OS@
export RTL_ARCH=@RTL_ARCH@
export SAC_JAR=@SAC_JAR@
export SAL_ENABLE_FILE_LOCKING=1
-export SAMPLEICC_CFLAGS=@SAMPLEICC_CFLAGS@
-export SAMPLEICC_LIBS=@SAMPLEICC_LIBS@
export SAXON_JAR=@SAXON_JAR@
export SCPDEFS=@SCPDEFS@
export SERVLETAPI_JAR=@SERVLETAPI_JAR@
@@ -525,7 +523,6 @@ export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
export SYSTEM_PYTHON=@SYSTEM_PYTHON@
export SYSTEM_REDLAND=@SYSTEM_REDLAND@
export SYSTEM_RHINO=@SYSTEM_RHINO@
-export SYSTEM_SAMPLEICC=@SYSTEM_SAMPLEICC@
export SYSTEM_SAXON=@SYSTEM_SAXON@
export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@
export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@
diff --git a/configure.in b/configure.in
index ba797fd..27b3e1b 100644
--- a/configure.in
+++ b/configure.in
@@ -1133,11 +1133,6 @@ AC_ARG_WITH(system-nss,
[Use NSS/nspr libraries already on system.]),,
[with_system_nss="$with_system_libs"])
-AC_ARG_WITH(system-sampleicc,
- AS_HELP_STRING([--with-system-sampleicc],
- [Use SampleICC libraries already on system (used only during build).]),,
- [with_system_sampleicc="$with_system_libs"])
-
AC_ARG_WITH(mozilla-version,
AS_HELP_STRING([--with-mozilla-version],
[Choose which version of Mozilla to use while building Mozilla.
@@ -7946,26 +7941,6 @@ AC_SUBST(GRAPHITE_CFLAGS)
AC_SUBST([MINGW_GRAPHITE2_DLL])
dnl ===================================================================
-dnl SampleICC
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use system SampleICC])
-if test "$with_system_sampleicc" = "yes"; then
- AC_MSG_RESULT([yes])
- SYSTEM_SAMPLEICC=YES
- PKG_CHECK_MODULES(SAMPLEICC, sampleicc)
-else
- AC_MSG_RESULT([no])
- SYSTEM_SAMPLEICC=NO
-fi
-AC_SUBST(SYSTEM_SAMPLEICC)
-AC_SUBST(SAMPLEICC_LIBS)
-AC_SUBST(SAMPLEICC_CFLAGS)
-
-if test $_os = Darwin -o $_os = iOS -o $_os = Android; then
- enable_gtk=no
-fi
-
-dnl ===================================================================
dnl Check for nsplugin
dnl ===================================================================
AC_MSG_CHECKING([whether to build nsplugin extension])
diff --git a/icc/README b/icc/README
deleted file mode 100644
index 61066f2..0000000
--- a/icc/README
+++ /dev/null
@@ -1,35 +0,0 @@
-Library used to build the sRGB profile for PDF/A-1a export with patches.
-
-This project is used to generate the ICC color
-profile needed in module vcl in order to export
-to PDF/A-1a.
-
-It's composed of a small application, which lurks in:
-[git:icc/source/create_sRGB_profile]
-
-That application links to a support library
-(icc/download/SampleICC-1.3.2), build at OOo
-build time.
-
-Finally, the application is run at OOo build time to
-generate the only file delivered to solver:
-sRGB-IEC61966-2.1.hxx.
-
-If you need to change the data into the ICC profile,
-please change the create_sRGB_profile.
-
-The library was downloaded from [http://sampleicc.sourceforge.net] on 2007-08-23.
-
-For information on ICC profiles, you may want to visit:
-[http://www.color.org]
-
-== Notes for porters ==
-
-The endianess and other platform specific configuration
-are in:
-
-icc/<build>/misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h
-
-The patchs:
-SampleICC-1.3.2.patch tweaks the build to use the endianness
-detected in sal.
diff --git a/icc/SampleICC-1.3.2-fmtargs.patch b/icc/SampleICC-1.3.2-fmtargs.patch
deleted file mode 100644
index a7549a8..0000000
--- a/icc/SampleICC-1.3.2-fmtargs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp 2009-01-20 11:48:36.000000000 -0500
-+++ misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp 2009-01-19 14:41:23.000000000 -0500
-@@ -1155,7 +1155,7 @@
-
- CIccInfo Info;
- icChar buf[128];
-- sprintf(buf, Info.GetSigName(m_Header.deviceClass));
-+ sprintf(buf, "%s", Info.GetSigName(m_Header.deviceClass));
- if (m_Header.deviceClass!=icSigInputClass && m_Header.deviceClass!=icSigDisplayClass) {
- if (GetTag(icSigGrayTRCTag) || GetTag(icSigRedTRCTag) || GetTag(icSigGreenTRCTag) ||
- GetTag(icSigBlueTRCTag) || GetTag(icSigRedColorantTag) || GetTag(icSigGreenColorantTag) ||
-@@ -1230,7 +1230,7 @@
- for (i=m_Tags->begin(); i!=m_Tags->end(); i++) {
- tagsig = i->TagInfo.sig;
- typesig = i->pTag->GetType();
-- sprintf(buf, Info.GetSigName(tagsig));
-+ sprintf(buf, "%s", Info.GetSigName(tagsig));
- if (!IsTypeValid(tagsig, typesig)) {
- sReport += icValidateNonCompliantMsg;
- sReport += buf;
diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch
deleted file mode 100644
index 274b711..0000000
--- a/icc/SampleICC-1.3.2.patch
+++ /dev/null
@@ -1,4543 +0,0 @@
-*** misc/SampleICC-1.3.2/configure Mon Aug 20 22:10:59 2007
---- misc/build/SampleICC-1.3.2/configure Fri Jan 25 14:23:09 2008
-***************
-*** 19991,19997 ****
-
-
-
-! 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/t
ests/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"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
---- 19991,19997 ----
-
-
-
-! 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"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-***************
-*** 20571,20578 ****
- "IccProfLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES IccProfLib/Makefile" ;;
- "Tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/Makefile" ;;
- "Tools/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/Makefile" ;;
-- "Tools/CmdLine/IccApplyNamedCmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccApplyNamedCmm/Makefile" ;;
-- "Tools/CmdLine/IccApplyProfiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccApplyProfiles/Makefile" ;;
- "Tools/CmdLine/IccDumpProfile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccDumpProfile/Makefile" ;;
- "Tools/CmdLine/IccProfLibTest/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccProfLibTest/Makefile" ;;
- "Tools/CmdLine/IccStripUnknownTags/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccStripUnknownTags/Makefile" ;;
---- 20571,20576 ----
-***************
-*** 20579,20598 ****
- "Tools/CmdLine/IccV4ToMPE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccV4ToMPE/Makefile" ;;
- "Contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Makefile" ;;
- "Contrib/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/Makefile" ;;
-! "Contrib/CmdLine/create_CLUT_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_CLUT_profile/Makefile" ;;
-! "Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile" ;;
-! "Contrib/CmdLine/create_display_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_display_profile/Makefile" ;;
- "Contrib/ICC_utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/ICC_utils/Makefile" ;;
-- "Contrib/Mac_OS_X/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/Makefile" ;;
-- "Contrib/Mac_OS_X/create_probe/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/create_probe/Makefile" ;;
-- "Contrib/Mac_OS_X/extract_probe_data/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/extract_probe_data/Makefile" ;;
-- "Contrib/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/examples/Makefile" ;;
-- "Contrib/examples/RSR/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/examples/RSR/Makefile" ;;
-- "Contrib/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/Makefile" ;;
-- "Contrib/tests/flatten_AToB_tag/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/flatten_AToB_tag/Makefile" ;;
-- "Contrib/tests/generate_device_codes/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/generate_device_codes/Makefile" ;;
-- "Contrib/tests/reconstruct_measurements/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/reconstruct_measurements/Makefile" ;;
-- "Contrib/tests/round_trip_PCS_LAB/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/round_trip_PCS_LAB/Makefile" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
---- 20577,20584 ----
- "Tools/CmdLine/IccV4ToMPE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccV4ToMPE/Makefile" ;;
- "Contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Makefile" ;;
- "Contrib/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/Makefile" ;;
-! "Contrib/CmdLine/create_sRGB_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_sRGB_profile/Makefile" ;;
- "Contrib/ICC_utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/ICC_utils/Makefile" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-*** misc/SampleICC-1.3.2/Contrib/Makefile.in Mon Aug 20 22:10:37 2007
---- misc/build/SampleICC-1.3.2/Contrib/Makefile.in Fri Jan 25 14:23:09 2008
-***************
-*** 103,120 ****
-
- SUBDIRS = \
- ICC_utils \
-! CmdLine \
-! examples \
-! Mac_OS_X \
-! tests
-
-
- DIST_SUBDIRS = \
- ICC_utils \
-! CmdLine \
-! examples \
-! Mac_OS_X \
-! tests
-
- subdir = Contrib
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- 103,114 ----
-
- SUBDIRS = \
- ICC_utils \
-! CmdLine
-
-
- DIST_SUBDIRS = \
- ICC_utils \
-! CmdLine
-
- subdir = Contrib
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-*** misc/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in Mon Aug 20 22:10:34 2007
---- misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in Fri Jan 25 14:23:09 2008
-***************
-*** 102,116 ****
- install_sh = @install_sh@
-
- SUBDIRS = \
-! create_CLUT_profile \
-! create_CLUT_profile_from_probe \
-! create_display_profile
-
-
- DIST_SUBDIRS = \
-! create_CLUT_profile \
-! create_CLUT_profile_from_probe \
-! create_display_profile
-
- subdir = Contrib/CmdLine
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- 102,112 ----
- install_sh = @install_sh@
-
- SUBDIRS = \
-! create_sRGB_profile
-
-
- DIST_SUBDIRS = \
-! create_sRGB_profile
-
- subdir = Contrib/CmdLine
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in Mon Aug 20 22:10:35 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in Fri Jan 25 14:23:09 2008
-***************
-*** 133,139 ****
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
-
-! libICC_utils_la_LIBADD =
- am_libICC_utils_la_OBJECTS = Stubs.lo CAT.lo CLUT.lo CLUT_stuffer.lo \
- ICC_tool_exception.lo Vetters.lo
- libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)
---- 133,139 ----
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
-
-! libICC_utils_la_LIBADD = $(LDADD)
- am_libICC_utils_la_OBJECTS = Stubs.lo CAT.lo CLUT.lo CLUT_stuffer.lo \
- ICC_tool_exception.lo Vetters.lo
- libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h Mon Aug 20 22:04:53 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h Fri Jan 25 14:23:09 2008
-***************
-*** 130,136 ****
-
- // use one of these to force desired sort order in assoc. containers of DPX
- bool
-! DPX::operator<(const DPX& p) const
- {
- return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));
- }
---- 130,136 ----
-
- // use one of these to force desired sort order in assoc. containers of DPX
- bool
-! operator<(const DPX& p) const
- {
- return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));
- }
---- misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp 2007-08-20 21:04:54.000000000 +0100
-+++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp 2012-03-05 14:24:29.981346923 +0000
-@@ -83,9 +83,14 @@
- using namespace std;
-
- #ifndef WIN32
--#include <sys/errno.h>
-+#include <errno.h>
-+#include <string.h>
- #else
- #include <string.h>
-+#define stat _stat
-+#endif
-+
-+#if defined WIN32 || defined sun
- int strerror_r(int errnum, char *str, int strsize)
- {
- const char *errstr = strerror(errnum);
-@@ -97,7 +102,6 @@ int strerror_r(int errnum, char *str, in
-
- return -1;
- }
--#define stat _stat
- #endif
-
- #include "ICC_tool_exception.h"
-*** misc/SampleICC-1.3.2/IccProfLib/IccIO.cpp Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp Fri Jan 25 14:23:09 2008
-***************
-*** 78,84 ****
- #include "IccIO.h"
- #include "IccUtil.h"
- #include <stdlib.h>
-! #include <memory.h>
- #include <string.h>
-
- #ifndef __max
---- 78,84 ----
- #include "IccIO.h"
- #include "IccUtil.h"
- #include <stdlib.h>
-! #include <memory>
- #include <string.h>
-
- #ifndef __max
-*** misc/SampleICC-1.3.2/IccProfLib/IccIO.h Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.h Fri Jan 25 14:23:09 2008
-***************
-*** 79,84 ****
---- 79,85 ----
- #define _ICCIO_H
-
- #include "IccDefs.h"
-+ #include "memory"
- #include "stdio.h"
-
- #ifdef USESAMPLEICCNAMESPACE
-*** misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp Fri Jan 25 14:23:09 2008
-***************
-*** 136,152 ****
- icChar sigBuf[30];
-
- if (GetBAcsSig())
-! sDescription += "ELEM_bACS\r\n";
- else
-! sDescription += "ELEM_eACS\r\n";
-
- icGetSig(sigBuf, m_signature);
- sDescription += " Signature = ";
- sDescription += sigBuf;
-! sDescription += "\r\n";
-
- if (m_pData) {
-! sDescription += "\r\nData Follows:\r\n";
-
- icMemDump(sDescription, m_pData, m_nDataSize);
- }
---- 136,152 ----
- icChar sigBuf[30];
-
- if (GetBAcsSig())
-! sDescription += "ELEM_bACS\n";
- else
-! sDescription += "ELEM_eACS\n";
-
- icGetSig(sigBuf, m_signature);
- sDescription += " Signature = ";
- sDescription += sigBuf;
-! sDescription += "\n";
-
- if (m_pData) {
-! sDescription += "\nData Follows:\n";
-
- icMemDump(sDescription, m_pData, m_nDataSize);
- }
-*** misc/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp Fri Jan 25 14:23:09 2008
-***************
-*** 218,249 ****
- sprintf(buf, "%.8f", m_endPoint);
- sDescription += buf;
- }
-! sprintf(buf, "]\r\nFunctionType: %04Xh\r\n", m_nFunctionType);
- sDescription += buf;
-
- switch(m_nFunctionType) {
- case 0x0000:
- if (m_params[1]==0.0 && m_params[2]==0.0)
-! sprintf(buf, "Y = %.8f\r\n\r\n", m_params[3]);
- else if (m_params[0]==1.0 && m_params[1]==1.0 && m_params[2]==0.0 && m_params[3]==0.0)
-! sprintf(buf, "Y = X\r\n\r\n");
- else if (m_params[0]==1.0 && m_params[2]==0.0)
-! sprintf(buf, "Y = %.8f * X + %.8f\r\n\r\n",
- m_params[1], m_params[3]);
- else
-! sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\r\n\r\n",
- m_params[1], m_params[2], m_params[0], m_params[3]);
- sDescription += buf;
- return;
-
- case 0x0001:
-! sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f) + %.8f) + %.8f\r\n\r\n",
- m_params[1], m_params[2], m_params[0], m_params[3], m_params[4]);
- sDescription += buf;
- return;
-
- case 0x0002:
-! sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\r\n\r\n",
- m_params[0], m_params[1], m_params[2], m_params[3], m_params[4]);
- sDescription += buf;
- return;
---- 218,249 ----
- sprintf(buf, "%.8f", m_endPoint);
- sDescription += buf;
- }
-! sprintf(buf, "]\nFunctionType: %04Xh\n", m_nFunctionType);
- sDescription += buf;
-
- switch(m_nFunctionType) {
- case 0x0000:
- if (m_params[1]==0.0 && m_params[2]==0.0)
-! sprintf(buf, "Y = %.8f\n\n", m_params[3]);
- else if (m_params[0]==1.0 && m_params[1]==1.0 && m_params[2]==0.0 && m_params[3]==0.0)
-! sprintf(buf, "Y = X\n\n");
- else if (m_params[0]==1.0 && m_params[2]==0.0)
-! sprintf(buf, "Y = %.8f * X + %.8f\n\n",
- m_params[1], m_params[3]);
- else
-! sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\n\n",
- m_params[1], m_params[2], m_params[0], m_params[3]);
- sDescription += buf;
- return;
-
- case 0x0001:
-! sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f) + %.8f) + %.8f\n\n",
- m_params[1], m_params[2], m_params[0], m_params[3], m_params[4]);
- sDescription += buf;
- return;
-
- case 0x0002:
-! sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\n\n",
- m_params[0], m_params[1], m_params[2], m_params[3], m_params[4]);
- sDescription += buf;
- return;
-***************
-*** 250,260 ****
-
- default:
- int i;
-! sprintf(buf, "Unknown Function with %d parameters:\r\n\r\n", m_nParameters);
- sDescription += buf;
-
- for (i=0; i<m_nParameters; i++) {
-! sprintf(buf, "Param[%d] = %.8lf\r\n\r\n", i, m_params[i]);
- sDescription += buf;
- }
- }
---- 250,260 ----
-
- default:
- int i;
-! sprintf(buf, "Unknown Function with %d parameters:\n\n", m_nParameters);
- sDescription += buf;
-
- for (i=0; i<m_nParameters; i++) {
-! sprintf(buf, "Param[%d] = %.8lf\n\n", i, m_params[i]);
- sDescription += buf;
- }
- }
-***************
-*** 496,502 ****
- if (m_nReserved || m_nReserved2) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " formula curve has non zero reserved data.\r\n";
- rv = icValidateWarning;
- }
-
---- 496,502 ----
- if (m_nReserved || m_nReserved2) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " formula curve has non zero reserved data.\n";
- rv = icValidateWarning;
- }
-
-***************
-*** 505,517 ****
- if (!m_params || m_nParameters<4) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
- rv = icValidateCriticalError;
- }
- else if (m_nParameters > 4) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
- rv = icValidateWarning;
- }
- break;
---- 505,517 ----
- if (!m_params || m_nParameters<4) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
- rv = icValidateCriticalError;
- }
- else if (m_nParameters > 4) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " formula curve has too many formulaCurveSegment parameters.\n";
- rv = icValidateWarning;
- }
- break;
-***************
-*** 520,532 ****
- if (!m_params || m_nParameters<5) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
- rv = icValidateCriticalError;
- }
- else if (m_nParameters > 5) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
- rv = icValidateWarning;
- }
- break;
---- 520,532 ----
- if (!m_params || m_nParameters<5) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
- rv = icValidateCriticalError;
- }
- else if (m_nParameters > 5) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " formula curve has too many formulaCurveSegment parameters.\n";
- rv = icValidateWarning;
- }
- break;
-***************
-*** 535,547 ****
- if (!m_params || m_nParameters<5) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
- rv = icValidateCriticalError;
- }
- else if (m_nParameters > 5) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
- rv = icValidateWarning;
- }
- break;
---- 535,547 ----
- if (!m_params || m_nParameters<5) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
- rv = icValidateCriticalError;
- }
- else if (m_nParameters > 5) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " formula curve has too many formulaCurveSegment parameters.\n";
- rv = icValidateWarning;
- }
- break;
-***************
-*** 551,557 ****
- icChar buf[128];
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\r\n", m_nFunctionType);
- sReport += buf;
- rv = icValidateCriticalError;
- }
---- 551,557 ----
- icChar buf[128];
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\n", m_nFunctionType);
- sReport += buf;
- rv = icValidateCriticalError;
- }
-***************
-*** 727,733 ****
- sDescription += buf;
- }
-
-! sprintf(buf, "]\r\n");
- sDescription += buf;
- }
- else {
---- 727,733 ----
- sDescription += buf;
- }
-
-! sprintf(buf, "]\n");
- sDescription += buf;
- }
- else {
-***************
-*** 744,752 ****
- sprintf(buf, "%.8f", m_endPoint);
- sDescription += buf;
- }
-! sprintf(buf, "]\r\n");
- sDescription += buf;
-! sDescription += "IN OUT\r\n";
-
- icUInt32Number i;
-
---- 744,752 ----
- sprintf(buf, "%.8f", m_endPoint);
- sDescription += buf;
- }
-! sprintf(buf, "]\n");
- sDescription += buf;
-! sDescription += "IN OUT\n";
-
- icUInt32Number i;
-
-***************
-*** 754,764 ****
- icFloatNumber last = (icFloatNumber)(m_nCount-1);
-
- for (i=0; i<m_nCount; i++) {
-! sprintf(buf, "%.8f %.8f\r\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]);
- sDescription += buf;
- }
- }
-! sDescription += "\r\n";
- }
-
- /**
---- 754,764 ----
- icFloatNumber last = (icFloatNumber)(m_nCount-1);
-
- for (i=0; i<m_nCount; i++) {
-! sprintf(buf, "%.8f %.8f\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]);
- sDescription += buf;
- }
- }
-! sDescription += "\n";
- }
-
- /**
-***************
-*** 910,916 ****
- if (m_nReserved) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " sampled curve has non zero reserved data.\r\n";
- rv = icValidateWarning;
- }
-
---- 910,916 ----
- if (m_nReserved) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " sampled curve has non zero reserved data.\n";
- rv = icValidateWarning;
- }
-
-***************
-*** 917,929 ****
- if (m_nCount<2) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " sampled curve has too few sample points.\r\n";
- rv = icValidateCriticalError;
- }
- else if (m_endPoint-m_startPoint == 0.0) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " sampled curve has a range of zero.\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
-
---- 917,929 ----
- if (m_nCount<2) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " sampled curve has too few sample points.\n";
- rv = icValidateCriticalError;
- }
- else if (m_endPoint-m_startPoint == 0.0) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " sampled curve has a range of zero.\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
-
-***************
-*** 1054,1060 ****
- {
- CIccCurveSegmentList::iterator i;
-
-! sDescription += "BEGIN_CURVE\r\n";
- for (i=m_list->begin(); i!=m_list->end(); i++) {
- (*i)->Describe(sDescription);
- }
---- 1054,1060 ----
- {
- CIccCurveSegmentList::iterator i;
-
-! sDescription += "BEGIN_CURVE\n";
- for (i=m_list->begin(); i!=m_list->end(); i++) {
- (*i)->Describe(sDescription);
- }
-***************
-*** 1342,1348 ****
- if (m_nReserved1 || m_nReserved2) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " Segmented curve has non zero reserved data.\r\n";
- rv = icValidateWarning;
- }
-
---- 1342,1348 ----
- if (m_nReserved1 || m_nReserved2) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " Segmented curve has non zero reserved data.\n";
- rv = icValidateWarning;
- }
-
-***************
-*** 1349,1355 ****
- if (m_list->size()==0) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " Has Empty CurveSegment!\r\n";
- return icValidateCriticalError;
- }
-
---- 1349,1355 ----
- if (m_list->size()==0) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " Has Empty CurveSegment!\n";
- return icValidateCriticalError;
- }
-
-***************
-*** 1599,1609 ****
- icChar buf[81];
- int i;
-
-! sprintf(buf, "BEGIN_CURVE_SET %d\r\n", m_nInputChannels);
- sDescription += buf;
-
- for (i=0; i<m_nInputChannels; i++) {
-! sprintf(buf, "Curve %d of %d\r\n", i+1, m_nInputChannels);
- sDescription += buf;
- if (m_curve[i]) {
- m_curve[i]->Describe(sDescription);
---- 1599,1609 ----
- icChar buf[81];
- int i;
-
-! sprintf(buf, "BEGIN_CURVE_SET %d\n", m_nInputChannels);
- sDescription += buf;
-
- for (i=0; i<m_nInputChannels; i++) {
-! sprintf(buf, "Curve %d of %d\n", i+1, m_nInputChannels);
- sDescription += buf;
- if (m_curve[i]) {
- m_curve[i]->Describe(sDescription);
-***************
-*** 1877,1883 ****
- sReport += " - Element ";
- sSigName = Info.GetSigName(GetType());
- sReport += sSigName;
-! sReport += " Has Empty Curve Element(s)!\r\n";
- return icValidateCriticalError;
- }
-
---- 1877,1883 ----
- sReport += " - Element ";
- sSigName = Info.GetSigName(GetType());
- sReport += sSigName;
-! sReport += " Has Empty Curve Element(s)!\n";
- return icValidateCriticalError;
- }
-
-***************
-*** 2042,2048 ****
- int i, j;
- icFloatNumber *data = m_pMatrix;
-
-! sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\r\n", m_nInputChannels, m_nOutputChannels);
- sDescription += buf;
-
- for (j=0; j<m_nOutputChannels; j++) {
---- 2042,2048 ----
- int i, j;
- icFloatNumber *data = m_pMatrix;
-
-! sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\n", m_nInputChannels, m_nOutputChannels);
- sDescription += buf;
-
- for (j=0; j<m_nOutputChannels; j++) {
-***************
-*** 2052,2058 ****
- sprintf(buf, "%12.8lf", data[i]);
- sDescription += buf;
- }
-! sprintf(buf, " + %12.8lf\r\n", m_pConstants[j]);
- sDescription += buf;
- data += i;
- }
---- 2052,2058 ----
- sprintf(buf, "%12.8lf", data[i]);
- sDescription += buf;
- }
-! sprintf(buf, " + %12.8lf\n", m_pConstants[j]);
- sDescription += buf;
- data += i;
- }
-***************
-*** 2273,2279 ****
- sReport += " - Element ";
- sSigName = Info.GetSigName(GetType());
- sReport += sSigName;
-! sReport += " Has Empty Matrix data!\r\n";
- return icValidateCriticalError;
- }
-
---- 2273,2279 ----
- sReport += " - Element ";
- sSigName = Info.GetSigName(GetType());
- sReport += sSigName;
-! sReport += " Has Empty Matrix data!\n";
- return icValidateCriticalError;
- }
-
-***************
-*** 2620,2626 ****
- sReport += " - Element ";
- sSigName = Info.GetSigName(GetType());
- sReport += sSigName;
-! sReport += " Has No CLUT!\r\n";
- return icValidateCriticalError;
- }
-
---- 2620,2626 ----
- sReport += " - Element ";
- sSigName = Info.GetSigName(GetType());
- sReport += sSigName;
-! sReport += " Has No CLUT!\n";
- return icValidateCriticalError;
- }
-
-*** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h Fri Jan 25 14:23:09 2008
-***************
-*** 87,93 ****
- #endif
-
- //PC, visual C++
-! #if defined(_MSC_VER) && !defined(__MWERKS__) && defined(_M_IX86)
-
- //Define how 64 bit integers are represented
- #define ICCUINT64 unsigned __int64
---- 87,93 ----
- #endif
-
- //PC, visual C++
-! #if defined(_MSC_VER) && !defined(__MWERKS__)
-
- //Define how 64 bit integers are represented
- #define ICCUINT64 unsigned __int64
-***************
-*** 107,126 ****
-
- #else // non-PC, perhaps Mac or Linux
-
-! #define ICCUINT64 unsigned long long
-! #define ICCINT64 long long
-! #define ICUINT64TYPE unsigned long long
-! #define ICINT64TYPE long long
-!
-! #if defined(__APPLE__)
-! #if defined(__LITTLE_ENDIAN__)
-! #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-! #else
-! #define ICC_BYTE_ORDER_BIG_ENDIAN
-! #endif
-! #else
-! #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-! #endif
-
- #define ICCPROFLIB_API
- #define ICCPROFLIB_EXTERN
---- 107,129 ----
-
- #else // non-PC, perhaps Mac or Linux
-
-! #include <sal/types.h>
-! #include <osl/endian.h>
-!
-! #define ICCUINT64 sal_uInt64
-! #define ICCINT64 sal_Int64
-! #define ICUINT64TYPE sal_uInt64
-! #define ICINT64TYPE sal_Int64
-! #define ICINT32TYPE sal_Int32
-! #define ICUINT32TYPE sal_uInt32
-!
-! #if defined(_LITTLE_ENDIAN)
-! # define ICC_BYTE_ORDER_LITTLE_ENDIAN
-! #elif defined(_BIG_ENDIAN)
-! # define ICC_BYTE_ORDER_BIG_ENDIAN
-! #else
-! # error "ENDIAN unknown"
-! #endif
-
- #define ICCPROFLIB_API
- #define ICCPROFLIB_EXTERN
-*** misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp Fri Jan 25 14:23:09 2008
-***************
-*** 567,573 ****
-
- if (!ReadBasic(pIO)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += " - Unable to read profile!**\r\n\tProfile has invalid structure!\r\n";
- Cleanup();
-
- return icValidateCriticalError;
---- 567,573 ----
-
- if (!ReadBasic(pIO)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += " - Unable to read profile!**\n\tProfile has invalid structure!\n";
- Cleanup();
-
- return icValidateCriticalError;
-***************
-*** 576,582 ****
- // Check profile header
- if (!CheckFileSize(pIO)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Bad Header File Size\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 576,582 ----
- // Check profile header
- if (!CheckFileSize(pIO)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Bad Header File Size\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 588,594 ****
- CalcProfileID(pIO, &profileID);
- if (strncmp((char*)profileID.ID8, (char*)m_Header.profileID.ID8, 16) != 0) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Bad Profile ID\r\n";
-
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
---- 588,594 ----
- CalcProfileID(pIO, &profileID);
- if (strncmp((char*)profileID.ID8, (char*)m_Header.profileID.ID8, 16) != 0) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Bad Profile ID\n";
-
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-***************
-*** 601,607 ****
- sReport += icValidateCriticalErrorMsg;
- sReport += " - ";
- sReport += Info.GetTagSigName(i->TagInfo.sig);
-! sReport += " - Tag has invalid structure!\r\n";
-
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
---- 601,607 ----
- sReport += icValidateCriticalErrorMsg;
- sReport += " - ";
- sReport += Info.GetTagSigName(i->TagInfo.sig);
-! sReport += " - Tag has invalid structure!\n";
-
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-***************
-*** 1026,1032 ****
-
- default:
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Unknown profile class!\r\n", Info.GetProfileClassSigName(m_Header.deviceClass));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
---- 1026,1032 ----
-
- default:
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Unknown profile class!\n", Info.GetProfileClassSigName(m_Header.deviceClass));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-***************
-*** 1033,1039 ****
-
- if (!Info.IsValidSpace(m_Header.colorSpace)) {
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Unknown color space!\r\n", Info.GetColorSpaceSigName(m_Header.colorSpace));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
---- 1033,1039 ----
-
- if (!Info.IsValidSpace(m_Header.colorSpace)) {
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Unknown color space!\n", Info.GetColorSpaceSigName(m_Header.colorSpace));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-***************
-*** 1041,1047 ****
- if (m_Header.deviceClass==icSigLinkClass) {
- if (!Info.IsValidSpace(m_Header.pcs)) {
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Unknown pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
---- 1041,1047 ----
- if (m_Header.deviceClass==icSigLinkClass) {
- if (!Info.IsValidSpace(m_Header.pcs)) {
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Unknown pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-***************
-*** 1049,1055 ****
- else {
- if (m_Header.pcs!=icSigXYZData && m_Header.pcs!=icSigLabData) {
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Invalid pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
---- 1049,1055 ----
- else {
- if (m_Header.pcs!=icSigXYZData && m_Header.pcs!=icSigLabData) {
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Invalid pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-***************
-*** 1068,1074 ****
-
- default:
- sReport += icValidateWarningMsg;
-! sprintf(buf, " - %s: Unknown platform signature.\r\n", Info.GetPlatformSigName(m_Header.platform));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateWarning);
- }
---- 1068,1074 ----
-
- default:
- sReport += icValidateWarningMsg;
-! sprintf(buf, " - %s: Unknown platform signature.\n", Info.GetPlatformSigName(m_Header.platform));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateWarning);
- }
-***************
-*** 1095,1101 ****
-
- default:
- sReport += icValidateWarningMsg;
-! sprintf(buf, " - %s: Unregisterd CMM signature.\r\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateWarning);
- }
---- 1095,1101 ----
-
- default:
- sReport += icValidateWarningMsg;
-! sprintf(buf, " - %s: Unregistered CMM signature.\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateWarning);
- }
-***************
-*** 1109,1115 ****
-
- default:
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Unknown rendering intent!\r\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
---- 1109,1115 ----
-
- default:
- sReport += icValidateCriticalErrorMsg;
-! sprintf(buf, " - %s: Unknown rendering intent!\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-***************
-*** 1120,1126 ****
- icFloatNumber Z = icFtoD(m_Header.illuminant.Z);
- if (X<0.9640 || X>0.9644 || Y!=1.0 || Z<0.8247 || Z>0.8251) {
- sReport += icValidateNonCompliantMsg;
-! sReport += " - Non D50 Illuminant XYZ values.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 1120,1126 ----
- icFloatNumber Z = icFtoD(m_Header.illuminant.Z);
- if (X<0.9640 || X>0.9644 || Y!=1.0 || Z<0.8247 || Z>0.8251) {
- sReport += icValidateNonCompliantMsg;
-! sReport += " - Non D50 Illuminant XYZ values.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 1130,1136 ****
- }
- if (sum) {
- sReport += icValidateNonCompliantMsg;
-! sReport += " - Reserved value must be zero.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 1130,1136 ----
- }
- if (sum) {
- sReport += icValidateNonCompliantMsg;
-! sReport += " - Reserved value must be zero.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 1163,1169 ****
- {
- sReport += icValidateWarningMsg;
- sReport += buf;
-! sReport += " - Tag exclusion test failed.\r\n";
- rv = false;
- }
- }
---- 1163,1169 ----
- {
- sReport += icValidateWarningMsg;
- sReport += buf;
-! sReport += " - Tag exclusion test failed.\n";
- rv = false;
- }
- }
-***************
-*** 1177,1183 ****
- {
- sReport += icValidateWarningMsg;
- sReport += buf;
-! sReport += " - Tag exclusion test failed.\r\n";
- rv = false;
- }
- break;
---- 1177,1183 ----
- {
- sReport += icValidateWarningMsg;
- sReport += buf;
-! sReport += " - Tag exclusion test failed.\n";
- rv = false;
- }
- break;
-***************
-*** 1192,1198 ****
- {
- sReport += icValidateWarningMsg;
- sReport += buf;
-! sReport += " - Tag exclusion test failed.\r\n";
- rv = false;
- }
- break;
---- 1192,1198 ----
- {
- sReport += icValidateWarningMsg;
- sReport += buf;
-! sReport += " - Tag exclusion test failed.\n";
- rv = false;
- }
- break;
-***************
-*** 1234,1240 ****
- if (!IsTypeValid(tagsig, typesig)) {
- sReport += icValidateNonCompliantMsg;
- sReport += buf;
-! sprintf(buf," - %s: Invalid tag type (Might be critical!).\r\n", Info.GetTagTypeSigName(typesig));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
---- 1234,1240 ----
- if (!IsTypeValid(tagsig, typesig)) {
- sReport += icValidateNonCompliantMsg;
- sReport += buf;
-! sprintf(buf," - %s: Invalid tag type (Might be critical!).\n", Info.GetTagTypeSigName(typesig));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-***************
-*** 1477,1483 ****
- {
- if (m_Tags->size() <= 0) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "No tags present.\r\n";
- return icValidateCriticalError;
- }
-
---- 1477,1483 ----
- {
- if (m_Tags->size() <= 0) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "No tags present.\n";
- return icValidateCriticalError;
- }
-
-***************
-*** 1486,1492 ****
- if (!GetTag(icSigProfileDescriptionTag) ||
- !GetTag(icSigCopyrightTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Required tags missing.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 1486,1492 ----
- if (!GetTag(icSigProfileDescriptionTag) ||
- !GetTag(icSigCopyrightTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Required tags missing.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 1495,1501 ****
- if (sig != icSigLinkClass) {
- if (!GetTag(icSigMediaWhitePointTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Media white point tag missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
---- 1495,1501 ----
- if (sig != icSigLinkClass) {
- if (!GetTag(icSigMediaWhitePointTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Media white point tag missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
-***************
-*** 1505,1511 ****
- if (m_Header.colorSpace == icSigGrayData) {
- if (!GetTag(icSigGrayTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Gray TRC tag missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
---- 1505,1511 ----
- if (m_Header.colorSpace == icSigGrayData) {
- if (!GetTag(icSigGrayTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Gray TRC tag missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
-***************
-*** 1515,1521 ****
- !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
- !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
---- 1515,1521 ----
- !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
- !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
-***************
-*** 1526,1532 ****
- if (m_Header.colorSpace == icSigGrayData) {
- if (!GetTag(icSigGrayTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Gray TRC tag missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
---- 1526,1532 ----
- if (m_Header.colorSpace == icSigGrayData) {
- if (!GetTag(icSigGrayTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Gray TRC tag missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
-***************
-*** 1536,1542 ****
- !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
- !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
---- 1536,1542 ----
- !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
- !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
-***************
-*** 1547,1553 ****
- if (m_Header.colorSpace == icSigGrayData) {
- if (!GetTag(icSigGrayTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Gray TRC tag missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
---- 1547,1553 ----
- if (m_Header.colorSpace == icSigGrayData) {
- if (!GetTag(icSigGrayTRCTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Gray TRC tag missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- }
-***************
-*** 1556,1568 ****
- !GetTag(icSigAToB1Tag) || !GetTag(icSigBToA1Tag) ||
- !GetTag(icSigAToB2Tag) || !GetTag(icSigBToA2Tag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-
- if (!GetTag(icSigGamutTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Gamut tag missing.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 1556,1568 ----
- !GetTag(icSigAToB1Tag) || !GetTag(icSigBToA1Tag) ||
- !GetTag(icSigAToB2Tag) || !GetTag(icSigBToA2Tag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-
- if (!GetTag(icSigGamutTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Gamut tag missing.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 1585,1591 ****
- case icSig16colorData:
- if (!GetTag(icSigColorantTableTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "xCLR output profile is missing colorantTableTag\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 1585,1591 ----
- case icSig16colorData:
- if (!GetTag(icSigColorantTableTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "xCLR output profile is missing colorantTableTag\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 1599,1605 ****
- case icSigLinkClass:
- if (!GetTag(icSigAToB0Tag) || !GetTag(icSigProfileSequenceDescTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-
---- 1599,1605 ----
- case icSigLinkClass:
- if (!GetTag(icSigAToB0Tag) || !GetTag(icSigProfileSequenceDescTag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-
-***************
-*** 1606,1612 ****
- if (icIsSpaceCLR(m_Header.colorSpace)) {
- if (!GetTag(icSigColorantTableTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Required tag(s) missing.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
---- 1606,1612 ----
- if (icIsSpaceCLR(m_Header.colorSpace)) {
- if (!GetTag(icSigColorantTableTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Required tag(s) missing.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
-***************
-*** 1614,1620 ****
- if (icIsSpaceCLR(m_Header.pcs)) {
- if (!GetTag(icSigColorantTableOutTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Required tag(s) missing.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
---- 1614,1620 ----
- if (icIsSpaceCLR(m_Header.pcs)) {
- if (!GetTag(icSigColorantTableOutTag)) {
- sReport += icValidateNonCompliantMsg;
-! sReport += "Required tag(s) missing.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
-***************
-*** 1623,1629 ****
- case icSigColorSpaceClass:
- if (!GetTag(icSigAToB0Tag) || !GetTag(icSigBToA0Tag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- break;
---- 1623,1629 ----
- case icSigColorSpaceClass:
- if (!GetTag(icSigAToB0Tag) || !GetTag(icSigBToA0Tag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- break;
-***************
-*** 1631,1637 ****
- case icSigAbstractClass:
- if (!GetTag(icSigAToB0Tag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- break;
---- 1631,1637 ----
- case icSigAbstractClass:
- if (!GetTag(icSigAToB0Tag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
- break;
-***************
-*** 1639,1645 ****
- case icSigNamedColorClass:
- if (!GetTag(icSigNamedColor2Tag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-
---- 1639,1645 ----
- case icSigNamedColorClass:
- if (!GetTag(icSigNamedColor2Tag)) {
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Critical tag(s) missing.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-
-***************
-*** 1647,1653 ****
-
- default:
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Unknown Profile Class.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- break;
- }
---- 1647,1653 ----
-
- default:
- sReport += icValidateCriticalErrorMsg;
-! sReport += "Unknown Profile Class.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- break;
- }
-***************
-*** 1724,1730 ****
- // Check for duplicate tags
- if (!AreTagsUnique()) {
- sReport += icValidateWarning;
-! sReport += " - There are duplicate tags.\r\n";
- rv =icMaxStatus(rv, icValidateWarning);
- }
-
---- 1724,1730 ----
- // Check for duplicate tags
- if (!AreTagsUnique()) {
- sReport += icValidateWarning;
-! sReport += " - There are duplicate tags.\n";
- rv =icMaxStatus(rv, icValidateWarning);
- }
-
-***************
-*** 1979,1985 ****
- sReport = icValidateCriticalErrorMsg;
- sReport += " - ";
- sReport += szFilename;
-! sReport += "- Invalid Filename\r\n";
- delete pFileIO;
- return NULL;
- }
---- 1979,1985 ----
- sReport = icValidateCriticalErrorMsg;
- sReport += " - ";
- sReport += szFilename;
-! sReport += "- Invalid Filename\n";
- delete pFileIO;
- return NULL;
- }
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp Fri Jan 25 14:23:09 2008
-***************
-*** 166,172 ****
- CIccInfo Info;
- sReport += icValidateNonCompliantMsg;
- sReport += Info.GetSigName(sig);
-! sReport += " - Reserved Value must be zero.\r\n";
-
- rv = icValidateNonCompliant;
- }
---- 166,172 ----
- CIccInfo Info;
- sReport += icValidateNonCompliantMsg;
- sReport += Info.GetSigName(sig);
-! sReport += " - Reserved Value must be zero.\n";
-
- rv = icValidateNonCompliant;
- }
-***************
-*** 340,346 ****
- sprintf(buf, "%u Bytes.", m_nSize-4);
- sDescription += buf;
-
-! sDescription += "\r\n\r\nData Follows:\r\n";
-
- icMemDump(sDescription, m_pData+4, m_nSize-4);
- }
---- 340,346 ----
- sprintf(buf, "%u Bytes.", m_nSize-4);
- sDescription += buf;
-
-! sDescription += "\n\nData Follows:\n";
-
- icMemDump(sDescription, m_pData+4, m_nSize-4);
- }
-***************
-*** 511,517 ****
- if (m_szText && *m_szText)
- sDescription += m_szText;
-
-! sDescription += "\"\r\n";
- }
-
-
---- 511,517 ----
- if (m_szText && *m_szText)
- sDescription += m_szText;
-
-! sDescription += "\"\n";
- }
-
-
-***************
-*** 629,635 ****
- if (m_nBufSize<7) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Tag must have at least seven text characters.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
---- 629,635 ----
- if (m_nBufSize<7) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Tag must have at least seven text characters.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
-***************
-*** 636,642 ****
- default:
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Unknown Tag.\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
- int i;
---- 636,642 ----
- default:
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Unknown Tag.\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
- int i;
-***************
-*** 644,650 ****
- if (m_szText[i]&0x80) {
- sReport += icValidateWarning;
- sReport += sSigName;
-! sReport += " - Text do not contain 7bit data.\r\n";
- }
- }
- }
---- 644,650 ----
- if (m_szText[i]&0x80) {
- sReport += icValidateWarning;
- sReport += sSigName;
-! sReport += " - Text do not contain 7bit data.\n";
- }
- }
- }
-***************
-*** 651,657 ****
- else {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty Tag.\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
-
---- 651,657 ----
- else {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty Tag.\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
-
-***************
-*** 941,947 ****
- if (m_szText && *m_szText)
- sDescription += m_szText;
-
-! sDescription += "\"\r\n";
- }
-
-
---- 941,947 ----
- if (m_szText && *m_szText)
- sDescription += m_szText;
-
-! sDescription += "\"\n";
- }
-
-
-***************
-*** 1101,1107 ****
- if (m_nScriptSize>67) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - ScriptCode count must not be greater than 67.\r\n";
-
- rv =icMaxStatus(rv, icValidateNonCompliant);
- }
---- 1101,1107 ----
- if (m_nScriptSize>67) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - ScriptCode count must not be greater than 67.\n";
-
- rv =icMaxStatus(rv, icValidateNonCompliant);
- }
-***************
-*** 1260,1266 ****
- CIccInfo Fmt;
-
- sDescription += Fmt.GetSigName(m_nSig);
-! sDescription += "\r\n";
- }
-
-
---- 1260,1266 ----
- CIccInfo Fmt;
-
- sDescription += Fmt.GetSigName(m_nSig);
-! sDescription += "\n";
- }
-
-
-***************
-*** 1320,1326 ****
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(m_nSig));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
---- 1320,1326 ----
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(m_nSig));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-***************
-*** 1336,1342 ****
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sprintf(buf, " - %s: Unknown Reference Medium Gamut.\r\n", Info.GetSigName(m_nSig));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
---- 1336,1342 ----
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sprintf(buf, " - %s: Unknown Reference Medium Gamut.\n", Info.GetSigName(m_nSig));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-***************
-*** 1355,1361 ****
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\r\n", Info.GetSigName(m_nSig));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
---- 1355,1361 ----
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\n", Info.GetSigName(m_nSig));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-***************
-*** 1686,1692 ****
-
- sDescription.reserve(sDescription.size() + m_nSize*79);
-
-! sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\r\n", m_nVendorFlags, m_nSize, m_nDeviceCoords);
- sDescription += buf;
-
- for (i=0; i<m_nSize; i++) {
---- 1686,1692 ----
-
- sDescription.reserve(sDescription.size() + m_nSize*79);
-
-! sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\n", m_nVendorFlags, m_nSize, m_nDeviceCoords);
- sDescription += buf;
-
- for (i=0; i<m_nSize; i++) {
-***************
-*** 1717,1723 ****
- sDescription += buf;
- }
- }
-! sDescription += "\r\n";
-
- pNamedColor = (SIccNamedColorEntry*)((icChar*)pNamedColor + m_nColorEntrySize);
- }
---- 1717,1723 ----
- sDescription += buf;
- }
- }
-! sDescription += "\n";
-
- pNamedColor = (SIccNamedColorEntry*)((icChar*)pNamedColor + m_nColorEntrySize);
- }
-***************
-*** 2082,2088 ****
- if (!m_nSize) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty tag!\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
-
---- 2082,2088 ----
- if (!m_nSize) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty tag!\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
-
-***************
-*** 2092,2098 ****
- if (m_nDeviceCoords != nCoords) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of device co-ordinates.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
---- 2092,2098 ----
- if (m_nDeviceCoords != nCoords) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of device co-ordinates.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
-***************
-*** 2099,2105 ****
- else {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
- }
---- 2099,2105 ----
- else {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
- }
-***************
-*** 2285,2291 ****
- icChar buf[128];
-
- if (m_nSize == 1 ) {
-! 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));
- sDescription += buf;
- }
- else {
---- 2285,2291 ----
- icChar buf[128];
-
- if (m_nSize == 1 ) {
-! sprintf(buf, "X=%.4lf, Y=%.4lf, Z=%.4lf\n", icFtoD(m_XYZ[0].X), icFtoD(m_XYZ[0].Y), icFtoD(m_XYZ[0].Z));
- sDescription += buf;
- }
- else {
-***************
-*** 2293,2299 ****
- sDescription.reserve(sDescription.size() + m_nSize*79);
-
- for (i=0; i<m_nSize; i++) {
-! 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));
- sDescription += buf;
- }
- }
---- 2293,2299 ----
- sDescription.reserve(sDescription.size() + m_nSize*79);
-
- for (i=0; i<m_nSize; i++) {
-! 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));
- sDescription += buf;
- }
- }
-***************
-*** 2347,2353 ****
- if (!m_nSize) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty tag.\r\n";
-
- rv = icMaxStatus(rv, icValidateWarning);
- return rv;
---- 2347,2353 ----
- if (!m_nSize) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty tag.\n";
-
- rv = icMaxStatus(rv, icValidateWarning);
- return rv;
-***************
-*** 2553,2566 ****
-
- icUInt32Number i;
- //sDescription.reserve(sDescription.size() + m_nChannels*79);
-! sprintf(buf, "Number of Channels : %u\r\n", m_nChannels);
- sDescription += buf;
-
-! sprintf(buf, "Colorant Encoding : %s\r\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType));
- sDescription += buf;
-
- for (i=0; i<m_nChannels; i++) {
-! sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\r\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y));
- sDescription += buf;
- }
-
---- 2553,2566 ----
-
- icUInt32Number i;
- //sDescription.reserve(sDescription.size() + m_nChannels*79);
-! sprintf(buf, "Number of Channels : %u\n", m_nChannels);
- sDescription += buf;
-
-! sprintf(buf, "Colorant Encoding : %s\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType));
- sDescription += buf;
-
- for (i=0; i<m_nChannels; i++) {
-! sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y));
- sDescription += buf;
- }
-
-***************
-*** 2617,2623 ****
- if (m_nChannels!=3) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " - Number of device channels must be three.\r\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-
---- 2617,2623 ----
- if (m_nChannels!=3) {
- sReport += icValidateCriticalErrorMsg;
- sReport += sSigName;
-! sReport += " - Number of device channels must be three.\n";
- rv = icMaxStatus(rv, icValidateCriticalError);
- }
-
-***************
-*** 2629,2635 ****
- (m_xy[2].x != icDtoUF((icFloatNumber)0.150)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.060)) ) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Chromaticity data does not match specification.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
---- 2629,2635 ----
- (m_xy[2].x != icDtoUF((icFloatNumber)0.150)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.060)) ) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Chromaticity data does not match specification.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
-***************
-*** 2642,2648 ****
- (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Chromaticity data does not match specification.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
---- 2642,2648 ----
- (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Chromaticity data does not match specification.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
-***************
-*** 2655,2661 ****
- (m_xy[2].x != icDtoUF((icFloatNumber)0.15)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.06)) ) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Chromaticity data does not match specification.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
---- 2655,2661 ----
- (m_xy[2].x != icDtoUF((icFloatNumber)0.15)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.06)) ) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Chromaticity data does not match specification.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
-***************
-*** 2668,2674 ****
- (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Chromaticity data does not match specification.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
---- 2668,2674 ----
- (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Chromaticity data does not match specification.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- break;
-***************
-*** 2678,2684 ****
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid colorant type encoding.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
---- 2678,2684 ----
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid colorant type encoding.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
-***************
-*** 2884,2892 ****
-
- if (m_nSize == 1 ) {
- if (Tsig==icSigS15Fixed16ArrayType)
-! sprintf(buf, "Value = %.4lf\r\n", icFtoD(m_Num[0]));
- else
-! sprintf(buf, "Value = %.4lf\r\n", icUFtoD(m_Num[0]));
- sDescription += buf;
- }
- else {
---- 2884,2892 ----
-
- if (m_nSize == 1 ) {
- if (Tsig==icSigS15Fixed16ArrayType)
-! sprintf(buf, "Value = %.4lf\n", icFtoD(m_Num[0]));
- else
-! sprintf(buf, "Value = %.4lf\n", icUFtoD(m_Num[0]));
- sDescription += buf;
- }
- else {
-***************
-*** 2893,2910 ****
- icUInt32Number i;
-
- if (Tsig==icSigS15Fixed16ArrayType && m_nSize==9) {
-! sDescription += "Matrix Form:\r\n";
- icMatrixDump(sDescription, (icS15Fixed16Number*)m_Num);
-
-! sDescription += "\r\nArrayForm:\r\n";
- }
- sDescription.reserve(sDescription.size() + m_nSize*79);
-
- for (i=0; i<m_nSize; i++) {
- if (Tsig==icSigS15Fixed16ArrayType)
-! sprintf(buf, "Value[%u] = %.4lf\r\n", i, icFtoD(m_Num[i]));
- else
-! sprintf(buf, "Value[%u] = %.4lf\r\n", i, icUFtoD(m_Num[i]));
- sDescription += buf;
- }
- }
---- 2893,2910 ----
- icUInt32Number i;
-
- if (Tsig==icSigS15Fixed16ArrayType && m_nSize==9) {
-! sDescription += "Matrix Form:\n";
- icMatrixDump(sDescription, (icS15Fixed16Number*)m_Num);
-
-! sDescription += "\nArrayForm:\n";
- }
- sDescription.reserve(sDescription.size() + m_nSize*79);
-
- for (i=0; i<m_nSize; i++) {
- if (Tsig==icSigS15Fixed16ArrayType)
-! sprintf(buf, "Value[%u] = %.4lf\n", i, icFtoD(m_Num[i]));
- else
-! sprintf(buf, "Value[%u] = %.4lf\n", i, icUFtoD(m_Num[i]));
- sDescription += buf;
- }
- }
-***************
-*** 3172,3178 ****
- icChar buf[128];
-
- if (m_nSize == 1 ) {
-! sprintf(buf, "Value = %u (0x%x)\r\n", m_Num[0], m_Num[0]);
- sDescription += buf;
- }
- else {
---- 3172,3178 ----
- icChar buf[128];
-
- if (m_nSize == 1 ) {
-! sprintf(buf, "Value = %u (0x%x)\n", m_Num[0], m_Num[0]);
- sDescription += buf;
- }
- else {
-***************
-*** 3180,3186 ****
- sDescription.reserve(sDescription.size() + m_nSize*79);
-
- for (i=0; i<m_nSize; i++) {
-! sprintf(buf, "Value[%u] = %u (0x%x)\r\n", i, m_Num[i], m_Num[i]);
- sDescription += buf;
- }
- }
---- 3180,3186 ----
- sDescription.reserve(sDescription.size() + m_nSize*79);
-
- for (i=0; i<m_nSize; i++) {
-! sprintf(buf, "Value[%u] = %u (0x%x)\n", i, m_Num[i], m_Num[i]);
- sDescription += buf;
- }
- }
-***************
-*** 3374,3388 ****
- CIccInfo Fmt;
- icChar buf[128];
-
-! sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\r\n";
-! sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\r\n",
- icFtoD(m_Data.backing.X),
- icFtoD(m_Data.backing.Y),
- icFtoD(m_Data.backing.Z));
- sDescription += buf;
-! sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\r\n";
-! sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\r\n";
-! sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\r\n";
- }
-
-
---- 3374,3388 ----
- CIccInfo Fmt;
- icChar buf[128];
-
-! sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\n";
-! sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\n",
- icFtoD(m_Data.backing.X),
- icFtoD(m_Data.backing.Y),
- icFtoD(m_Data.backing.Z));
- sDescription += buf;
-! sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\n";
-! sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\n";
-! sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\n";
- }
-
-
-***************
-*** 3416,3422 ****
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid standard observer encoding.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 3416,3422 ----
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid standard observer encoding.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 3429,3435 ****
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid measurement geometry encoding.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 3429,3435 ----
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid measurement geometry encoding.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 3448,3454 ****
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid standard illuminant encoding.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 3448,3454 ----
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid standard illuminant encoding.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 3902,3910 ****
-
- for (i=m_Strings->begin(); i!=m_Strings->end(); i++) {
- if (i!=m_Strings->begin())
-! sDescription += "\r\n";
-
-! sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\r\n",
- i->m_nLanguageCode>>8, i->m_nLanguageCode,
- i->m_nCountryCode>>8, i->m_nCountryCode);
-
---- 3902,3910 ----
-
- for (i=m_Strings->begin(); i!=m_Strings->end(); i++) {
- if (i!=m_Strings->begin())
-! sDescription += "\n";
-
-! sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\n",
- i->m_nLanguageCode>>8, i->m_nLanguageCode,
- i->m_nCountryCode>>8, i->m_nCountryCode);
-
-***************
-*** 3919,3925 ****
- i->GetAnsi(szBuf, nSize);
- sDescription += "\"";
- sDescription += szBuf;
-! sDescription += "\"\r\n";
- }
- }
-
---- 3919,3925 ----
- i->GetAnsi(szBuf, nSize);
- sDescription += "\"";
- sDescription += szBuf;
-! sDescription += "\"\n";
- }
- }
-
-***************
-*** 3948,3954 ****
- if (!m_Strings->size()) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty tag!\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
-
---- 3948,3954 ----
- if (!m_Strings->size()) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty tag!\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
-
-***************
-*** 4246,4260 ****
- {
- icChar buf[128];
-
-! sDescription = "\r\nData:\r\n";
-
- if (IsTypeAscii()) {
-! sprintf(buf, "%s\r\n", (icChar*)m_pData);
- sDescription += buf;
- }
- else
- for (int i = 0; i<(int)m_nSize; i++) {
-! sprintf(buf, "%d\r\n", m_pData[i]);
- sDescription += buf;
- }
-
---- 4246,4260 ----
- {
- icChar buf[128];
-
-! sDescription = "\nData:\n";
-
- if (IsTypeAscii()) {
-! sprintf(buf, "%s\n", (icChar*)m_pData);
- sDescription += buf;
- }
- else
- for (int i = 0; i<(int)m_nSize; i++) {
-! sprintf(buf, "%d\n", m_pData[i]);
- sDescription += buf;
- }
-
-***************
-*** 4312,4318 ****
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid data flag encoding.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 4312,4318 ----
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Invalid data flag encoding.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 4477,4487 ****
- icChar buf[128];
-
- sDescription = "Date = ";
-! sprintf(buf, "%u-%u-%u\r\n", m_DateTime.month, m_DateTime.day, m_DateTime.year);
- sDescription += buf;
-
- sDescription += "Time = ";
-! sprintf(buf, "%u:%u:%u\r\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds);
- sDescription += buf;
- }
-
---- 4477,4487 ----
- icChar buf[128];
-
- sDescription = "Date = ";
-! sprintf(buf, "%u-%u-%u\n", m_DateTime.month, m_DateTime.day, m_DateTime.year);
- sDescription += buf;
-
- sDescription += "Time = ";
-! sprintf(buf, "%u:%u:%u\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds);
- sDescription += buf;
- }
-
-***************
-*** 4697,4708 ****
- {
- icChar buf[128];
-
-! sprintf(buf, "Colorant Count : %u\r\n", m_nCount);
- sDescription += buf;
-! sDescription += "Order of Colorants:\r\n";
-
- for (int i=0; i<(int)m_nCount; i++) {
-! sprintf(buf, "%u\r\n", m_pData[i]);
- sDescription += buf;
- }
- }
---- 4697,4708 ----
- {
- icChar buf[128];
-
-! sprintf(buf, "Colorant Count : %u\n", m_nCount);
- sDescription += buf;
-! sDescription += "Order of Colorants:\n";
-
- for (int i=0; i<(int)m_nCount; i++) {
-! sprintf(buf, "%u\n", m_pData[i]);
- sDescription += buf;
- }
- }
-***************
-*** 4757,4763 ****
- if (!pProfile) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- return rv;
- }
---- 4757,4763 ----
- if (!pProfile) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
- rv = icMaxStatus(rv, icValidateWarning);
- return rv;
- }
-***************
-*** 4765,4771 ****
- if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of colorants.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 4765,4771 ----
- if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of colorants.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 4977,4983 ****
- icUInt32Number i, nLen, nMaxLen=0;
- icFloatNumber Lab[3];
-
-! sprintf(buf, "BEGIN_COLORANTS %u\r\n", m_nCount);
- sDescription += buf;
-
- for (i=0; i<m_nCount; i++) {
---- 4977,4983 ----
- icUInt32Number i, nLen, nMaxLen=0;
- icFloatNumber Lab[3];
-
-! sprintf(buf, "BEGIN_COLORANTS %u\n", m_nCount);
- sDescription += buf;
-
- for (i=0; i<m_nCount; i++) {
-***************
-*** 4988,4998 ****
- sDescription += "# NAME ";
-
- if (m_PCS == icSigXYZData) {
-! sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\r\n");
- sDescription += buf;
- }
- else {
-! sprintf(buf, "Lab_L Lab_a Lab_b\r\n");
- sDescription += buf;
- }
- for (i=0; i<m_nCount; i++) {
---- 4988,4998 ----
- sDescription += "# NAME ";
-
- if (m_PCS == icSigXYZData) {
-! sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\n");
- sDescription += buf;
- }
- else {
-! sprintf(buf, "Lab_L Lab_a Lab_b\n");
- sDescription += buf;
- }
- for (i=0; i<m_nCount; i++) {
-***************
-*** 5003,5009 ****
- sDescription += buf;
-
- if (m_PCS == icSigXYZData) {
-! 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]));
- sDescription += buf;
- }
- else {
---- 5003,5009 ----
- sDescription += buf;
-
- if (m_PCS == icSigXYZData) {
-! 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]));
- sDescription += buf;
- }
- else {
-***************
-*** 5011,5017 ****
- Lab[1] = icU16toF(m_pData[i].data[1]);
- Lab[2] = icU16toF(m_pData[i].data[2]);
- icLabFromPcs(Lab);
-! sprintf(buf, "%7.4lf %8.4lf %8.4lf\r\n", Lab[0], Lab[1], Lab[2]);
- sDescription += buf;
- }
- }
---- 5011,5017 ----
- Lab[1] = icU16toF(m_pData[i].data[1]);
- Lab[2] = icU16toF(m_pData[i].data[2]);
- icLabFromPcs(Lab);
-! sprintf(buf, "%7.4lf %8.4lf %8.4lf\n", Lab[0], Lab[1], Lab[2]);
- sDescription += buf;
- }
- }
-***************
-*** 5066,5072 ****
- if (!pProfile) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- return rv;
- }
---- 5066,5072 ----
- if (!pProfile) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
- rv = icMaxStatus(rv, icValidateWarning);
- return rv;
- }
-***************
-*** 5076,5082 ****
- if (pProfile->m_Header.deviceClass!=icSigLinkClass) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
---- 5076,5082 ----
- if (pProfile->m_Header.deviceClass!=icSigLinkClass) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
- }
-***************
-*** 5084,5090 ****
- if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of colorants.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 5084,5090 ----
- if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of colorants.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 5261,5273 ****
- icChar buf[128];
- CIccInfo Fmt;
-
-! sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n",
- icFtoD(m_XYZIllum.X),
- icFtoD(m_XYZIllum.Y),
- icFtoD(m_XYZIllum.Z));
- sDescription += buf;
-
-! sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n",
- icFtoD(m_XYZSurround.X),
- icFtoD(m_XYZSurround.Y),
- icFtoD(m_XYZSurround.Z));
---- 5261,5273 ----
- icChar buf[128];
- CIccInfo Fmt;
-
-! sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n",
- icFtoD(m_XYZIllum.X),
- icFtoD(m_XYZIllum.Y),
- icFtoD(m_XYZIllum.Z));
- sDescription += buf;
-
-! sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n",
- icFtoD(m_XYZSurround.X),
- icFtoD(m_XYZSurround.Y),
- icFtoD(m_XYZSurround.Z));
-***************
-*** 5276,5282 ****
- sDescription += "Illuminant Type: ";
-
- sDescription += Fmt.GetIlluminantName(m_illumType);
-! sDescription += "\r\n";
-
- }
-
---- 5276,5282 ----
- sDescription += "Illuminant Type: ";
-
- sDescription += Fmt.GetIlluminantName(m_illumType);
-! sDescription += "\n";
-
- }
-
-***************
-*** 5800,5831 ****
- icChar buf[128], buf2[28];
- icUInt32Number count=0;
-
-! sprintf(buf, "Number of Profile Description Structures: %u\r\n", m_Descriptions->size());
- sDescription += buf;
-
- for (i=m_Descriptions->begin(); i!=m_Descriptions->end(); i++, count++) {
-! sDescription += "\r\n";
-
-! sprintf(buf, "Profile Description Structure Number [%u] follows:\r\n", count+1);
- sDescription += buf;
-
-! sprintf(buf, "Device Manufacturer Signature: %s\r\n", icGetSig(buf2, i->m_deviceMfg, false));
- sDescription += buf;
-
-! sprintf(buf, "Device Model Signature: %s\r\n", icGetSig(buf2, i->m_deviceModel, false));
- sDescription += buf;
-
-! sprintf(buf, "Device Attributes: %08x%08x\r\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes));
- sDescription += buf;
-
-! sprintf(buf, "Device Technology Signature: %s\r\n", icGetSig(buf2, i->m_technology, false));
- sDescription += buf;
-
-! sprintf(buf, "Description of device manufacturer: \r\n");
- sDescription += buf;
- i->m_deviceMfgDesc.Describe(sDescription);
-
-! sprintf(buf, "Description of device model: \r\n");
- sDescription += buf;
- i->m_deviceModelDesc.Describe(sDescription);
- }
---- 5800,5831 ----
- icChar buf[128], buf2[28];
- icUInt32Number count=0;
-
-! sprintf(buf, "Number of Profile Description Structures: %u\n", m_Descriptions->size());
- sDescription += buf;
-
- for (i=m_Descriptions->begin(); i!=m_Descriptions->end(); i++, count++) {
-! sDescription += "\n";
-
-! sprintf(buf, "Profile Description Structure Number [%u] follows:\n", count+1);
- sDescription += buf;
-
-! sprintf(buf, "Device Manufacturer Signature: %s\n", icGetSig(buf2, i->m_deviceMfg, false));
- sDescription += buf;
-
-! sprintf(buf, "Device Model Signature: %s\n", icGetSig(buf2, i->m_deviceModel, false));
- sDescription += buf;
-
-! sprintf(buf, "Device Attributes: %08x%08x\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes));
- sDescription += buf;
-
-! sprintf(buf, "Device Technology Signature: %s\n", icGetSig(buf2, i->m_technology, false));
- sDescription += buf;
-
-! sprintf(buf, "Description of device manufacturer: \n");
- sDescription += buf;
- i->m_deviceMfgDesc.Describe(sDescription);
-
-! sprintf(buf, "Description of device model: \n");
- sDescription += buf;
- i->m_deviceModelDesc.Describe(sDescription);
- }
-***************
-*** 5886,5892 ****
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(i->m_technology));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
---- 5886,5892 ----
- {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(i->m_technology));
- sReport += buf;
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-***************
-*** 5896,5902 ****
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-
-! sReport += " Contains non-aligned deviceMfgDesc text tag information\r\n";
-
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
---- 5896,5902 ----
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-
-! sReport += " Contains non-aligned deviceMfgDesc text tag information\n";
-
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-***************
-*** 5905,5911 ****
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-
-! sReport += " Contains non-aligned deviceModelDesc text tag information\r\n";
-
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
---- 5905,5911 ----
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-
-! sReport += " Contains non-aligned deviceModelDesc text tag information\n";
-
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-***************
-*** 6174,6198 ****
- CIccResponse16List::iterator j;
-
- sDescription += "Measurement Unit: ";
-! sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\r\n";
-
-
- for (int i=0; i<m_nChannels; i++) {
- nResponseList = m_Response16ListArray[i];
-
-! sDescription += "\r\n";
-! sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", i+1,
- icFtoD(m_maxColorantXYZ[i].X), icFtoD(m_maxColorantXYZ[i].Y), icFtoD(m_maxColorantXYZ[i].Z));
- sDescription += buf;
-
-! sprintf(buf, "Number of Measurements for Channel-%u : %u\r\n", i+1, nResponseList.size());
- sDescription += buf;
-
-! sprintf(buf, "Measurement Data for Channel-%u follows:\r\n", i+1);
- sDescription += buf;
-
- for (j=nResponseList.begin(); j!=nResponseList.end(); j++) {
-! sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\r\n", j->deviceCode, icFtoD(j->measurementValue));
- sDescription += buf;
- }
- }
---- 6174,6198 ----
- CIccResponse16List::iterator j;
-
- sDescription += "Measurement Unit: ";
-! sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\n";
-
-
- for (int i=0; i<m_nChannels; i++) {
- nResponseList = m_Response16ListArray[i];
-
-! sDescription += "\n";
-! sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\n", i+1,
- icFtoD(m_maxColorantXYZ[i].X), icFtoD(m_maxColorantXYZ[i].Y), icFtoD(m_maxColorantXYZ[i].Z));
- sDescription += buf;
-
-! sprintf(buf, "Number of Measurements for Channel-%u : %u\n", i+1, nResponseList.size());
- sDescription += buf;
-
-! sprintf(buf, "Measurement Data for Channel-%u follows:\n", i+1);
- sDescription += buf;
-
- for (j=nResponseList.begin(); j!=nResponseList.end(); j++) {
-! sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\n", j->deviceCode, icFtoD(j->measurementValue));
- sDescription += buf;
- }
- }
-***************
-*** 6234,6240 ****
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Unknown measurement unit signature.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
---- 6234,6240 ----
- default:
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Unknown measurement unit signature.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- }
-
-***************
-*** 6241,6247 ****
- if (!m_nChannels) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of channels.\r\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- return rv;
- }
---- 6241,6247 ----
- if (!m_nChannels) {
- sReport += icValidateNonCompliantMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of channels.\n";
- rv = icMaxStatus(rv, icValidateNonCompliant);
- return rv;
- }
-***************
-*** 6479,6495 ****
- CIccResponseCurveSet::iterator i;
- icChar buf[128];
-
-! sprintf(buf, "Number of Channels: %u\r\n", m_nChannels);
- sDescription += buf;
-
-! sprintf(buf, "Number of Measurement Types used: %u\r\n", m_ResponseCurves->size());
- sDescription += buf;
-
- int count = 0;
- for (i=m_ResponseCurves->begin(); i!=m_ResponseCurves->end(); i++, count++) {
-! sDescription += "\r\n";
-
-! sprintf(buf, "Response Curve for measurement type [%u] follows:\r\n", count+1);
- sDescription += buf;
-
- i->Describe(sDescription);
---- 6479,6495 ----
- CIccResponseCurveSet::iterator i;
- icChar buf[128];
-
-! sprintf(buf, "Number of Channels: %u\n", m_nChannels);
- sDescription += buf;
-
-! sprintf(buf, "Number of Measurement Types used: %u\n", m_ResponseCurves->size());
- sDescription += buf;
-
- int count = 0;
- for (i=m_ResponseCurves->begin(); i!=m_ResponseCurves->end(); i++, count++) {
-! sDescription += "\n";
-
-! sprintf(buf, "Response Curve for measurement type [%u] follows:\n", count+1);
- sDescription += buf;
-
- i->Describe(sDescription);
-***************
-*** 6658,6664 ****
- if (!pProfile) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- return rv;
- }
---- 6658,6664 ----
- if (!pProfile) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
- rv = icMaxStatus(rv, icValidateWarning);
- return rv;
- }
-***************
-*** 6666,6678 ****
- if (m_nChannels!=icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of channels.\r\n";
- }
-
- if (!GetNumResponseCurveTypes()) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty Tag!.\r\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
- else {
---- 6666,6678 ----
- if (m_nChannels!=icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Incorrect number of channels.\n";
- }
-
- if (!GetNumResponseCurveTypes()) {
- sReport += icValidateWarningMsg;
- sReport += sSigName;
-! sReport += " - Empty Tag!.\n";
- rv = icMaxStatus(rv, icValidateWarning);
- }
- else {
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp Fri Jan 25 14:23:09 2008
-***************
-*** 323,345 ****
- icChar buf[128], *ptr;
-
- if (!m_nSize) {
-! sprintf(buf, "BEGIN_CURVE In_Out\r\n");
- sDescription += buf;
-! sDescription += "Y = X\r\n";
- }
- else if (m_nSize==1) {
- icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-! sprintf(buf, "BEGIN_CURVE In_Out\r\n");
- sDescription += buf;
-! sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma);
- sDescription += buf;
- }
- else {
- int i;
-
-! sprintf(buf, "BEGIN_LUT In_Out 1 1\r\n");
- sDescription += buf;
-! sDescription += "IN OUT\r\n";
-
- for (i=0; i<(int)m_nSize; i++) {
- ptr = buf;
---- 323,345 ----
- icChar buf[128], *ptr;
-
- if (!m_nSize) {
-! sprintf(buf, "BEGIN_CURVE In_Out\n");
- sDescription += buf;
-! sDescription += "Y = X\n";
- }
- else if (m_nSize==1) {
- icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-! sprintf(buf, "BEGIN_CURVE In_Out\n");
- sDescription += buf;
-! sprintf(buf, "Y = X ^ %.4lf\n", dGamma);
- sDescription += buf;
- }
- else {
- int i;
-
-! sprintf(buf, "BEGIN_LUT In_Out 1 1\n");
- sDescription += buf;
-! sDescription += "IN OUT\n";
-
- for (i=0; i<(int)m_nSize; i++) {
- ptr = buf;
-***************
-*** 354,365 ****
-
- ptr += strlen(ptr);
-
-! strcpy(ptr, "\r\n");
-
- sDescription += buf;
- }
- }
-! sDescription += "\r\n";
- }
-
-
---- 354,365 ----
-
- ptr += strlen(ptr);
-
-! strcpy(ptr, "\n");
-
- sDescription += buf;
- }
- }
-! sDescription += "\n";
- }
-
-
-***************
-*** 383,405 ****
- icChar buf[128], *ptr;
-
- if (!m_nSize) {
-! sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
- sDescription += buf;
-! sDescription += "Y = X\r\n";
- }
- else if (m_nSize==1) {
- icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-! sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
- sDescription += buf;
-! sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma);
- sDescription += buf;
- }
- else {
- int i;
-
-! sprintf(buf, "BEGIN_LUT %s 1 1\r\n", szName);
- sDescription += buf;
-! sDescription += "IN OUT\r\n";
-
- sDescription.reserve(sDescription.size() + m_nSize * 20);
-
---- 383,405 ----
- icChar buf[128], *ptr;
-
- if (!m_nSize) {
-! sprintf(buf, "BEGIN_CURVE %s\n", szName);
- sDescription += buf;
-! sDescription += "Y = X\n";
- }
- else if (m_nSize==1) {
- icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-! sprintf(buf, "BEGIN_CURVE %s\n", szName);
- sDescription += buf;
-! sprintf(buf, "Y = X ^ %.4lf\n", dGamma);
- sDescription += buf;
- }
- else {
- int i;
-
-! sprintf(buf, "BEGIN_LUT %s 1 1\n", szName);
- sDescription += buf;
-! sDescription += "IN OUT\n";
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list