summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorkcwu <kcwu@chromium.org>2016-10-11 07:50:37 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-11 07:50:37 -0700
commitd2023170190b4eb278054fd84765412c1a6ccddd (patch)
tree9e470f0d9fbf9139f172532b1b20c59a82801e10 /third_party
parent10a285391c74845898830f8167bcfc467665b0f8 (diff)
downloadpdfium-d2023170190b4eb278054fd84765412c1a6ccddd.tar.xz
Fix cmdStageAllocMatrix parameter swap again
This is fixup of 958e57cb. BUG=chromium:651849,chromium:654198 Review-Url: https://codereview.chromium.org/2407113002
Diffstat (limited to 'third_party')
-rw-r--r--third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch13
-rw-r--r--third_party/lcms2-2.6/src/cmslut.c2
2 files changed, 14 insertions, 1 deletions
diff --git a/third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch b/third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch
index cb4156936d..59ffbd423f 100644
--- a/third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch
+++ b/third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch
@@ -1,3 +1,16 @@
+diff --git a/third_party/lcms2-2.6/src/cmslut.c b/third_party/lcms2-2.6/src/cmslut.c
+index 73e6726..8d5aa60 100644
+--- a/third_party/lcms2-2.6/src/cmslut.c
++++ b/third_party/lcms2-2.6/src/cmslut.c
+@@ -391,7 +391,7 @@ cmsStage* CMSEXPORT cmsStageAllocMatrix(cmsContext ContextID, cmsUInt32Number R
+ if (n >= UINT_MAX / Rows) return NULL;
+ if (n < Rows || n < Cols) return NULL;
+
+- NewMPE = _cmsStageAllocPlaceholder(ContextID, cmsSigMatrixElemType, Cols, Rows,
++ NewMPE = _cmsStageAllocPlaceholder(ContextID, cmsSigMatrixElemType, Rows, Cols,
+ EvaluateMatrix, MatrixElemDup, MatrixElemTypeFree, NULL );
+ if (NewMPE == NULL) return NULL;
+
diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
index 15199c7..6f335d9 100644
--- a/third_party/lcms2-2.6/src/cmstypes.c
diff --git a/third_party/lcms2-2.6/src/cmslut.c b/third_party/lcms2-2.6/src/cmslut.c
index 73e6726bf4..8d5aa60bfb 100644
--- a/third_party/lcms2-2.6/src/cmslut.c
+++ b/third_party/lcms2-2.6/src/cmslut.c
@@ -391,7 +391,7 @@ cmsStage* CMSEXPORT cmsStageAllocMatrix(cmsContext ContextID, cmsUInt32Number R
if (n >= UINT_MAX / Rows) return NULL;
if (n < Rows || n < Cols) return NULL;
- NewMPE = _cmsStageAllocPlaceholder(ContextID, cmsSigMatrixElemType, Cols, Rows,
+ NewMPE = _cmsStageAllocPlaceholder(ContextID, cmsSigMatrixElemType, Rows, Cols,
EvaluateMatrix, MatrixElemDup, MatrixElemTypeFree, NULL );
if (NewMPE == NULL) return NULL;