summaryrefslogtreecommitdiff
path: root/third_party/lcms/0020-avoid-fixed-inf.patch
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-08-14 10:36:01 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-14 15:02:17 +0000
commit0bd847232a1f430c70dd9d8df177ce68a3cde010 (patch)
tree15cec8c11493549f1974ae2f6aeac58234c176d2 /third_party/lcms/0020-avoid-fixed-inf.patch
parentdff02cee2d2410d81a55c59345fb38b5aac8a457 (diff)
downloadpdfium-0bd847232a1f430c70dd9d8df177ce68a3cde010.tar.xz
LCMS: upgrade to 2.8
This CL upgrades LCMS from version 2.6 to 2.8. All changes from LCMS original version 2.8 are stored in patch files: - Patch 0: memory management modifications to use PDFium methods. This was previously not in any patch, so the changes were manually applied. - Patches 1-5: new patch files corresponding to old changes that can be seen in the history, but did not previously have patch files. - Patches 6-25: previous patches (patch numbers shifted by 6). The one for from16-to-8-overflow.patch was deleted as it was already upstream. Some patches did not apply cleanly so their .patch files were modified. - Patch 26: as I just moved files directly, unsupported characters were moved in unchanged, so I had to fix all of them: e with tilde and other characters were replaced to allow compilation on Windows. - Patch 27: Went over the code and re-applied changes that included comments clearly indicating this was Foxit. These changes are all already seen in the initial PDFium commit. Change-Id: Ic1d84e54803ef9e6b280ef7619bbf0b757312fbf Reviewed-on: https://pdfium-review.googlesource.com/10590 Commit-Queue: Nicolás Peña <npm@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/lcms/0020-avoid-fixed-inf.patch')
-rw-r--r--third_party/lcms/0020-avoid-fixed-inf.patch95
1 files changed, 95 insertions, 0 deletions
diff --git a/third_party/lcms/0020-avoid-fixed-inf.patch b/third_party/lcms/0020-avoid-fixed-inf.patch
new file mode 100644
index 0000000000..b2397d73f9
--- /dev/null
+++ b/third_party/lcms/0020-avoid-fixed-inf.patch
@@ -0,0 +1,95 @@
+diff --git a/third_party/lcms/src/cmsopt.c b/third_party/lcms/src/cmsopt.c
+index e4a7e4521..23aa54402 100644
+--- a/third_party/lcms/src/cmsopt.c
++++ b/third_party/lcms/src/cmsopt.c
+@@ -1546,7 +1546,7 @@ void MatShaperEval16(register const cmsUInt16Number In[],
+
+ // This table converts from 8 bits to 1.14 after applying the curve
+ static
+-void FillFirstShaper(cmsS1Fixed14Number* Table, cmsToneCurve* Curve)
++cmsBool FillFirstShaper(cmsS1Fixed14Number* Table, cmsToneCurve* Curve)
+ {
+ int i;
+ cmsFloat32Number R, y;
+@@ -1555,14 +1555,17 @@ void FillFirstShaper(cmsS1Fixed14Number* Table, cmsToneCurve* Curve)
+
+ R = (cmsFloat32Number) (i / 255.0);
+ y = cmsEvalToneCurveFloat(Curve, R);
++ if (isinf(y))
++ return FALSE;
+
+ Table[i] = DOUBLE_TO_1FIXED14(y);
+ }
++ return TRUE;
+ }
+
+ // This table converts form 1.14 (being 0x4000 the last entry) to 8 bits after applying the curve
+ static
+-void FillSecondShaper(cmsUInt16Number* Table, cmsToneCurve* Curve, cmsBool Is8BitsOutput)
++cmsBool FillSecondShaper(cmsUInt16Number* Table, cmsToneCurve* Curve, cmsBool Is8BitsOutput)
+ {
+ int i;
+ cmsFloat32Number R, Val;
+@@ -1571,6 +1574,8 @@ void FillSecondShaper(cmsUInt16Number* Table, cmsToneCurve* Curve, cmsBool Is8Bi
+
+ R = (cmsFloat32Number) (i / 16384.0);
+ Val = cmsEvalToneCurveFloat(Curve, R); // Val comes 0..1.0
++ if (isinf(Val))
++ return FALSE;
+
+ if (Is8BitsOutput) {
+
+@@ -1585,6 +1590,7 @@ void FillSecondShaper(cmsUInt16Number* Table, cmsToneCurve* Curve, cmsBool Is8Bi
+ }
+ else Table[i] = _cmsQuickSaturateWord(Val * 65535.0);
+ }
++ return TRUE;
+ }
+
+ // Compute the matrix-shaper structure
+@@ -1602,13 +1608,19 @@ cmsBool SetMatShaper(cmsPipeline* Dest, cmsToneCurve* Curve1[3], cmsMAT3* Mat, c
+ p -> ContextID = Dest -> ContextID;
+
+ // Precompute tables
+- FillFirstShaper(p ->Shaper1R, Curve1[0]);
+- FillFirstShaper(p ->Shaper1G, Curve1[1]);
+- FillFirstShaper(p ->Shaper1B, Curve1[2]);
++ if (!FillFirstShaper(p ->Shaper1R, Curve1[0]))
++ goto Error;
++ if (!FillFirstShaper(p ->Shaper1G, Curve1[1]))
++ goto Error;
++ if (!FillFirstShaper(p ->Shaper1B, Curve1[2]))
++ goto Error;
+
+- FillSecondShaper(p ->Shaper2R, Curve2[0], Is8Bits);
+- FillSecondShaper(p ->Shaper2G, Curve2[1], Is8Bits);
+- FillSecondShaper(p ->Shaper2B, Curve2[2], Is8Bits);
++ if (!FillSecondShaper(p ->Shaper2R, Curve2[0], Is8Bits))
++ goto Error;
++ if (!FillSecondShaper(p ->Shaper2G, Curve2[1], Is8Bits))
++ goto Error;
++ if (!FillSecondShaper(p ->Shaper2B, Curve2[2], Is8Bits))
++ goto Error;
+
+ // Convert matrix to nFixed14. Note that those values may take more than 16 bits as
+ for (i=0; i < 3; i++) {
+@@ -1634,6 +1646,9 @@ cmsBool SetMatShaper(cmsPipeline* Dest, cmsToneCurve* Curve1[3], cmsMAT3* Mat, c
+ // Fill function pointers
+ _cmsPipelineSetOptimizationParameters(Dest, MatShaperEval16, (void*) p, FreeMatShaper, DupMatShaper);
+ return TRUE;
++ Error:
++ _cmsFree(Dest->ContextID, p);
++ return FALSE;
+ }
+
+ // 8 bits on input allows matrix-shaper boot up to 25 Mpixels per second on RGB. That's fast!
+@@ -1746,7 +1761,8 @@ cmsBool OptimizeMatrixShaper(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3
+ *dwFlags |= cmsFLAGS_NOCACHE;
+
+ // Setup the optimizarion routines
+- SetMatShaper(Dest, mpeC1 ->TheCurves, &res, (cmsVEC3*) Offset, mpeC2->TheCurves, OutputFormat);
++ if (!SetMatShaper(Dest, mpeC1 ->TheCurves, &res, (cmsVEC3*) Offset, mpeC2->TheCurves, OutputFormat))
++ goto Error;
+ }
+
+ cmsPipelineFree(Src);