diff options
| author | kcwu <kcwu@chromium.org> | 2016-10-17 06:37:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-17 06:37:25 -0700 |
| commit | 522ed14ce8cf39e5e6fc1a58099edd4f849b7fb8 (patch) | |
| tree | 1bc878fd5ff7acbfca6f7585e0df00e6d2bddc13 /third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch | |
| parent | 85fcf94eeae589641213c4301bbb16b44b10a282 (diff) | |
| download | pdfium-522ed14ce8cf39e5e6fc1a58099edd4f849b7fb8.tar.xz | |
lcms: Revise previous cmsStageAllocMatrix fix
Also fixed wrong patch file name.
This is fixup of 958e57cb and d2023170
TEST=apply this change in lcms' repo and make check
BUG=chromium:651849,chromium:654198
Review-Url: https://codereview.chromium.org/2424803002
Diffstat (limited to 'third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch')
| -rw-r--r-- | third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch | 26 |
1 files changed, 0 insertions, 26 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 deleted file mode 100644 index 59ffbd423f..0000000000 --- a/third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 -+++ b/third_party/lcms2-2.6/src/cmstypes.c -@@ -4225,7 +4225,7 @@ void *Type_MPEmatrix_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io - } - - -- mpe = cmsStageAllocMatrix(self ->ContextID, OutputChans, InputChans, Matrix, Offsets); -+ mpe = cmsStageAllocMatrix(self ->ContextID, InputChans, OutputChans, Matrix, Offsets); - _cmsFree(self ->ContextID, Matrix); - _cmsFree(self ->ContextID, Offsets); - |