diff --git a/plugins/fast_float/src/fast_16_tethra.c b/plugins/fast_float/src/fast_16_tethra.c index b08015ba..f70d3f47 100644 --- a/plugins/fast_float/src/fast_16_tethra.c +++ b/plugins/fast_float/src/fast_16_tethra.c @@ -112,7 +112,8 @@ void PerformanceEval16(struct _cmstransform_struct *CMMcargo, int in16, out16; // Used by macros! - size_t nalpha, strideIn, strideOut; + cmsUInt32Number nalpha; + size_t 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 e5b0f225..b01f944f 100644 --- a/plugins/fast_float/src/fast_8_curves.c +++ b/plugins/fast_float/src/fast_8_curves.c @@ -56,7 +56,8 @@ static void FastEvaluateRGBCurves8(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* bout; cmsUInt8Number* aout = NULL; - cmsUInt32Number nalpha, strideIn, strideOut; + cmsUInt32Number nalpha; + size_t strideIn, strideOut; Curves8Data* Data = (Curves8Data*)_cmsGetTransformUserData(CMMcargo); @@ -135,7 +136,8 @@ static void FastRGBIdentity8(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* bout; cmsUInt8Number* aout = NULL; - cmsUInt32Number nalpha, strideIn, strideOut; + cmsUInt32Number nalpha; + size_t strideIn, strideOut; _cmsComputeComponentIncrements(cmsGetTransformInputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneIn, NULL, &nalpha, SourceStartingOrder, SourceIncrements); _cmsComputeComponentIncrements(cmsGetTransformOutputFormat((cmsHTRANSFORM)CMMcargo), Stride->BytesPerPlaneOut, NULL, &nalpha, DestStartingOrder, DestIncrements); @@ -209,7 +211,8 @@ static void FastEvaluateGrayCurves8(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* gout; cmsUInt8Number* aout = NULL; - size_t nalpha, strideIn, strideOut; + cmsUInt32Number nalpha; + size_t strideIn, strideOut; Curves8Data* Data = (Curves8Data*)_cmsGetTransformUserData(CMMcargo); @@ -274,7 +277,8 @@ static void FastGrayIdentity8(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* gout; cmsUInt8Number* aout = NULL; - cmsUInt32Number nalpha, strideIn, strideOut; + cmsUInt32Number nalpha; + size_t 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.c b/plugins/fast_float/src/fast_8_matsh.c index b633b838..4cf72c4d 100644 --- a/plugins/fast_float/src/fast_8_matsh.c +++ b/plugins/fast_float/src/fast_8_matsh.c @@ -194,7 +194,8 @@ void MatShaperXform8(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* bout; cmsUInt8Number* aout = NULL; - size_t nalpha, strideIn, strideOut; + cmsUInt32Number nalpha; + size_t 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 5d570bb7..5975d30e 100644 --- a/plugins/fast_float/src/fast_8_matsh_sse.c +++ b/plugins/fast_float/src/fast_8_matsh_sse.c @@ -197,7 +197,8 @@ void MatShaperXform8SSE(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* bout; cmsUInt8Number* aout = NULL; - size_t nalpha, strideIn, strideOut; + cmsUInt32Number nalpha; + size_t 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 fa0ce296..cda4d411 100644 --- a/plugins/fast_float/src/fast_8_tethra.c +++ b/plugins/fast_float/src/fast_8_tethra.c @@ -146,7 +146,8 @@ void PerformanceEval8(struct _cmstransform_struct *CMMcargo, const cmsUInt8Number* bin; const cmsUInt8Number* ain = NULL; - size_t nalpha, strideIn, strideOut; + cmsUInt32Number nalpha; + size_t 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 a265bba4..fd2a5982 100644 --- a/plugins/fast_float/src/fast_float_15mats.c +++ b/plugins/fast_float/src/fast_float_15mats.c @@ -181,7 +181,8 @@ void MatShaperXform(struct _cmstransform_struct *CMMcargo, cmsUInt8Number* bout; cmsUInt8Number* aout = NULL; - size_t nalpha, strideIn, strideOut; + cmsUInt32Number nalpha; + size_t 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_curves.c b/plugins/fast_float/src/fast_float_curves.c index b4ecc8e8..cdb3bc97 100644 --- a/plugins/fast_float/src/fast_float_curves.c +++ b/plugins/fast_float/src/fast_float_curves.c @@ -166,7 +166,7 @@ static void FastFloatRGBIdentity(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); @@ -245,7 +245,7 @@ static void FastEvaluateFloatGrayCurves(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->BytesPerPlaneIn, &nchans, &nalpha, DestStartingOrder, DestIncrements); @@ -308,7 +308,7 @@ static void FastFloatGrayIdentity(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);