summaryrefslogtreecommitdiff
path: root/third_party/lcms2-2.6/src/cmslut.c
diff options
context:
space:
mode:
authorkcwu <kcwu@chromium.org>2016-10-17 06:37:25 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-17 06:37:25 -0700
commit522ed14ce8cf39e5e6fc1a58099edd4f849b7fb8 (patch)
tree1bc878fd5ff7acbfca6f7585e0df00e6d2bddc13 /third_party/lcms2-2.6/src/cmslut.c
parent85fcf94eeae589641213c4301bbb16b44b10a282 (diff)
downloadpdfium-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/src/cmslut.c')
-rw-r--r--third_party/lcms2-2.6/src/cmslut.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/lcms2-2.6/src/cmslut.c b/third_party/lcms2-2.6/src/cmslut.c
index 8d5aa60bfb..9b0eb4b549 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, Rows, Cols,
+ NewMPE = _cmsStageAllocPlaceholder(ContextID, cmsSigMatrixElemType, Cols, Rows,
EvaluateMatrix, MatrixElemDup, MatrixElemTypeFree, NULL );
if (NewMPE == NULL) return NULL;
@@ -414,13 +414,13 @@ cmsStage* CMSEXPORT cmsStageAllocMatrix(cmsContext ContextID, cmsUInt32Number R
if (Offset != NULL) {
- NewElem ->Offset = (cmsFloat64Number*) _cmsCalloc(ContextID, Cols, sizeof(cmsFloat64Number));
+ NewElem ->Offset = (cmsFloat64Number*) _cmsCalloc(ContextID, Rows, sizeof(cmsFloat64Number));
if (NewElem->Offset == NULL) {
MatrixElemTypeFree(NewMPE);
return NULL;
}
- for (i=0; i < Cols; i++) {
+ for (i=0; i < Rows; i++) {
NewElem ->Offset[i] = Offset[i];
}