summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/BUILD.gn54
-rw-r--r--third_party/lcms/0000-tag-type-confusion.patch (renamed from third_party/lcms2-2.6/0000-tag-type-confusion.patch)6
-rw-r--r--third_party/lcms/0001-from16-to-8-overflow.patch (renamed from third_party/lcms2-2.6/0001-from16-to-8-overflow.patch)6
-rw-r--r--third_party/lcms/0002-infinite-loop-GrowNamedColorList.patch (renamed from third_party/lcms2-2.6/0002-infinite-loop-GrowNamedColorList.patch)6
-rw-r--r--third_party/lcms/0003-uninit.patch (renamed from third_party/lcms2-2.6/0003-uninit.patch)6
-rw-r--r--third_party/lcms/0004-memory-leak-Type_Curve_Read.patch (renamed from third_party/lcms2-2.6/0004-memory-leak-Type_Curve_Read.patch)6
-rw-r--r--third_party/lcms/0005-memory-leak-AllocEmptyTransform.patch (renamed from third_party/lcms2-2.6/0005-memory-leak-AllocEmptyTransform.patch)6
-rw-r--r--third_party/lcms/0006-memory-leak-Type_NamedColor_Read.patch (renamed from third_party/lcms2-2.6/0006-memory-leak-Type_NamedColor_Read.patch)6
-rw-r--r--third_party/lcms/0007-memory-leak-OptimizeByResampling.patch (renamed from third_party/lcms2-2.6/0007-memory-leak-OptimizeByResampling.patch)6
-rw-r--r--third_party/lcms/0008-memory-leak-Type_MPEmatrix_Read.patch (renamed from third_party/lcms2-2.6/0008-memory-leak-Type_MPEmatrix_Read.patch)6
-rw-r--r--third_party/lcms/0009-cmsStageAllocMatrix-param-swap.patch (renamed from third_party/lcms2-2.6/0009-cmsStageAllocMatrix-param-swap.patch)6
-rw-r--r--third_party/lcms/0010-reject-nan.patch (renamed from third_party/lcms2-2.6/0010-reject-nan.patch)6
-rw-r--r--third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch (renamed from third_party/lcms2-2.6/0011-memory-leak-ReadSegmentedCurve.patch)6
-rw-r--r--third_party/lcms/0012-backport-c0a98d86.patch (renamed from third_party/lcms2-2.6/0012-backport-c0a98d86.patch)18
-rw-r--r--third_party/lcms/0013-utf8.patch (renamed from third_party/lcms2-2.6/0013-utf8.patch)18
-rw-r--r--third_party/lcms/0014-avoid-fixed-inf.patch (renamed from third_party/lcms2-2.6/0014-avoid-fixed-inf.patch)6
-rw-r--r--third_party/lcms/0015-sanitize-float-read.patch (renamed from third_party/lcms2-2.6/0015-sanitize-float-read.patch)6
-rw-r--r--third_party/lcms/0016-check-LUT-and-MPE.patch (renamed from third_party/lcms2-2.6/0016-check-LUT-and-MPE.patch)12
-rw-r--r--third_party/lcms/0017-upstream-integer-overflow-MPEmatrix_Read.patch (renamed from third_party/lcms2-2.6/0017-upstream-integer-overflow-MPEmatrix_Read.patch)12
-rw-r--r--third_party/lcms/0018-verify-size-before-reading.patch (renamed from third_party/lcms2-2.6/0018-verify-size-before-reading.patch)6
-rw-r--r--third_party/lcms/0019-upstream-direct-leak-Type_MPE_Read.patch (renamed from third_party/lcms2-2.6/0019-upstream-direct-leak-Type_MPE_Read.patch)6
-rw-r--r--third_party/lcms/README.pdfium (renamed from third_party/lcms2-2.6/README.pdfium)0
-rw-r--r--third_party/lcms/include/lcms2.h (renamed from third_party/lcms2-2.6/include/lcms2.h)0
-rw-r--r--third_party/lcms/include/lcms2_plugin.h (renamed from third_party/lcms2-2.6/include/lcms2_plugin.h)0
-rw-r--r--third_party/lcms/src/cmscam02.c (renamed from third_party/lcms2-2.6/src/cmscam02.c)0
-rw-r--r--third_party/lcms/src/cmscgats.c (renamed from third_party/lcms2-2.6/src/cmscgats.c)0
-rw-r--r--third_party/lcms/src/cmscnvrt.c (renamed from third_party/lcms2-2.6/src/cmscnvrt.c)0
-rw-r--r--third_party/lcms/src/cmserr.c (renamed from third_party/lcms2-2.6/src/cmserr.c)0
-rw-r--r--third_party/lcms/src/cmsgamma.c (renamed from third_party/lcms2-2.6/src/cmsgamma.c)0
-rw-r--r--third_party/lcms/src/cmsgmt.c (renamed from third_party/lcms2-2.6/src/cmsgmt.c)0
-rw-r--r--third_party/lcms/src/cmshalf.c (renamed from third_party/lcms2-2.6/src/cmshalf.c)0
-rw-r--r--third_party/lcms/src/cmsintrp.c (renamed from third_party/lcms2-2.6/src/cmsintrp.c)0
-rw-r--r--third_party/lcms/src/cmsio0.c (renamed from third_party/lcms2-2.6/src/cmsio0.c)0
-rw-r--r--third_party/lcms/src/cmsio1.c (renamed from third_party/lcms2-2.6/src/cmsio1.c)0
-rw-r--r--third_party/lcms/src/cmslut.c (renamed from third_party/lcms2-2.6/src/cmslut.c)0
-rw-r--r--third_party/lcms/src/cmsmd5.c (renamed from third_party/lcms2-2.6/src/cmsmd5.c)0
-rw-r--r--third_party/lcms/src/cmsmtrx.c (renamed from third_party/lcms2-2.6/src/cmsmtrx.c)0
-rw-r--r--third_party/lcms/src/cmsnamed.c (renamed from third_party/lcms2-2.6/src/cmsnamed.c)0
-rw-r--r--third_party/lcms/src/cmsopt.c (renamed from third_party/lcms2-2.6/src/cmsopt.c)0
-rw-r--r--third_party/lcms/src/cmspack.c (renamed from third_party/lcms2-2.6/src/cmspack.c)0
-rw-r--r--third_party/lcms/src/cmspcs.c (renamed from third_party/lcms2-2.6/src/cmspcs.c)0
-rw-r--r--third_party/lcms/src/cmsplugin.c (renamed from third_party/lcms2-2.6/src/cmsplugin.c)0
-rw-r--r--third_party/lcms/src/cmsps2.c (renamed from third_party/lcms2-2.6/src/cmsps2.c)0
-rw-r--r--third_party/lcms/src/cmssamp.c (renamed from third_party/lcms2-2.6/src/cmssamp.c)0
-rw-r--r--third_party/lcms/src/cmssm.c (renamed from third_party/lcms2-2.6/src/cmssm.c)0
-rw-r--r--third_party/lcms/src/cmstypes.c (renamed from third_party/lcms2-2.6/src/cmstypes.c)0
-rw-r--r--third_party/lcms/src/cmsvirt.c (renamed from third_party/lcms2-2.6/src/cmsvirt.c)0
-rw-r--r--third_party/lcms/src/cmswtpnt.c (renamed from third_party/lcms2-2.6/src/cmswtpnt.c)0
-rw-r--r--third_party/lcms/src/cmsxform.c (renamed from third_party/lcms2-2.6/src/cmsxform.c)0
-rw-r--r--third_party/lcms/src/lcms2_internal.h (renamed from third_party/lcms2-2.6/src/lcms2_internal.h)2
50 files changed, 106 insertions, 106 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 6d093f2249..743bbb0064 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -253,33 +253,33 @@ static_library("fx_lcms2") {
":fx_lcms2_warnings",
]
sources = [
- "lcms2-2.6/include/lcms2.h",
- "lcms2-2.6/include/lcms2_plugin.h",
- "lcms2-2.6/src/cmscam02.c",
- "lcms2-2.6/src/cmscgats.c",
- "lcms2-2.6/src/cmscnvrt.c",
- "lcms2-2.6/src/cmserr.c",
- "lcms2-2.6/src/cmsgamma.c",
- "lcms2-2.6/src/cmsgmt.c",
- "lcms2-2.6/src/cmshalf.c",
- "lcms2-2.6/src/cmsintrp.c",
- "lcms2-2.6/src/cmsio0.c",
- "lcms2-2.6/src/cmsio1.c",
- "lcms2-2.6/src/cmslut.c",
- "lcms2-2.6/src/cmsmd5.c",
- "lcms2-2.6/src/cmsmtrx.c",
- "lcms2-2.6/src/cmsnamed.c",
- "lcms2-2.6/src/cmsopt.c",
- "lcms2-2.6/src/cmspack.c",
- "lcms2-2.6/src/cmspcs.c",
- "lcms2-2.6/src/cmsplugin.c",
- "lcms2-2.6/src/cmsps2.c",
- "lcms2-2.6/src/cmssamp.c",
- "lcms2-2.6/src/cmssm.c",
- "lcms2-2.6/src/cmstypes.c",
- "lcms2-2.6/src/cmsvirt.c",
- "lcms2-2.6/src/cmswtpnt.c",
- "lcms2-2.6/src/cmsxform.c",
+ "lcms/include/lcms2.h",
+ "lcms/include/lcms2_plugin.h",
+ "lcms/src/cmscam02.c",
+ "lcms/src/cmscgats.c",
+ "lcms/src/cmscnvrt.c",
+ "lcms/src/cmserr.c",
+ "lcms/src/cmsgamma.c",
+ "lcms/src/cmsgmt.c",
+ "lcms/src/cmshalf.c",
+ "lcms/src/cmsintrp.c",
+ "lcms/src/cmsio0.c",
+ "lcms/src/cmsio1.c",
+ "lcms/src/cmslut.c",
+ "lcms/src/cmsmd5.c",
+ "lcms/src/cmsmtrx.c",
+ "lcms/src/cmsnamed.c",
+ "lcms/src/cmsopt.c",
+ "lcms/src/cmspack.c",
+ "lcms/src/cmspcs.c",
+ "lcms/src/cmsplugin.c",
+ "lcms/src/cmsps2.c",
+ "lcms/src/cmssamp.c",
+ "lcms/src/cmssm.c",
+ "lcms/src/cmstypes.c",
+ "lcms/src/cmsvirt.c",
+ "lcms/src/cmswtpnt.c",
+ "lcms/src/cmsxform.c",
]
}
diff --git a/third_party/lcms2-2.6/0000-tag-type-confusion.patch b/third_party/lcms/0000-tag-type-confusion.patch
index df94cb7bfe..97d3c7f4d9 100644
--- a/third_party/lcms2-2.6/0000-tag-type-confusion.patch
+++ b/third_party/lcms/0000-tag-type-confusion.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmsio0.c b/third_party/lcms2-2.6/src/cmsio0.c
+diff --git a/third_party/lcms/src/cmsio0.c b/third_party/lcms/src/cmsio0.c
index 6549d15..5f9f08a 100644
---- a/third_party/lcms2-2.6/src/cmsio0.c
-+++ b/third_party/lcms2-2.6/src/cmsio0.c
+--- a/third_party/lcms/src/cmsio0.c
++++ b/third_party/lcms/src/cmsio0.c
@@ -719,7 +719,8 @@ cmsBool _cmsReadHeader(_cmsICCPROFILE* Icc)
for (j=0; j < Icc ->TagCount; j++) {
diff --git a/third_party/lcms2-2.6/0001-from16-to-8-overflow.patch b/third_party/lcms/0001-from16-to-8-overflow.patch
index 6e7b16d061..9d31c84b36 100644
--- a/third_party/lcms2-2.6/0001-from16-to-8-overflow.patch
+++ b/third_party/lcms/0001-from16-to-8-overflow.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/lcms2_internal.h b/third_party/lcms2-2.6/src/lcms2_internal.h
+diff --git a/third_party/lcms/src/lcms2_internal.h b/third_party/lcms/src/lcms2_internal.h
index 8617e92..cc76d48 100644
---- a/third_party/lcms2-2.6/src/lcms2_internal.h
-+++ b/third_party/lcms2-2.6/src/lcms2_internal.h
+--- a/third_party/lcms/src/lcms2_internal.h
++++ b/third_party/lcms/src/lcms2_internal.h
@@ -94,7 +94,7 @@
// A fast way to convert from/to 16 <-> 8 bits
diff --git a/third_party/lcms2-2.6/0002-infinite-loop-GrowNamedColorList.patch b/third_party/lcms/0002-infinite-loop-GrowNamedColorList.patch
index 9c01a51579..2a6f3df6c7 100644
--- a/third_party/lcms2-2.6/0002-infinite-loop-GrowNamedColorList.patch
+++ b/third_party/lcms/0002-infinite-loop-GrowNamedColorList.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmsnamed.c b/third_party/lcms2-2.6/src/cmsnamed.c
+diff --git a/third_party/lcms/src/cmsnamed.c b/third_party/lcms/src/cmsnamed.c
index acfd1c8..ef1eb30 100644
---- a/third_party/lcms2-2.6/src/cmsnamed.c
-+++ b/third_party/lcms2-2.6/src/cmsnamed.c
+--- a/third_party/lcms/src/cmsnamed.c
++++ b/third_party/lcms/src/cmsnamed.c
@@ -514,8 +514,12 @@ cmsNAMEDCOLORLIST* CMSEXPORT cmsAllocNamedColorList(cmsContext ContextID, cmsUIn
v ->nColors = 0;
v ->ContextID = ContextID;
diff --git a/third_party/lcms2-2.6/0003-uninit.patch b/third_party/lcms/0003-uninit.patch
index 476007e776..4017c0150b 100644
--- a/third_party/lcms2-2.6/0003-uninit.patch
+++ b/third_party/lcms/0003-uninit.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 06742b5..44c5b87 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -2964,7 +2964,7 @@ void *Type_ColorantTable_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER
{
cmsUInt32Number i, Count;
diff --git a/third_party/lcms2-2.6/0004-memory-leak-Type_Curve_Read.patch b/third_party/lcms/0004-memory-leak-Type_Curve_Read.patch
index 341a1c6b47..7edc7f9e0f 100644
--- a/third_party/lcms2-2.6/0004-memory-leak-Type_Curve_Read.patch
+++ b/third_party/lcms/0004-memory-leak-Type_Curve_Read.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 06742b5..9fe5e2a 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -1112,7 +1112,10 @@ void *Type_Curve_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cm
NewGamma = cmsBuildTabulatedToneCurve16(self ->ContextID, Count, NULL);
if (!NewGamma) return NULL;
diff --git a/third_party/lcms2-2.6/0005-memory-leak-AllocEmptyTransform.patch b/third_party/lcms/0005-memory-leak-AllocEmptyTransform.patch
index a85a9682bd..481d421292 100644
--- a/third_party/lcms2-2.6/0005-memory-leak-AllocEmptyTransform.patch
+++ b/third_party/lcms/0005-memory-leak-AllocEmptyTransform.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmsxform.c b/third_party/lcms2-2.6/src/cmsxform.c
+diff --git a/third_party/lcms/src/cmsxform.c b/third_party/lcms/src/cmsxform.c
index eddb9bd..6466d27 100644
---- a/third_party/lcms2-2.6/src/cmsxform.c
-+++ b/third_party/lcms2-2.6/src/cmsxform.c
+--- a/third_party/lcms/src/cmsxform.c
++++ b/third_party/lcms/src/cmsxform.c
@@ -593,7 +593,10 @@ _cmsTRANSFORM* AllocEmptyTransform(cmsContext ContextID, cmsPipeline* lut,
// Allocate needed memory
diff --git a/third_party/lcms2-2.6/0006-memory-leak-Type_NamedColor_Read.patch b/third_party/lcms/0006-memory-leak-Type_NamedColor_Read.patch
index 5d25d5a737..f6fa010357 100644
--- a/third_party/lcms2-2.6/0006-memory-leak-Type_NamedColor_Read.patch
+++ b/third_party/lcms/0006-memory-leak-Type_NamedColor_Read.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index feba387..4d24fc2 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -3102,7 +3102,7 @@ void *Type_NamedColor_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* i
if (nDeviceCoords > cmsMAXCHANNELS) {
diff --git a/third_party/lcms2-2.6/0007-memory-leak-OptimizeByResampling.patch b/third_party/lcms/0007-memory-leak-OptimizeByResampling.patch
index 2c55b94fa1..48645d1f01 100644
--- a/third_party/lcms2-2.6/0007-memory-leak-OptimizeByResampling.patch
+++ b/third_party/lcms/0007-memory-leak-OptimizeByResampling.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmsopt.c b/third_party/lcms2-2.6/src/cmsopt.c
+diff --git a/third_party/lcms/src/cmsopt.c b/third_party/lcms/src/cmsopt.c
index f885ef3..684910d 100644
---- a/third_party/lcms2-2.6/src/cmsopt.c
-+++ b/third_party/lcms2-2.6/src/cmsopt.c
+--- a/third_party/lcms/src/cmsopt.c
++++ b/third_party/lcms/src/cmsopt.c
@@ -612,7 +612,7 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3
// Allocate the CLUT
diff --git a/third_party/lcms2-2.6/0008-memory-leak-Type_MPEmatrix_Read.patch b/third_party/lcms/0008-memory-leak-Type_MPEmatrix_Read.patch
index 93ee3d3fde..8cc477fb8e 100644
--- a/third_party/lcms2-2.6/0008-memory-leak-Type_MPEmatrix_Read.patch
+++ b/third_party/lcms/0008-memory-leak-Type_MPEmatrix_Read.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 441d6bb..15199c7 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -4203,7 +4203,11 @@ void *Type_MPEmatrix_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
cmsFloat32Number v;
diff --git a/third_party/lcms2-2.6/0009-cmsStageAllocMatrix-param-swap.patch b/third_party/lcms/0009-cmsStageAllocMatrix-param-swap.patch
index 26db3dd223..04f854398c 100644
--- a/third_party/lcms2-2.6/0009-cmsStageAllocMatrix-param-swap.patch
+++ b/third_party/lcms/0009-cmsStageAllocMatrix-param-swap.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmslut.c b/third_party/lcms2-2.6/src/cmslut.c
+diff --git a/third_party/lcms/src/cmslut.c b/third_party/lcms/src/cmslut.c
index 73e6726..9b0eb4b 100644
---- a/third_party/lcms2-2.6/src/cmslut.c
-+++ b/third_party/lcms2-2.6/src/cmslut.c
+--- a/third_party/lcms/src/cmslut.c
++++ b/third_party/lcms/src/cmslut.c
@@ -414,13 +414,13 @@ cmsStage* CMSEXPORT cmsStageAllocMatrix(cmsContext ContextID, cmsUInt32Number R
if (Offset != NULL) {
diff --git a/third_party/lcms2-2.6/0010-reject-nan.patch b/third_party/lcms/0010-reject-nan.patch
index 2cf49ca0f7..8aa325a749 100644
--- a/third_party/lcms2-2.6/0010-reject-nan.patch
+++ b/third_party/lcms/0010-reject-nan.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmsplugin.c b/third_party/lcms2-2.6/src/cmsplugin.c
+diff --git a/third_party/lcms/src/cmsplugin.c b/third_party/lcms/src/cmsplugin.c
index 8903d2b..b95befb 100644
---- a/third_party/lcms2-2.6/src/cmsplugin.c
-+++ b/third_party/lcms2-2.6/src/cmsplugin.c
+--- a/third_party/lcms/src/cmsplugin.c
++++ b/third_party/lcms/src/cmsplugin.c
@@ -179,6 +179,8 @@ cmsBool CMSEXPORT _cmsReadFloat32Number(cmsIOHANDLER* io, cmsFloat32Number* n)
tmp = _cmsAdjustEndianess32(tmp);
diff --git a/third_party/lcms2-2.6/0011-memory-leak-ReadSegmentedCurve.patch b/third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch
index a6cfe02b8c..472bcadf05 100644
--- a/third_party/lcms2-2.6/0011-memory-leak-ReadSegmentedCurve.patch
+++ b/third_party/lcms/0011-memory-leak-ReadSegmentedCurve.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 15199c7..04dd0c4 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -3968,7 +3968,7 @@ cmsToneCurve* ReadSegmentedCurve(struct _cms_typehandler_struct* self, cmsIOHAND
case cmsSigSampledCurveSeg: {
cmsUInt32Number Count;
diff --git a/third_party/lcms2-2.6/0012-backport-c0a98d86.patch b/third_party/lcms/0012-backport-c0a98d86.patch
index 3041e31d76..3835b0d6cc 100644
--- a/third_party/lcms2-2.6/0012-backport-c0a98d86.patch
+++ b/third_party/lcms/0012-backport-c0a98d86.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmsintrp.c b/third_party/lcms2-2.6/src/cmsintrp.c
+diff --git a/third_party/lcms/src/cmsintrp.c b/third_party/lcms/src/cmsintrp.c
index 5d5f35d..14c6856 100644
---- a/third_party/lcms2-2.6/src/cmsintrp.c
-+++ b/third_party/lcms2-2.6/src/cmsintrp.c
+--- a/third_party/lcms/src/cmsintrp.c
++++ b/third_party/lcms/src/cmsintrp.c
@@ -215,7 +215,7 @@ void LinLerp1D(register const cmsUInt16Number Value[],
// To prevent out of bounds indexing
cmsINLINE cmsFloat32Number fclamp(cmsFloat32Number v)
@@ -11,10 +11,10 @@ index 5d5f35d..14c6856 100644
}
// Floating-point version of 1D interpolation
-diff --git a/third_party/lcms2-2.6/src/cmsio0.c b/third_party/lcms2-2.6/src/cmsio0.c
+diff --git a/third_party/lcms/src/cmsio0.c b/third_party/lcms/src/cmsio0.c
index 5f9f08a..3ed730a 100644
---- a/third_party/lcms2-2.6/src/cmsio0.c
-+++ b/third_party/lcms2-2.6/src/cmsio0.c
+--- a/third_party/lcms/src/cmsio0.c
++++ b/third_party/lcms/src/cmsio0.c
@@ -1475,6 +1475,17 @@ void* CMSEXPORT cmsReadTag(cmsHPROFILE hProfile, cmsTagSignature sig)
// If the element is already in memory, return the pointer
if (Icc -> TagPtrs[n]) {
@@ -33,10 +33,10 @@ index 5f9f08a..3ed730a 100644
if (Icc ->TagSaveAsRaw[n]) goto Error; // We don't support read raw tags as cooked
_cmsUnlockMutex(Icc->ContextID, Icc ->UsrMutex);
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 04dd0c4..386439b 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -4297,8 +4297,12 @@ void *Type_MPEclut_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io,
// Copy MAX_INPUT_DIMENSIONS at most. Expand to cmsUInt32Number
diff --git a/third_party/lcms2-2.6/0013-utf8.patch b/third_party/lcms/0013-utf8.patch
index c28d2c281b..c143aa8793 100644
--- a/third_party/lcms2-2.6/0013-utf8.patch
+++ b/third_party/lcms/0013-utf8.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmscgats.c b/third_party/lcms2-2.6/src/cmscgats.c
+diff --git a/third_party/lcms/src/cmscgats.c b/third_party/lcms/src/cmscgats.c
index 9017435..5720c66 100644
---- a/third_party/lcms2-2.6/src/cmscgats.c
-+++ b/third_party/lcms2-2.6/src/cmscgats.c
+--- a/third_party/lcms/src/cmscgats.c
++++ b/third_party/lcms/src/cmscgats.c
@@ -258,7 +258,7 @@ static PROPERTY PredefinedProperties[] = {
// needed.
@@ -20,10 +20,10 @@ index 9017435..5720c66 100644
{"WEIGHTING_FUNCTION", WRITE_PAIR}, // Indicates such functions as: the CIE standard observer functions used in the
// calculation of various data parameters (2 degree and 10 degree), CIE standard
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 386439b..e5ed06c 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -962,7 +962,7 @@ cmsBool Type_Text_Description_Write(struct _cms_typehandler_struct* self, cmsIO
len = cmsMLUgetASCII(mlu, cmsNoLanguage, cmsNoCountry, NULL, 0);
@@ -66,10 +66,10 @@ index 386439b..e5ed06c 100644
// first and last curve segments shall be specified in terms of a formula, whereas the other segments shall be
// specified either in terms of a formula, or by a sampled curve.
-diff --git a/third_party/lcms2-2.6/src/cmsvirt.c b/third_party/lcms2-2.6/src/cmsvirt.c
+diff --git a/third_party/lcms/src/cmsvirt.c b/third_party/lcms/src/cmsvirt.c
index b324c99..d19ace1 100644
---- a/third_party/lcms2-2.6/src/cmsvirt.c
-+++ b/third_party/lcms2-2.6/src/cmsvirt.c
+--- a/third_party/lcms/src/cmsvirt.c
++++ b/third_party/lcms/src/cmsvirt.c
@@ -612,18 +612,18 @@ cmsHPROFILE CMSEXPORT cmsCreateXYZProfile(void)
//sRGB Curves are defined by:
diff --git a/third_party/lcms2-2.6/0014-avoid-fixed-inf.patch b/third_party/lcms/0014-avoid-fixed-inf.patch
index 563787a941..b7960e6885 100644
--- a/third_party/lcms2-2.6/0014-avoid-fixed-inf.patch
+++ b/third_party/lcms/0014-avoid-fixed-inf.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmsopt.c b/third_party/lcms2-2.6/src/cmsopt.c
+diff --git a/third_party/lcms/src/cmsopt.c b/third_party/lcms/src/cmsopt.c
index 684910d..76de015 100644
---- a/third_party/lcms2-2.6/src/cmsopt.c
-+++ b/third_party/lcms2-2.6/src/cmsopt.c
+--- a/third_party/lcms/src/cmsopt.c
++++ b/third_party/lcms/src/cmsopt.c
@@ -1443,7 +1443,7 @@ void MatShaperEval16(register const cmsUInt16Number In[],
// This table converts from 8 bits to 1.14 after applying the curve
diff --git a/third_party/lcms2-2.6/0015-sanitize-float-read.patch b/third_party/lcms/0015-sanitize-float-read.patch
index 70dc7b35cf..568fd0e112 100644
--- a/third_party/lcms2-2.6/0015-sanitize-float-read.patch
+++ b/third_party/lcms/0015-sanitize-float-read.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmsplugin.c b/third_party/lcms2-2.6/src/cmsplugin.c
+diff --git a/third_party/lcms/src/cmsplugin.c b/third_party/lcms/src/cmsplugin.c
index b95befb..4ba998b 100644
---- a/third_party/lcms2-2.6/src/cmsplugin.c
-+++ b/third_party/lcms2-2.6/src/cmsplugin.c
+--- a/third_party/lcms/src/cmsplugin.c
++++ b/third_party/lcms/src/cmsplugin.c
@@ -182,7 +182,9 @@ cmsBool CMSEXPORT _cmsReadFloat32Number(cmsIOHANDLER* io, cmsFloat32Number* n)
if (isnan(*n))
return FALSE;
diff --git a/third_party/lcms2-2.6/0016-check-LUT-and-MPE.patch b/third_party/lcms/0016-check-LUT-and-MPE.patch
index bfa84e2eed..e2efe5a3a7 100644
--- a/third_party/lcms2-2.6/0016-check-LUT-and-MPE.patch
+++ b/third_party/lcms/0016-check-LUT-and-MPE.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmslut.c b/third_party/lcms2-2.6/src/cmslut.c
+diff --git a/third_party/lcms/src/cmslut.c b/third_party/lcms/src/cmslut.c
index 9b0eb4b54..19d43361f 100644
---- a/third_party/lcms2-2.6/src/cmslut.c
-+++ b/third_party/lcms2-2.6/src/cmslut.c
+--- a/third_party/lcms/src/cmslut.c
++++ b/third_party/lcms/src/cmslut.c
@@ -1255,21 +1255,39 @@ cmsStage* CMSEXPORT cmsStageDup(cmsStage* mpe)
// ***********************************************************************************************************
@@ -110,10 +110,10 @@ index 9b0eb4b54..19d43361f 100644
}
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index e5ed06c33..0256e247b 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -1755,8 +1755,8 @@ void *Type_LUT8_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cms
if (!_cmsReadUInt8Number(io, NULL)) goto Error;
diff --git a/third_party/lcms2-2.6/0017-upstream-integer-overflow-MPEmatrix_Read.patch b/third_party/lcms/0017-upstream-integer-overflow-MPEmatrix_Read.patch
index 47df7a887d..70a6bb9b20 100644
--- a/third_party/lcms2-2.6/0017-upstream-integer-overflow-MPEmatrix_Read.patch
+++ b/third_party/lcms/0017-upstream-integer-overflow-MPEmatrix_Read.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmscgats.c b/third_party/lcms2-2.6/src/cmscgats.c
+diff --git a/third_party/lcms/src/cmscgats.c b/third_party/lcms/src/cmscgats.c
index 5720c66a7..cce4cedba 100644
---- a/third_party/lcms2-2.6/src/cmscgats.c
-+++ b/third_party/lcms2-2.6/src/cmscgats.c
+--- a/third_party/lcms/src/cmscgats.c
++++ b/third_party/lcms/src/cmscgats.c
@@ -150,23 +150,24 @@ typedef struct {
SUBALLOCATOR Allocator; // String suballocator -- just to keep it fast
@@ -64,10 +64,10 @@ index 5720c66a7..cce4cedba 100644
ReadReal(it8, it8->inum);
it8->sy = SDNUM;
it8->dnum *= sign;
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 0256e247b..75f1fae32 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -4199,9 +4199,13 @@ void *Type_MPEmatrix_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
if (!_cmsReadUInt16Number(io, &OutputChans)) return NULL;
diff --git a/third_party/lcms2-2.6/0018-verify-size-before-reading.patch b/third_party/lcms/0018-verify-size-before-reading.patch
index fa666e7f0c..e72e310a1b 100644
--- a/third_party/lcms2-2.6/0018-verify-size-before-reading.patch
+++ b/third_party/lcms/0018-verify-size-before-reading.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 75f1fae32..4d96a1ed6 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -173,6 +173,12 @@ cmsBool ReadPositionTable(struct _cms_typehandler_struct* self,
{
cmsUInt32Number i;
diff --git a/third_party/lcms2-2.6/0019-upstream-direct-leak-Type_MPE_Read.patch b/third_party/lcms/0019-upstream-direct-leak-Type_MPE_Read.patch
index 7a2f2788b0..339333188a 100644
--- a/third_party/lcms2-2.6/0019-upstream-direct-leak-Type_MPE_Read.patch
+++ b/third_party/lcms/0019-upstream-direct-leak-Type_MPE_Read.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
+diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 75f1fae32..f92a92822 100644
---- a/third_party/lcms2-2.6/src/cmstypes.c
-+++ b/third_party/lcms2-2.6/src/cmstypes.c
+--- a/third_party/lcms/src/cmstypes.c
++++ b/third_party/lcms/src/cmstypes.c
@@ -4460,18 +4460,19 @@ void *Type_MPE_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
NewLUT = cmsPipelineAlloc(self ->ContextID, InputChans, OutputChans);
if (NewLUT == NULL) return NULL;
diff --git a/third_party/lcms2-2.6/README.pdfium b/third_party/lcms/README.pdfium
index 94dc67a7e3..94dc67a7e3 100644
--- a/third_party/lcms2-2.6/README.pdfium
+++ b/third_party/lcms/README.pdfium
diff --git a/third_party/lcms2-2.6/include/lcms2.h b/third_party/lcms/include/lcms2.h
index 8595f70203..8595f70203 100644
--- a/third_party/lcms2-2.6/include/lcms2.h
+++ b/third_party/lcms/include/lcms2.h
diff --git a/third_party/lcms2-2.6/include/lcms2_plugin.h b/third_party/lcms/include/lcms2_plugin.h
index 0c95d1f73c..0c95d1f73c 100644
--- a/third_party/lcms2-2.6/include/lcms2_plugin.h
+++ b/third_party/lcms/include/lcms2_plugin.h
diff --git a/third_party/lcms2-2.6/src/cmscam02.c b/third_party/lcms/src/cmscam02.c
index 9d874aa205..9d874aa205 100644
--- a/third_party/lcms2-2.6/src/cmscam02.c
+++ b/third_party/lcms/src/cmscam02.c
diff --git a/third_party/lcms2-2.6/src/cmscgats.c b/third_party/lcms/src/cmscgats.c
index cce4cedbad..cce4cedbad 100644
--- a/third_party/lcms2-2.6/src/cmscgats.c
+++ b/third_party/lcms/src/cmscgats.c
diff --git a/third_party/lcms2-2.6/src/cmscnvrt.c b/third_party/lcms/src/cmscnvrt.c
index 1a93e83f90..1a93e83f90 100644
--- a/third_party/lcms2-2.6/src/cmscnvrt.c
+++ b/third_party/lcms/src/cmscnvrt.c
diff --git a/third_party/lcms2-2.6/src/cmserr.c b/third_party/lcms/src/cmserr.c
index f9adc3824a..f9adc3824a 100644
--- a/third_party/lcms2-2.6/src/cmserr.c
+++ b/third_party/lcms/src/cmserr.c
diff --git a/third_party/lcms2-2.6/src/cmsgamma.c b/third_party/lcms/src/cmsgamma.c
index 97aeb7cc16..97aeb7cc16 100644
--- a/third_party/lcms2-2.6/src/cmsgamma.c
+++ b/third_party/lcms/src/cmsgamma.c
diff --git a/third_party/lcms2-2.6/src/cmsgmt.c b/third_party/lcms/src/cmsgmt.c
index 1103363a78..1103363a78 100644
--- a/third_party/lcms2-2.6/src/cmsgmt.c
+++ b/third_party/lcms/src/cmsgmt.c
diff --git a/third_party/lcms2-2.6/src/cmshalf.c b/third_party/lcms/src/cmshalf.c
index f038b57b4c..f038b57b4c 100644
--- a/third_party/lcms2-2.6/src/cmshalf.c
+++ b/third_party/lcms/src/cmshalf.c
diff --git a/third_party/lcms2-2.6/src/cmsintrp.c b/third_party/lcms/src/cmsintrp.c
index 14c68563ca..14c68563ca 100644
--- a/third_party/lcms2-2.6/src/cmsintrp.c
+++ b/third_party/lcms/src/cmsintrp.c
diff --git a/third_party/lcms2-2.6/src/cmsio0.c b/third_party/lcms/src/cmsio0.c
index 3ed730a92a..3ed730a92a 100644
--- a/third_party/lcms2-2.6/src/cmsio0.c
+++ b/third_party/lcms/src/cmsio0.c
diff --git a/third_party/lcms2-2.6/src/cmsio1.c b/third_party/lcms/src/cmsio1.c
index 778aa2b4fc..778aa2b4fc 100644
--- a/third_party/lcms2-2.6/src/cmsio1.c
+++ b/third_party/lcms/src/cmsio1.c
diff --git a/third_party/lcms2-2.6/src/cmslut.c b/third_party/lcms/src/cmslut.c
index 19d43361f0..19d43361f0 100644
--- a/third_party/lcms2-2.6/src/cmslut.c
+++ b/third_party/lcms/src/cmslut.c
diff --git a/third_party/lcms2-2.6/src/cmsmd5.c b/third_party/lcms/src/cmsmd5.c
index a4758ff662..a4758ff662 100644
--- a/third_party/lcms2-2.6/src/cmsmd5.c
+++ b/third_party/lcms/src/cmsmd5.c
diff --git a/third_party/lcms2-2.6/src/cmsmtrx.c b/third_party/lcms/src/cmsmtrx.c
index fb7b91caf1..fb7b91caf1 100644
--- a/third_party/lcms2-2.6/src/cmsmtrx.c
+++ b/third_party/lcms/src/cmsmtrx.c
diff --git a/third_party/lcms2-2.6/src/cmsnamed.c b/third_party/lcms/src/cmsnamed.c
index ef1eb3089e..ef1eb3089e 100644
--- a/third_party/lcms2-2.6/src/cmsnamed.c
+++ b/third_party/lcms/src/cmsnamed.c
diff --git a/third_party/lcms2-2.6/src/cmsopt.c b/third_party/lcms/src/cmsopt.c
index 76de01554c..76de01554c 100644
--- a/third_party/lcms2-2.6/src/cmsopt.c
+++ b/third_party/lcms/src/cmsopt.c
diff --git a/third_party/lcms2-2.6/src/cmspack.c b/third_party/lcms/src/cmspack.c
index 9323b53ec5..9323b53ec5 100644
--- a/third_party/lcms2-2.6/src/cmspack.c
+++ b/third_party/lcms/src/cmspack.c
diff --git a/third_party/lcms2-2.6/src/cmspcs.c b/third_party/lcms/src/cmspcs.c
index 102cd7d21e..102cd7d21e 100644
--- a/third_party/lcms2-2.6/src/cmspcs.c
+++ b/third_party/lcms/src/cmspcs.c
diff --git a/third_party/lcms2-2.6/src/cmsplugin.c b/third_party/lcms/src/cmsplugin.c
index 42c4002b55..42c4002b55 100644
--- a/third_party/lcms2-2.6/src/cmsplugin.c
+++ b/third_party/lcms/src/cmsplugin.c
diff --git a/third_party/lcms2-2.6/src/cmsps2.c b/third_party/lcms/src/cmsps2.c
index 224b44b542..224b44b542 100644
--- a/third_party/lcms2-2.6/src/cmsps2.c
+++ b/third_party/lcms/src/cmsps2.c
diff --git a/third_party/lcms2-2.6/src/cmssamp.c b/third_party/lcms/src/cmssamp.c
index 70e469161f..70e469161f 100644
--- a/third_party/lcms2-2.6/src/cmssamp.c
+++ b/third_party/lcms/src/cmssamp.c
diff --git a/third_party/lcms2-2.6/src/cmssm.c b/third_party/lcms/src/cmssm.c
index 5836e15506..5836e15506 100644
--- a/third_party/lcms2-2.6/src/cmssm.c
+++ b/third_party/lcms/src/cmssm.c
diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms/src/cmstypes.c
index 29806fb194..29806fb194 100644
--- a/third_party/lcms2-2.6/src/cmstypes.c
+++ b/third_party/lcms/src/cmstypes.c
diff --git a/third_party/lcms2-2.6/src/cmsvirt.c b/third_party/lcms/src/cmsvirt.c
index d19ace1651..d19ace1651 100644
--- a/third_party/lcms2-2.6/src/cmsvirt.c
+++ b/third_party/lcms/src/cmsvirt.c
diff --git a/third_party/lcms2-2.6/src/cmswtpnt.c b/third_party/lcms/src/cmswtpnt.c
index 903fdd7497..903fdd7497 100644
--- a/third_party/lcms2-2.6/src/cmswtpnt.c
+++ b/third_party/lcms/src/cmswtpnt.c
diff --git a/third_party/lcms2-2.6/src/cmsxform.c b/third_party/lcms/src/cmsxform.c
index dffe6b2fb7..dffe6b2fb7 100644
--- a/third_party/lcms2-2.6/src/cmsxform.c
+++ b/third_party/lcms/src/cmsxform.c
diff --git a/third_party/lcms2-2.6/src/lcms2_internal.h b/third_party/lcms/src/lcms2_internal.h
index cc76d488d0..1dedf16b8d 100644
--- a/third_party/lcms2-2.6/src/lcms2_internal.h
+++ b/third_party/lcms/src/lcms2_internal.h
@@ -29,7 +29,7 @@
// Include plug-in foundation
#ifndef _lcms_plugin_H
-#include "third_party/lcms2-2.6/include/lcms2_plugin.h"
+#include "third_party/lcms/include/lcms2_plugin.h"
#endif
// ctype is part of C99 as per 7.1.2