Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Side by Side Diff: third_party/lcms2-2.6/0009-cmdStageAllocMatrix-param-swap.patch

Issue 2424803002: lcms: Revise previous cmsStageAllocMatrix fix (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/lcms2-2.6/0009-cmsStageAllocMatrix-param-swap.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/third_party/lcms2-2.6/src/cmslut.c b/third_party/lcms2-2.6/src/cmsl ut.c
2 index 73e6726..8d5aa60 100644
3 --- a/third_party/lcms2-2.6/src/cmslut.c
4 +++ b/third_party/lcms2-2.6/src/cmslut.c
5 @@ -391,7 +391,7 @@ cmsStage* CMSEXPORT cmsStageAllocMatrix(cmsContext ContextI D, cmsUInt32Number R
6 if (n >= UINT_MAX / Rows) return NULL;
7 if (n < Rows || n < Cols) return NULL;
8
9 - NewMPE = _cmsStageAllocPlaceholder(ContextID, cmsSigMatrixElemType, Cols, R ows,
10 + NewMPE = _cmsStageAllocPlaceholder(ContextID, cmsSigMatrixElemType, Rows, C ols,
11 EvaluateMatrix, MatrixElemDup, MatrixElemT ypeFree, NULL );
12 if (NewMPE == NULL) return NULL;
13
14 diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cm stypes.c
15 index 15199c7..6f335d9 100644
16 --- a/third_party/lcms2-2.6/src/cmstypes.c
17 +++ b/third_party/lcms2-2.6/src/cmstypes.c
18 @@ -4225,7 +4225,7 @@ void *Type_MPEmatrix_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
19 }
20
21
22 - mpe = cmsStageAllocMatrix(self ->ContextID, OutputChans, InputChans, Matrix , Offsets);
23 + mpe = cmsStageAllocMatrix(self ->ContextID, InputChans, OutputChans, Matrix , Offsets);
24 _cmsFree(self ->ContextID, Matrix);
25 _cmsFree(self ->ContextID, Offsets);
26
OLDNEW
« no previous file with comments | « no previous file | third_party/lcms2-2.6/0009-cmsStageAllocMatrix-param-swap.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698