1*3ac0a46fSAndroid Build Coastguard Workerdiff --git a/third_party/lcms/src/cmsalpha.c b/third_party/lcms/src/cmsalpha.c 2*3ac0a46fSAndroid Build Coastguard Workerindex 374555658..a2113180c 100644 3*3ac0a46fSAndroid Build Coastguard Worker--- a/third_party/lcms/src/cmsalpha.c 4*3ac0a46fSAndroid Build Coastguard Worker+++ b/third_party/lcms/src/cmsalpha.c 5*3ac0a46fSAndroid Build Coastguard Worker@@ -377,7 +377,7 @@ int FormatterPos(cmsUInt32Number frm) 6*3ac0a46fSAndroid Build Coastguard Worker static 7*3ac0a46fSAndroid Build Coastguard Worker cmsFormatterAlphaFn _cmsGetFormatterAlpha(cmsContext id, cmsUInt32Number in, cmsUInt32Number out) 8*3ac0a46fSAndroid Build Coastguard Worker { 9*3ac0a46fSAndroid Build Coastguard Worker-static cmsFormatterAlphaFn FormattersAlpha[6][6] = { 10*3ac0a46fSAndroid Build Coastguard Worker+static const cmsFormatterAlphaFn FormattersAlpha[6][6] = { 11*3ac0a46fSAndroid Build Coastguard Worker 12*3ac0a46fSAndroid Build Coastguard Worker /* from 8 */ { copy8, from8to16, from8to16SE, from8toHLF, from8toFLT, from8toDBL }, 13*3ac0a46fSAndroid Build Coastguard Worker /* from 16*/ { from16to8, copy16, from16to16, from16toHLF, from16toFLT, from16toDBL }, 14*3ac0a46fSAndroid Build Coastguard Workerdiff --git a/third_party/lcms/src/cmsgamma.c b/third_party/lcms/src/cmsgamma.c 15*3ac0a46fSAndroid Build Coastguard Workerindex 54dd78912..f15a5f1a8 100644 16*3ac0a46fSAndroid Build Coastguard Worker--- a/third_party/lcms/src/cmsgamma.c 17*3ac0a46fSAndroid Build Coastguard Worker+++ b/third_party/lcms/src/cmsgamma.c 18*3ac0a46fSAndroid Build Coastguard Worker@@ -58,7 +58,7 @@ typedef struct _cmsParametricCurvesCollection_st { 19*3ac0a46fSAndroid Build Coastguard Worker static cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Number Params[], cmsFloat64Number R); 20*3ac0a46fSAndroid Build Coastguard Worker 21*3ac0a46fSAndroid Build Coastguard Worker // The built-in list 22*3ac0a46fSAndroid Build Coastguard Worker-static _cmsParametricCurvesCollection DefaultCurves = { 23*3ac0a46fSAndroid Build Coastguard Worker+static const _cmsParametricCurvesCollection DefaultCurves = { 24*3ac0a46fSAndroid Build Coastguard Worker 10, // # of curve types 25*3ac0a46fSAndroid Build Coastguard Worker { 1, 2, 3, 4, 5, 6, 7, 8, 108, 109 }, // Parametric curve ID 26*3ac0a46fSAndroid Build Coastguard Worker { 1, 3, 4, 5, 7, 4, 5, 5, 1, 1 }, // Parameters by type 27*3ac0a46fSAndroid Build Coastguard Worker@@ -162,7 +162,7 @@ cmsBool _cmsRegisterParametricCurvesPlugin(cmsContext ContextID, cmsPluginBase* 28*3ac0a46fSAndroid Build Coastguard Worker 29*3ac0a46fSAndroid Build Coastguard Worker // Search in type list, return position or -1 if not found 30*3ac0a46fSAndroid Build Coastguard Worker static 31*3ac0a46fSAndroid Build Coastguard Worker-int IsInSet(int Type, _cmsParametricCurvesCollection* c) 32*3ac0a46fSAndroid Build Coastguard Worker+int IsInSet(int Type, const _cmsParametricCurvesCollection* c) 33*3ac0a46fSAndroid Build Coastguard Worker { 34*3ac0a46fSAndroid Build Coastguard Worker int i; 35*3ac0a46fSAndroid Build Coastguard Worker 36*3ac0a46fSAndroid Build Coastguard Worker@@ -175,9 +175,9 @@ int IsInSet(int Type, _cmsParametricCurvesCollection* c) 37*3ac0a46fSAndroid Build Coastguard Worker 38*3ac0a46fSAndroid Build Coastguard Worker // Search for the collection which contains a specific type 39*3ac0a46fSAndroid Build Coastguard Worker static 40*3ac0a46fSAndroid Build Coastguard Worker-_cmsParametricCurvesCollection *GetParametricCurveByType(cmsContext ContextID, int Type, int* index) 41*3ac0a46fSAndroid Build Coastguard Worker+const _cmsParametricCurvesCollection *GetParametricCurveByType(cmsContext ContextID, int Type, int* index) 42*3ac0a46fSAndroid Build Coastguard Worker { 43*3ac0a46fSAndroid Build Coastguard Worker- _cmsParametricCurvesCollection* c; 44*3ac0a46fSAndroid Build Coastguard Worker+ const _cmsParametricCurvesCollection* c; 45*3ac0a46fSAndroid Build Coastguard Worker int Position; 46*3ac0a46fSAndroid Build Coastguard Worker _cmsCurvesPluginChunkType* ctx = ( _cmsCurvesPluginChunkType*) _cmsContextGetClientChunk(ContextID, CurvesPlugin); 47*3ac0a46fSAndroid Build Coastguard Worker 48*3ac0a46fSAndroid Build Coastguard Worker@@ -270,7 +270,7 @@ cmsToneCurve* AllocateToneCurveStruct(cmsContext ContextID, cmsUInt32Number nEnt 49*3ac0a46fSAndroid Build Coastguard Worker // is placed in advance to maximize performance. 50*3ac0a46fSAndroid Build Coastguard Worker if (Segments != NULL && (nSegments > 0)) { 51*3ac0a46fSAndroid Build Coastguard Worker 52*3ac0a46fSAndroid Build Coastguard Worker- _cmsParametricCurvesCollection *c; 53*3ac0a46fSAndroid Build Coastguard Worker+ const _cmsParametricCurvesCollection *c; 54*3ac0a46fSAndroid Build Coastguard Worker 55*3ac0a46fSAndroid Build Coastguard Worker p ->SegInterp = (cmsInterpParams**) _cmsCalloc(ContextID, nSegments, sizeof(cmsInterpParams*)); 56*3ac0a46fSAndroid Build Coastguard Worker if (p ->SegInterp == NULL) goto Error; 57*3ac0a46fSAndroid Build Coastguard Worker@@ -824,7 +824,7 @@ cmsToneCurve* CMSEXPORT cmsBuildParametricToneCurve(cmsContext ContextID, cmsInt 58*3ac0a46fSAndroid Build Coastguard Worker cmsCurveSegment Seg0; 59*3ac0a46fSAndroid Build Coastguard Worker int Pos = 0; 60*3ac0a46fSAndroid Build Coastguard Worker cmsUInt32Number size; 61*3ac0a46fSAndroid Build Coastguard Worker- _cmsParametricCurvesCollection* c = GetParametricCurveByType(ContextID, Type, &Pos); 62*3ac0a46fSAndroid Build Coastguard Worker+ const _cmsParametricCurvesCollection* c = GetParametricCurveByType(ContextID, Type, &Pos); 63*3ac0a46fSAndroid Build Coastguard Worker 64*3ac0a46fSAndroid Build Coastguard Worker _cmsAssert(Params != NULL); 65*3ac0a46fSAndroid Build Coastguard Worker 66