fenix
/
PDF4QT
mirror of https://github.com/JakubMelka/PDF4QT.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #129: Cannot compile with lcms 2.16

This commit is contained in:
Jakub Melka 2023-12-24 12:01:15 +01:00
parent 9de8dbfad2
commit 53849f51e1
2 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Pdf4QtLibCore/sources/pdfcms.cpp
View File

@ -803,6 +803,7 @@ cmsBool PDFLittleCMS::optimizePipeline(cmsPipeline** Lut, cmsUInt32Number Intent
{ {
cmsContext contextId = cmsGetPipelineContextID(*Lut); cmsContext contextId = cmsGetPipelineContextID(*Lut);
cmsPipeline* pipeline = cmsPipelineAlloc(contextId, T_CHANNELS(*InputFormat), T_CHANNELS(*OutputFormat)); cmsPipeline* pipeline = cmsPipelineAlloc(contextId, T_CHANNELS(*InputFormat), T_CHANNELS(*OutputFormat));
if (!pipeline) if (!pipeline)
{ {
return FALSE; return FALSE;
@ -820,53 +821,19 @@ cmsBool PDFLittleCMS::optimizePipeline(cmsPipeline** Lut, cmsUInt32Number Intent
const cmsToneCurve* curve = data->TheCurves[i]; const cmsToneCurve* curve = data->TheCurves[i];
const cmsInt32Number type = cmsGetToneCurveParametricType(curve); const cmsInt32Number type = cmsGetToneCurveParametricType(curve);
if (type != 0 && !cmsIsToneCurveMultisegment(curve)) if (type != 0)
{ {
std::array<cmsCurveSegment, 3> segments = { }; const cmsUInt32Number tableEntryCount = cmsGetToneCurveEstimatedTableEntries(curve);
const cmsUInt16Number* tableEntries = cmsGetToneCurveEstimatedTable(curve);
const cmsFloat64Number* params = cmsGetToneCurveParams(curve); if (tableEntryCount > 0)
cmsCurveSegment& s1 = segments[0];
cmsCurveSegment& s2 = segments[1];
cmsCurveSegment& s3 = segments[2];
const cmsFloat32Number eps = cmsFloat32Number(1e-5);
const cmsFloat32Number low = 0.0f - eps;
const cmsFloat32Number high = 1.0f + eps;
s1.Type = type;
s1.nGridPoints = 0;
s1.SampledPoints = nullptr;
std::copy(params, params + (sizeof(s1.Params) / sizeof(*s1.Params)), s1.Params);
s1.x0 = std::numeric_limits<cmsFloat32Number>::min();
s1.x1 = low;
const cmsUInt32Number gridPoints = 1024;
const cmsFloat32Number factor = 1.0f / cmsFloat32Number(gridPoints - 1);
s2.Type = 0;
s2.nGridPoints = gridPoints;
s2.SampledPoints = static_cast<cmsFloat32Number*>(_cmsCalloc(contextId, gridPoints, sizeof(*s2.SampledPoints)));
std::copy(params, params + (sizeof(s2.Params) / sizeof(*s2.Params)), s2.Params);
s2.x0 = low;
s2.x1 = high;
for (cmsUInt32Number iPt = 0; iPt < gridPoints; ++iPt)
{ {
const cmsFloat32Number x = iPt * factor; curves[i] = cmsBuildTabulatedToneCurve16(contextId, tableEntryCount, tableEntries);
s2.SampledPoints[iPt] = cmsEvalToneCurveFloat(curve, interpolate(x, 0.0, 1.0, low, high)); }
else
{
curves[i] = cmsDupToneCurve(curve);
} }
s3.Type = type;
s3.nGridPoints = 0;
s3.SampledPoints = nullptr;
std::copy(params, params + (sizeof(s3.Params) / sizeof(*s3.Params)), s3.Params);
s3.x0 = high;
s3.x1 = std::numeric_limits<cmsFloat32Number>::max();
curves[i] = cmsBuildSegmentedToneCurve(contextId, cmsUInt32Number(segments.size()), segments.data());
_cmsFree(contextId, s2.SampledPoints);
} }
else else
{ {

1
RELEASES.txt
View File

@ -1,4 +1,5 @@
CURRENT: CURRENT:
- Issue #129: Cannot compile with lcms 2.16
- Issue #126: Remove <QtCore> include from main headers - Issue #126: Remove <QtCore> include from main headers
- Issue #119: Improve search bar 2 (the revenge) - Issue #119: Improve search bar 2 (the revenge)
- Issue #118: Adding CMAKE options for minimal builds - Issue #118: Adding CMAKE options for minimal builds