diff --git a/Projects/VC2022/tifficc/tifficc.vcxproj b/Projects/VC2022/tifficc/tifficc.vcxproj index 96ebe6ebe..eb8566271 100644 --- a/Projects/VC2022/tifficc/tifficc.vcxproj +++ b/Projects/VC2022/tifficc/tifficc.vcxproj @@ -124,18 +124,18 @@ - $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(IncludePath);c:/liteCommons/3rdparty/components/Win_$(PlatformShortName)/include $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff - $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff - $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(IncludePath);c:/liteCommons/3rdparty/components/Win_$(PlatformShortName)/include + $(LibraryPath);c:/liteCommons/3rdparty/components/Win_$(PlatformShortName)/lib $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff - $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff - $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(LibraryPath);c:/liteCommons/3rdparty/components/Win_$(PlatformShortName)/lib + $(IncludePath);c:/liteCommons/3rdparty/components/Win_$(PlatformShortName)/include $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff - $(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff - $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(IncludePath);c:/liteCommons/3rdparty/components/Win_$(PlatformShortName)/include + $(LibraryPath);c:/liteCommons/3rdparty/components/Win_$(PlatformShortName)/lib $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff - $(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff + $(LibraryPath);c:/liteCommons/3rdparty/components/Win_$(PlatformShortName)/lib @@ -152,7 +152,7 @@ true - libtiff.lib;%(AdditionalDependencies) + tiff.lib;jpeg-static.lib;zlibstatic.lib;webp.lib;webpdecoder.lib;webpdemux.lib;webpmux.lib;%(AdditionalDependencies) true Console MachineX86 @@ -194,7 +194,7 @@ true - libtiff.lib;%(AdditionalDependencies) + tiff.lib;jpeg-static.lib;zlibstatic.lib;webp.lib;webpdecoder.lib;webpdemux.lib;webpmux.lib;%(AdditionalDependencies) true Console false @@ -216,7 +216,7 @@ false - libtiff.lib;%(AdditionalDependencies) + tiff.lib;jpeg-static.lib;zlibstatic.lib;webp.lib;webpdecoder.lib;webpdemux.lib;webpmux.lib;%(AdditionalDependencies) true Console true @@ -270,7 +270,7 @@ true - libtiff.lib;%(AdditionalDependencies) + tiff.lib;jpeg-static.lib;zlibstatic.lib;webp.lib;webpdecoder.lib;webpdemux.lib;webpmux.lib;%(AdditionalDependencies) true Console true diff --git a/doc/LittleCMS2.15 API.pdf b/doc/LittleCMS2.15 API.pdf deleted file mode 100644 index 505240103..000000000 Binary files a/doc/LittleCMS2.15 API.pdf and /dev/null differ diff --git a/doc/LittleCMS2.15 Plugin API.pdf b/doc/LittleCMS2.15 Plugin API.pdf deleted file mode 100644 index 5599cc26e..000000000 Binary files a/doc/LittleCMS2.15 Plugin API.pdf and /dev/null differ diff --git a/doc/LittleCMS2.15 tutorial.pdf b/doc/LittleCMS2.15 tutorial.pdf deleted file mode 100644 index d479c1b4c..000000000 Binary files a/doc/LittleCMS2.15 tutorial.pdf and /dev/null differ diff --git a/doc/LittleCMS2.16 API.pdf b/doc/LittleCMS2.16 API.pdf new file mode 100644 index 000000000..640b99724 Binary files /dev/null and b/doc/LittleCMS2.16 API.pdf differ diff --git a/doc/LittleCMS2.16 Plugin API.pdf b/doc/LittleCMS2.16 Plugin API.pdf new file mode 100644 index 000000000..c177b23ad Binary files /dev/null and b/doc/LittleCMS2.16 Plugin API.pdf differ diff --git a/doc/LittleCMS2.16 tutorial.pdf b/doc/LittleCMS2.16 tutorial.pdf new file mode 100644 index 000000000..5fead1d08 Binary files /dev/null and b/doc/LittleCMS2.16 tutorial.pdf differ diff --git a/include/lcms2.h b/include/lcms2.h index 7e50377dd..1a7048b9f 100644 --- a/include/lcms2.h +++ b/include/lcms2.h @@ -23,7 +23,7 @@ // //--------------------------------------------------------------------------------- // -// Version 2.16 alpha +// Version 2.16rc1 // #ifndef _lcms2_H @@ -1618,8 +1618,6 @@ CMSAPI cmsHPROFILE CMSEXPORT cmsOpenProfileFromMem(const void * MemPtr, cms CMSAPI cmsHPROFILE CMSEXPORT cmsOpenProfileFromMemTHR(cmsContext ContextID, const void * MemPtr, cmsUInt32Number dwSize); CMSAPI cmsHPROFILE CMSEXPORT cmsOpenProfileFromIOhandlerTHR(cmsContext ContextID, cmsIOHANDLER* io); CMSAPI cmsHPROFILE CMSEXPORT cmsOpenProfileFromIOhandler2THR(cmsContext ContextID, cmsIOHANDLER* io, cmsBool write); -CMSAPI cmsHPROFILE CMSEXPORT cmsOpenCubeFromFile(const char* cFileName); -CMSAPI cmsHPROFILE CMSEXPORT cmsOpenCubeFromFileTHR(cmsContext ContextID, const char* cFileName); CMSAPI cmsBool CMSEXPORT cmsCloseProfile(cmsHPROFILE hProfile); CMSAPI cmsBool CMSEXPORT cmsSaveProfileToFile(cmsHPROFILE hProfile, const char* FileName); @@ -1657,6 +1655,9 @@ CMSAPI cmsHPROFILE CMSEXPORT cmsCreateInkLimitingDeviceLinkTHR(cmsContext C CMSAPI cmsHPROFILE CMSEXPORT cmsCreateInkLimitingDeviceLink(cmsColorSpaceSignature ColorSpace, cmsFloat64Number Limit); +CMSAPI cmsHPROFILE CMSEXPORT cmsCreateDeviceLinkFromCubeFile(const char* cFileName); + +CMSAPI cmsHPROFILE CMSEXPORT cmsCreateDeviceLinkFromCubeFileTHR(cmsContext ContextID, const char* cFileName); CMSAPI cmsHPROFILE CMSEXPORT cmsCreateLab2ProfileTHR(cmsContext ContextID, const cmsCIExyY* WhitePoint); CMSAPI cmsHPROFILE CMSEXPORT cmsCreateLab2Profile(const cmsCIExyY* WhitePoint); diff --git a/src/cmscgats.c b/src/cmscgats.c index 8784c13ba..bccbf58c1 100644 --- a/src/cmscgats.c +++ b/src/cmscgats.c @@ -3156,7 +3156,7 @@ cmsBool ParseCube(cmsIT8* cube, cmsStage** Shaper, cmsStage** CLUT, char title[] } // Share the parser to read .cube format and create RGB devicelink profiles -cmsHPROFILE cmsOpenCubeFromFileTHR(cmsContext ContextID, const char* cFileName) +cmsHPROFILE CMSEXPORT cmsCreateDeviceLinkFromCubeFileTHR(cmsContext ContextID, const char* cFileName) { cmsHPROFILE hProfile = NULL; cmsIT8* cube = NULL; @@ -3230,7 +3230,7 @@ cmsHPROFILE cmsOpenCubeFromFileTHR(cmsContext ContextID, const char* cFileName) return hProfile; } -cmsHPROFILE CMSEXPORT cmsOpenCubeFromFile(const char* cFileName) +cmsHPROFILE CMSEXPORT cmsCreateDeviceLinkFromCubeFile(const char* cFileName) { - return cmsOpenCubeFromFileTHR(0, cFileName); + return cmsCreateDeviceLinkFromCubeFileTHR(NULL, cFileName); }