diff options
| author | Marti Maria <info@littlecms.com> | 2014-12-17 12:18:42 +0100 |
|---|---|---|
| committer | Marti Maria <info@littlecms.com> | 2014-12-17 12:18:42 +0100 |
| commit | 58b8b180f9572b2e850bad9f900d5c706c7e5ac3 (patch) | |
| tree | c9eed8c64711897c611d7e49b71890df70cbfc2c /src/lcms2_internal.h | |
| parent | 81746818cd6df89b7a62dbcfc4861d12dbc9c4f4 (diff) | |
| download | lcms2-58b8b180f9572b2e850bad9f900d5c706c7e5ac3.tar.gz | |
Merge from private branch in preparation of 2.7 rc1
Diffstat (limited to 'src/lcms2_internal.h')
| -rw-r--r-- | src/lcms2_internal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lcms2_internal.h b/src/lcms2_internal.h index 422e553..1ec15ea 100644 --- a/src/lcms2_internal.h +++ b/src/lcms2_internal.h @@ -200,6 +200,12 @@ typedef CRITICAL_SECTION _cmsMutex; #define CMS_MUTEX_INITIALIZER {(PRTL_CRITICAL_SECTION_DEBUG) -1,-1,0,0,0,0} +#ifdef _MSC_VER +# if (_MSC_VER >= 1800) +# pragma warning(disable : 26135) +# endif +#endif + cmsINLINE int _cmsLockPrimitive(_cmsMutex *m) { EnterCriticalSection(m); @@ -823,6 +829,8 @@ cmsStage* _cmsStageNormalizeFromLabFloat(cmsContext ContextID); cmsStage* _cmsStageNormalizeFromXyzFloat(cmsContext ContextID); cmsStage* _cmsStageNormalizeToLabFloat(cmsContext ContextID); cmsStage* _cmsStageNormalizeToXyzFloat(cmsContext ContextID); +cmsStage* _cmsStageClipNegatives(cmsContext ContextID, int nChannels); + // For curve set only cmsToneCurve** _cmsStageGetPtrToCurveSet(const cmsStage* mpe); |