diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2008-01-10 15:17:14 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2008-01-10 15:17:14 +0000 |
| commit | a898a5243cd1e1ca5cd525a8f39d9edffc12acc0 (patch) | |
| tree | 9dcca7dc53b858c9bf46964a6ae9f8987a1d151c /icc | |
| parent | 23d4ebbdcb5a0952132040bbd8f928083789210a (diff) | |
#i81093# fix a compile problem on solaris
Diffstat (limited to 'icc')
| -rw-r--r-- | icc/SampleICC-1.3.2.patch | 14 | ||||
| -rw-r--r-- | icc/source/create_sRGB_profile/create_sRGB_profile.cpp | 8 |
2 files changed, 18 insertions, 4 deletions
diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch index 9f0e3edce51e..75829b283135 100644 --- a/icc/SampleICC-1.3.2.patch +++ b/icc/SampleICC-1.3.2.patch @@ -1,3 +1,17 @@ +--- SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp 2007-08-20 22:04:54.000000000 +0200 ++++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp 2008-01-10 16:50:32.470786602 +0100 +@@ -83,7 +83,11 @@ + using namespace std; + + #ifndef WIN32 ++#ifdef PLATFORM_SUNOS5 ++#include <errno.h> ++#else + #include <sys/errno.h> ++#endif + #else + #include <string.h> + int strerror_r(int errnum, char *str, int strsize) --- SampleICC-1.3.2/IccProfLib/icProfileHeader.h 2007-08-20 22:05:00.000000000 +0200 +++ misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h 2008-01-10 13:49:26.389626916 +0100 @@ -659,10 +659,11 @@ diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp index deece8cdede6..61ef0c617a7e 100644 --- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp +++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp @@ -4,9 +4,9 @@ * * $RCSfile: create_sRGB_profile.cpp,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: pl $ $Date: 2008-01-10 15:39:13 $ + * last change: $Author: pl $ $Date: 2008-01-10 16:17:14 $ Derived by beppec56@openoffice.org from various examples in SampleICC library, the original copyright retained. @@ -182,7 +182,7 @@ icFloatNumber computeIEC_XYZtoRGB( icFloatNumber indata ) if(indata < 0.0031308) retval = indata*12.92; else // apply the other conversion - retval = 1.055*pow( indata , 1.0/2.4) - 0.055; + retval = 1.055*pow( indata , icFloatNumber(1.0/2.4)) - 0.055; // cout << retval << endl; return retval; @@ -554,7 +554,7 @@ int main(int argc, char* argv[]) return EXIT_SUCCESS; } - catch (const exception& e) + catch (const std::exception& e) { cout << myName << ": error: " << e.what() << endl; return EXIT_FAILURE; |