Skip to content

Commit e24c2ca

Browse files
committed
Addressing Warnings.
1 parent 99e33f9 commit e24c2ca

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

src/core/transform/ojph_colour.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ namespace ojph {
327327
if (is_signed)
328328
{
329329
const si32 bias = (1 << (bit_depth - 1)) + 1;
330-
for (int i = width; i > 0; --i) {
330+
for (int i = (int)width; i > 0; --i) {
331331
float t = *sp++ * mul;
332332
si32 v = ojph_round(t);
333333
v = t >= fl_low_lim ? v : s32_low_lim;
@@ -340,7 +340,7 @@ namespace ojph {
340340
else
341341
{
342342
const si32 half = 1 << (bit_depth - 1);
343-
for (int i = width; i > 0; --i) {
343+
for (int i = (int)width; i > 0; --i) {
344344
float t = *sp++ * mul;
345345
si32 v = ojph_round(t);
346346
v = t >= fl_low_lim ? v : s32_low_lim;
@@ -388,7 +388,7 @@ namespace ojph {
388388
if (is_signed)
389389
{
390390
si32 bias = (si32)((ui32)INT_MIN + 1);
391-
for (int i = width; i > 0; --i) {
391+
for (int i = (int)width; i > 0; --i) {
392392
si32 v = *sp++ << shift;
393393
if (NLT_TYPE3)
394394
v = (v >= 0) ? v : (- v - bias);
@@ -398,7 +398,7 @@ namespace ojph {
398398
else
399399
{
400400
const ui32 half = (ui32)INT_MIN;
401-
for (int i = width; i > 0; --i) {
401+
for (int i = (int)width; i > 0; --i) {
402402
ui32 v = (ui32)*sp++;
403403
v <<= shift;
404404
v -= half;

src/core/transform/ojph_colour_avx2.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ namespace ojph {
294294
{
295295
__m256i zero = _mm256_setzero_si256();
296296
__m256i bias = _mm256_set1_epi32(-((1 << (bit_depth - 1)) + 1));
297-
for (int i = width; i > 0; i -= 8, sp += 8, dp += 8) {
297+
for (int i = (int)width; i > 0; i -= 8, sp += 8, dp += 8) {
298298
__m256 t = _mm256_loadu_ps(sp);
299299
t = _mm256_mul_ps(t, mul);
300300
__m256i u = _mm256_cvtps_epi32(t);
@@ -314,7 +314,7 @@ namespace ojph {
314314
else
315315
{
316316
__m256i half = _mm256_set1_epi32(1 << (bit_depth - 1));
317-
for (int i = width; i > 0; i -= 8, sp += 8, dp += 8) {
317+
for (int i = (int)width; i > 0; i -= 8, sp += 8, dp += 8) {
318318
__m256 t = _mm256_loadu_ps(sp);
319319
t = _mm256_mul_ps(t, mul);
320320
__m256i u = _mm256_cvtps_epi32(t);
@@ -365,7 +365,7 @@ namespace ojph {
365365
{
366366
__m256i zero = _mm256_setzero_si256();
367367
__m256i bias = _mm256_set1_epi32(-(si32)((ui32)INT_MIN + 1));
368-
for (int i = width; i > 0; i -= 8, sp += 8, dp += 8) {
368+
for (int i = (int)width; i > 0; i -= 8, sp += 8, dp += 8) {
369369
__m256i t = _mm256_loadu_si256((__m256i*)sp);
370370
__m256i u = _mm256_slli_epi32(t, shift);
371371
if (NLT_TYPE3)
@@ -384,7 +384,7 @@ namespace ojph {
384384
else
385385
{
386386
__m256i half = _mm256_set1_epi32(INT_MIN);
387-
for (int i = width; i > 0; i -= 8, sp += 8, dp += 8) {
387+
for (int i = (int)width; i > 0; i -= 8, sp += 8, dp += 8) {
388388
__m256i t = _mm256_loadu_si256((__m256i*)sp);
389389
t = _mm256_slli_epi32(t, shift);
390390
t = _mm256_sub_epi32(t, half);

src/core/transform/ojph_colour_sse2.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ namespace ojph {
161161
{
162162
__m128i zero = _mm_setzero_si128();
163163
__m128i bias = _mm_set1_epi32(-((1 << (bit_depth - 1)) + 1));
164-
for (int i = width; i > 0; i -= 4, sp += 4, dp += 4) {
164+
for (int i = (int)width; i > 0; i -= 4, sp += 4, dp += 4) {
165165
__m128 t = _mm_loadu_ps(sp);
166166
t = _mm_mul_ps(t, mul);
167167
__m128i u = _mm_cvtps_epi32(t);
@@ -181,7 +181,7 @@ namespace ojph {
181181
else
182182
{
183183
__m128i half = _mm_set1_epi32(1 << (bit_depth - 1));
184-
for (int i = width; i > 0; i -= 4, sp += 4, dp += 4) {
184+
for (int i = (int)width; i > 0; i -= 4, sp += 4, dp += 4) {
185185
__m128 t = _mm_loadu_ps(sp);
186186
t = _mm_mul_ps(t, mul);
187187
__m128i u = _mm_cvtps_epi32(t);
@@ -427,7 +427,6 @@ namespace ojph {
427427
(dst_line->flags & line_buf::LFT_INTEGER) == 0);
428428

429429
__m128 mul = _mm_set1_ps((float)(1.0 / 65536.0 / 65536.0));
430-
float mulf = (float)(1.0 / 65536.0 / 65536.0);
431430

432431
const si32* sp = src_line->i32 + src_line_offset;
433432
float* dp = dst_line->f32;
@@ -436,7 +435,7 @@ namespace ojph {
436435
{
437436
__m128i zero = _mm_setzero_si128();
438437
__m128i bias = _mm_set1_epi32(-(si32)((ui32)INT_MIN + 1));
439-
for (int i = width; i > 0; i -= 4, sp += 4, dp += 4) {
438+
for (int i = (int)width; i > 0; i -= 4, sp += 4, dp += 4) {
440439
__m128i t = _mm_loadu_si128((__m128i*)sp);
441440
__m128i u = _mm_slli_epi32(t, shift);
442441
if (NLT_TYPE3)
@@ -455,7 +454,7 @@ namespace ojph {
455454
else
456455
{
457456
__m128i half = _mm_set1_epi32(INT_MIN);
458-
for (int i = width; i > 0; i -= 4, sp += 4, dp += 4) {
457+
for (int i = (int)width; i > 0; i -= 4, sp += 4, dp += 4) {
459458
__m128i t = _mm_loadu_si128((__m128i*)sp);
460459
t = _mm_slli_epi32(t, shift);
461460
t = _mm_sub_epi32(t, half);

src/core/transform/ojph_colour_wasm.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ namespace ojph {
328328
const v128_t zero = wasm_f32x4_splat(0.0f);
329329
const v128_t half = wasm_f32x4_splat(0.5f);
330330
v128_t bias = wasm_i32x4_splat(-((1 << (bit_depth - 1)) + 1));
331-
for (int i = width; i > 0; i -= 4, sp += 4, dp += 4) {
331+
for (int i = (int)width; i > 0; i -= 4, sp += 4, dp += 4) {
332332
v128_t t = wasm_v128_load(sp);
333333
t = wasm_f32x4_mul(t, mul);
334334
v128_t u = ojph_convert_float_to_i32(t, zero, half);
@@ -350,7 +350,7 @@ namespace ojph {
350350
const v128_t zero = wasm_f32x4_splat(0.0f);
351351
const v128_t half = wasm_f32x4_splat(0.5f);
352352
v128_t ihalf = wasm_i32x4_splat(1 << (bit_depth - 1));
353-
for (int i = width; i > 0; i -= 4, sp += 4, dp += 4) {
353+
for (int i = (int)width; i > 0; i -= 4, sp += 4, dp += 4) {
354354
v128_t t = wasm_v128_load(sp);
355355
t = wasm_f32x4_mul(t, mul);
356356
v128_t u = ojph_convert_float_to_i32(t, zero, half);
@@ -401,7 +401,7 @@ namespace ojph {
401401
{
402402
v128_t zero = wasm_i32x4_splat(0);
403403
v128_t bias = wasm_i32x4_splat(-(si32)((ui32)INT_MIN + 1));
404-
for (int i = width; i > 0; i -= 4, sp += 4, dp += 4) {
404+
for (int i = (int)width; i > 0; i -= 4, sp += 4, dp += 4) {
405405
v128_t t = wasm_v128_load(sp);
406406
v128_t u = wasm_i32x4_shl(t, shift);
407407
if (NLT_TYPE3)
@@ -420,7 +420,7 @@ namespace ojph {
420420
else
421421
{
422422
v128_t half = wasm_i32x4_splat(INT_MIN);
423-
for (int i = width; i > 0; i -= 4, sp += 4, dp += 4) {
423+
for (int i = (int)width; i > 0; i -= 4, sp += 4, dp += 4) {
424424
v128_t t = wasm_v128_load(sp);
425425
v128_t u = wasm_i32x4_shl(t, shift);
426426
u = wasm_i32x4_sub(u, half);

0 commit comments

Comments
 (0)