diff options
author | Marti Maria <marti.maria@littlecms.com> | 2020-12-20 17:55:20 +0100 |
---|---|---|
committer | Marti Maria <marti.maria@littlecms.com> | 2020-12-20 17:55:20 +0100 |
commit | 8ca227b234573167b1bf0b396aa19966e5de509d (patch) | |
tree | 08bbf0ae6f4261e0889db54933acac4c09c95925 /include | |
parent | 0762b094621d7946ecd9bad314dee20298c20da6 (diff) | |
download | lcms2-8ca227b234573167b1bf0b396aa19966e5de509d.tar.gz |
Clean the _cmsInterpFn16 mess
A cleanup of a function pointer being mixed in several places
Diffstat (limited to 'include')
-rw-r--r-- | include/lcms2.h | 2 | ||||
-rw-r--r-- | include/lcms2_plugin.h | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/lcms2.h b/include/lcms2.h index 5641f9f..7ff9085 100644 --- a/include/lcms2.h +++ b/include/lcms2.h @@ -1270,7 +1270,7 @@ typedef cmsInt32Number (* cmsSAMPLERFLOAT)(CMSREGISTER const cmsFloat32Number In #define SAMPLER_INSPECT 0x01000000 // For CLUT only -CMSAPI cmsBool CMSEXPORT cmsStageSampleCLut16bit(cmsStage* mpe, cmsSAMPLER16 Sampler, void* Cargo, cmsUInt32Number dwFlags); +CMSAPI cmsBool CMSEXPORT cmsStageSampleCLut16bit(cmsStage* mpe, cmsSAMPLER16 Sampler, void* Cargo, cmsUInt32Number dwFlags); CMSAPI cmsBool CMSEXPORT cmsStageSampleCLutFloat(cmsStage* mpe, cmsSAMPLERFLOAT Sampler, void* Cargo, cmsUInt32Number dwFlags); // Slicers diff --git a/include/lcms2_plugin.h b/include/lcms2_plugin.h index 36c2f07..5bc8227 100644 --- a/include/lcms2_plugin.h +++ b/include/lcms2_plugin.h @@ -553,11 +553,22 @@ typedef cmsBool (* _cmsOPToptimizeFn)(cmsPipeline** Lut, cmsUInt32Number* OutputFormat, cmsUInt32Number* dwFlags); +// Pipeline Evaluator (in 16 bits) +typedef void (* _cmsPipelineEval16Fn)(CMSREGISTER const cmsUInt16Number In[], + CMSREGISTER cmsUInt16Number Out[], + const void* Data); + +// Pipeline Evaluator (in floating point) +typedef void (* _cmsPipelineEvalFloatFn)(const cmsFloat32Number In[], + cmsFloat32Number Out[], + const void* Data); + + // This function may be used to set the optional evaluator and a block of private data. If private data is being used, an optional // duplicator and free functions should also be specified in order to duplicate the LUT construct. Use NULL to inhibit such functionality. CMSAPI void CMSEXPORT _cmsPipelineSetOptimizationParameters(cmsPipeline* Lut, - _cmsInterpFn16 Eval16, + _cmsPipelineEval16Fn Eval16, void* PrivateData, _cmsFreeUserDataFn FreePrivateDataFn, _cmsDupUserDataFn DupPrivateDataFn); |