diff --git a/plugins/fast_float/src/fast_16_tethra.c b/plugins/fast_float/src/fast_16_tethra.c index 2c312ce9..b08015ba 100644 --- a/plugins/fast_float/src/fast_16_tethra.c +++ b/plugins/fast_float/src/fast_16_tethra.c @@ -112,7 +112,7 @@ void PerformanceEval16(struct _cmstransform_struct *CMMcargo, int in16, out16; // Used by macros! - cmsUInt32Number nalpha, strideIn, strideOut; + size_t nalpha, strideIn, strideOut; cmsUInt32Number dwInFormat = cmsGetTransformInputFormat((cmsHTRANSFORM)CMMcargo); cmsUInt32Number dwOutFormat = cmsGetTransformOutputFormat((cmsHTRANSFORM)CMMcargo); diff --git a/plugins/fast_float/src/fast_8_curves.c b/plugins/fast_float/src/fast_8_curves.c index 1cc15bf9..e5b0f225 100644 --- a/plugins/fast_float/src/fast_8_curves.c +++ b/plugins/fast_float/src/fast_8_curves.c @@ -209,7 +209,7 @@ static void FastEvaluateGrayCurves8(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* gout; cmsUInt8Number* aout = NULL; - cmsUInt32Number nalpha, strideIn, strideOut; + size_t nalpha, strideIn, strideOut; Curves8Data* Data = (Curves8Data*)_cmsGetTransformUserData(CMMcargo); diff --git a/plugins/fast_float/src/fast_8_matsh.c b/plugins/fast_float/src/fast_8_matsh.c index 9461112b..b633b838 100644 --- a/plugins/fast_float/src/fast_8_matsh.c +++ b/plugins/fast_float/src/fast_8_matsh.c @@ -194,7 +194,7 @@ void MatShaperXform8(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* bout; cmsUInt8Number* aout = NULL; - cmsUInt32Number nalpha, strideIn, strideOut; + size_t nalpha, strideIn, strideOut; _cmsComputeComponentIncrements(cmsGetTransformInputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneIn, NULL, &nalpha, SourceStartingOrder, SourceIncrements); _cmsComputeComponentIncrements(cmsGetTransformOutputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneOut, NULL, &nalpha, DestStartingOrder, DestIncrements); diff --git a/plugins/fast_float/src/fast_8_matsh_sse.c b/plugins/fast_float/src/fast_8_matsh_sse.c index 2e4b000d..5d570bb7 100644 --- a/plugins/fast_float/src/fast_8_matsh_sse.c +++ b/plugins/fast_float/src/fast_8_matsh_sse.c @@ -197,7 +197,7 @@ void MatShaperXform8SSE(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* bout; cmsUInt8Number* aout = NULL; - cmsUInt32Number nalpha, strideIn, strideOut; + size_t nalpha, strideIn, strideOut; __m128 mat0 = _mm_load_ps(p->Mat[0]); diff --git a/plugins/fast_float/src/fast_8_tethra.c b/plugins/fast_float/src/fast_8_tethra.c index 91659e8e..fa0ce296 100644 --- a/plugins/fast_float/src/fast_8_tethra.c +++ b/plugins/fast_float/src/fast_8_tethra.c @@ -146,7 +146,7 @@ void PerformanceEval8(struct _cmstransform_struct *CMMcargo, const cmsUInt8Number* bin; const cmsUInt8Number* ain = NULL; - cmsUInt32Number nalpha, strideIn, strideOut; + size_t nalpha, strideIn, strideOut; _cmsComputeComponentIncrements(cmsGetTransformInputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneIn, NULL, &nalpha, SourceStartingOrder, SourceIncrements); _cmsComputeComponentIncrements(cmsGetTransformOutputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneOut, NULL, &nalpha, DestStartingOrder, DestIncrements); diff --git a/plugins/fast_float/src/fast_float_15mats.c b/plugins/fast_float/src/fast_float_15mats.c index 4a1d13d6..a265bba4 100644 --- a/plugins/fast_float/src/fast_float_15mats.c +++ b/plugins/fast_float/src/fast_float_15mats.c @@ -181,7 +181,7 @@ void MatShaperXform(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* bout; cmsUInt8Number* aout = NULL; - cmsUInt32Number nalpha, strideIn, strideOut; + size_t nalpha, strideIn, strideOut; _cmsComputeComponentIncrements(cmsGetTransformInputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneIn, NULL, &nalpha, SourceStartingOrder, SourceIncrements); _cmsComputeComponentIncrements(cmsGetTransformOutputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneOut, NULL, &nalpha, DestStartingOrder, DestIncrements); diff --git a/plugins/fast_float/src/fast_float_cmyk.c b/plugins/fast_float/src/fast_float_cmyk.c index 99d2b3d1..292cf525 100644 --- a/plugins/fast_float/src/fast_float_cmyk.c +++ b/plugins/fast_float/src/fast_float_cmyk.c @@ -113,7 +113,7 @@ void FloatCMYKCLUTEval(struct _cmstransform_struct *CMMcargo, cmsUInt32Number OutputFormat = cmsGetTransformOutputFormat((cmsHTRANSFORM) CMMcargo); cmsUInt32Number nchans, nalpha; - cmsUInt32Number strideIn, strideOut; + size_t strideIn, strideOut; _cmsComputeComponentIncrements(InputFormat, Stride->BytesPerPlaneIn, &nchans, &nalpha, SourceStartingOrder, SourceIncrements); _cmsComputeComponentIncrements(OutputFormat, Stride->BytesPerPlaneOut, &nchans, &nalpha, DestStartingOrder, DestIncrements); diff --git a/plugins/fast_float/src/fast_float_curves.c b/plugins/fast_float/src/fast_float_curves.c index 693a18ff..b4ecc8e8 100644 --- a/plugins/fast_float/src/fast_float_curves.c +++ b/plugins/fast_float/src/fast_float_curves.c @@ -86,7 +86,7 @@ static void FastEvaluateFloatRGBCurves(struct _cmstransform_struct *CMMcargo, CurvesFloatData* Data = (CurvesFloatData*) _cmsGetTransformUserData(CMMcargo); cmsUInt32Number nchans, nalpha; - cmsUInt32Number strideIn, strideOut; + size_t strideIn, strideOut; _cmsComputeComponentIncrements(InputFormat, Stride->BytesPerPlaneIn, &nchans, &nalpha, SourceStartingOrder, SourceIncrements); _cmsComputeComponentIncrements(OutputFormat, Stride->BytesPerPlaneOut, &nchans, &nalpha, DestStartingOrder, DestIncrements); diff --git a/plugins/fast_float/src/fast_float_lab.c b/plugins/fast_float/src/fast_float_lab.c index 68c33577..495da648 100644 --- a/plugins/fast_float/src/fast_float_lab.c +++ b/plugins/fast_float/src/fast_float_lab.c @@ -200,7 +200,7 @@ void LabCLUTEval(struct _cmstransform_struct* CMMcargo, cmsUInt32Number OutputFormat = cmsGetTransformOutputFormat((cmsHTRANSFORM)CMMcargo); cmsUInt32Number nchans, nalpha; - cmsUInt32Number strideIn, strideOut; + size_t strideIn, strideOut; _cmsComputeComponentIncrements(InputFormat, Stride->BytesPerPlaneIn, &nchans, &nalpha, SourceStartingOrder, SourceIncrements); _cmsComputeComponentIncrements(OutputFormat, Stride->BytesPerPlaneOut, &nchans, &nalpha, DestStartingOrder, DestIncrements); diff --git a/plugins/fast_float/src/fast_float_matsh.c b/plugins/fast_float/src/fast_float_matsh.c index c51d5bd3..aff31653 100644 --- a/plugins/fast_float/src/fast_float_matsh.c +++ b/plugins/fast_float/src/fast_float_matsh.c @@ -163,7 +163,7 @@ void MatShaperFloat(struct _cmstransform_struct* CMMcargo, cmsUInt8Number* aout = NULL; cmsUInt32Number nchans, nalpha; - cmsUInt32Number strideIn, strideOut; + size_t strideIn, strideOut; _cmsComputeComponentIncrements(cmsGetTransformInputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneIn, &nchans, &nalpha, SourceStartingOrder, SourceIncrements); _cmsComputeComponentIncrements(cmsGetTransformOutputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneOut, &nchans, &nalpha, DestStartingOrder, DestIncrements); diff --git a/plugins/fast_float/src/fast_float_tethra.c b/plugins/fast_float/src/fast_float_tethra.c index a3d88219..64be314a 100644 --- a/plugins/fast_float/src/fast_float_tethra.c +++ b/plugins/fast_float/src/fast_float_tethra.c @@ -97,7 +97,7 @@ void FloatCLUTEval(struct _cmstransform_struct* CMMcargo, cmsUInt32Number OutputFormat = cmsGetTransformOutputFormat((cmsHTRANSFORM)CMMcargo); cmsUInt32Number nchans, nalpha; - cmsUInt32Number strideIn, strideOut; + size_t strideIn, strideOut; _cmsComputeComponentIncrements(InputFormat, Stride->BytesPerPlaneIn, &nchans, &nalpha, SourceStartingOrder, SourceIncrements); _cmsComputeComponentIncrements(OutputFormat, Stride->BytesPerPlaneOut, &nchans, &nalpha, DestStartingOrder, DestIncrements); diff --git a/src/cmsalpha.c b/src/cmsalpha.c index 23cfb875..a5f1a165 100644 --- a/src/cmsalpha.c +++ b/src/cmsalpha.c @@ -583,8 +583,8 @@ void _cmsHandleExtraChannels(_cmsTRANSFORM* p, const void* in, cmsUInt8Number* SourcePtr; cmsUInt8Number* DestPtr; - cmsUInt32Number SourceStrideIncrement = 0; - cmsUInt32Number DestStrideIncrement = 0; + size_t SourceStrideIncrement = 0; + size_t DestStrideIncrement = 0; // The loop itself for (i = 0; i < LineCount; i++) { @@ -611,8 +611,8 @@ void _cmsHandleExtraChannels(_cmsTRANSFORM* p, const void* in, cmsUInt8Number* SourcePtr[cmsMAXCHANNELS]; cmsUInt8Number* DestPtr[cmsMAXCHANNELS]; - cmsUInt32Number SourceStrideIncrements[cmsMAXCHANNELS]; - cmsUInt32Number DestStrideIncrements[cmsMAXCHANNELS]; + size_t SourceStrideIncrements[cmsMAXCHANNELS]; + size_t DestStrideIncrements[cmsMAXCHANNELS]; memset(SourceStrideIncrements, 0, sizeof(SourceStrideIncrements)); memset(DestStrideIncrements, 0, sizeof(DestStrideIncrements)); diff --git a/src/cmsxform.c b/src/cmsxform.c index 389cc21f..45445553 100644 --- a/src/cmsxform.c +++ b/src/cmsxform.c @@ -266,7 +266,7 @@ void FloatXFORM(_cmsTRANSFORM* p, cmsUInt8Number* output; cmsFloat32Number fIn[cmsMAXCHANNELS], fOut[cmsMAXCHANNELS]; cmsFloat32Number OutOfGamut; - cmsUInt32Number i, j, c, strideIn, strideOut; + size_t i, j, c, strideIn, strideOut; _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); @@ -332,7 +332,7 @@ void NullFloatXFORM(_cmsTRANSFORM* p, cmsUInt8Number* accum; cmsUInt8Number* output; cmsFloat32Number fIn[cmsMAXCHANNELS]; - cmsUInt32Number i, j, strideIn, strideOut; + size_t i, j, strideIn, strideOut; _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); @@ -370,7 +370,7 @@ void NullXFORM(_cmsTRANSFORM* p, cmsUInt8Number* accum; cmsUInt8Number* output; cmsUInt16Number wIn[cmsMAXCHANNELS]; - cmsUInt32Number i, j, strideIn, strideOut; + size_t i, j, strideIn, strideOut; _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); @@ -380,17 +380,17 @@ void NullXFORM(_cmsTRANSFORM* p, for (i = 0; i < LineCount; i++) { - accum = (cmsUInt8Number*)in + strideIn; - output = (cmsUInt8Number*)out + strideOut; + accum = (cmsUInt8Number*)in + strideIn; + output = (cmsUInt8Number*)out + strideOut; - for (j = 0; j < PixelsPerLine; j++) { + for (j = 0; j < PixelsPerLine; j++) { - accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn); - output = p->ToOutput(p, wIn, output, Stride->BytesPerPlaneOut); - } + accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn); + output = p->ToOutput(p, wIn, output, Stride->BytesPerPlaneOut); + } - strideIn += Stride->BytesPerLineIn; - strideOut += Stride->BytesPerLineOut; + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; } } @@ -408,7 +408,7 @@ void PrecalculatedXFORM(_cmsTRANSFORM* p, CMSREGISTER cmsUInt8Number* accum; CMSREGISTER cmsUInt8Number* output; cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS]; - cmsUInt32Number i, j, strideIn, strideOut; + size_t i, j, strideIn, strideOut; _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); @@ -471,7 +471,7 @@ void PrecalculatedXFORMGamutCheck(_cmsTRANSFORM* p, cmsUInt8Number* accum; cmsUInt8Number* output; cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS]; - cmsUInt32Number i, j, strideIn, strideOut; + size_t i, j, strideIn, strideOut; _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); @@ -482,18 +482,18 @@ void PrecalculatedXFORMGamutCheck(_cmsTRANSFORM* p, for (i = 0; i < LineCount; i++) { - accum = (cmsUInt8Number*)in + strideIn; - output = (cmsUInt8Number*)out + strideOut; + accum = (cmsUInt8Number*)in + strideIn; + output = (cmsUInt8Number*)out + strideOut; - for (j = 0; j < PixelsPerLine; j++) { + for (j = 0; j < PixelsPerLine; j++) { - accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn); - TransformOnePixelWithGamutCheck(p, wIn, wOut); - output = p->ToOutput(p, wOut, output, Stride->BytesPerPlaneOut); - } + accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn); + TransformOnePixelWithGamutCheck(p, wIn, wOut); + output = p->ToOutput(p, wOut, output, Stride->BytesPerPlaneOut); + } - strideIn += Stride->BytesPerLineIn; - strideOut += Stride->BytesPerLineOut; + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; } } @@ -511,7 +511,7 @@ void CachedXFORM(_cmsTRANSFORM* p, cmsUInt8Number* output; cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS]; _cmsCACHE Cache; - cmsUInt32Number i, j, strideIn, strideOut; + size_t i, j, strideIn, strideOut; _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); @@ -566,7 +566,7 @@ void CachedXFORMGamutCheck(_cmsTRANSFORM* p, cmsUInt8Number* output; cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS]; _cmsCACHE Cache; - cmsUInt32Number i, j, strideIn, strideOut; + size_t i, j, strideIn, strideOut; _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); @@ -683,7 +683,7 @@ void _cmsTransform2toTransformAdaptor(struct _cmstransform_struct *CMMcargo, const cmsStride* Stride) { - cmsUInt32Number i, strideIn, strideOut; + size_t i, strideIn, strideOut; _cmsHandleExtraChannels(CMMcargo, InputBuffer, OutputBuffer, PixelsPerLine, LineCount, Stride); diff --git a/testbed/new.icc b/testbed/new.icc index 1752f991..9ef11bd2 100644 Binary files a/testbed/new.icc and b/testbed/new.icc differ