shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Make type conversion explicit"

--- a/vpx_dsp/inv_txfm.h

+++ b/vpx_dsp/inv_txfm.h

@@ -118,13 +118,13 @@

 static INLINE uint16_t highbd_clip_pixel_add(uint16_t dest, tran_high_t trans,

                                              int bd) {

   trans = HIGHBD_WRAPLOW(trans, bd);

-  return clip_pixel_highbd(dest + trans, bd);

+  return clip_pixel_highbd(dest + (int)trans, bd);

 }

 #endif

 static INLINE uint8_t clip_pixel_add(uint8_t dest, tran_high_t trans) {

   trans = WRAPLOW(trans);

-  return clip_pixel(dest + trans);

+  return clip_pixel(dest + (int)trans);

 }

 #ifdef __cplusplus

 }  // extern "C"

--- a/vpx_dsp/x86/inv_txfm_sse2.c

+++ b/vpx_dsp/x86/inv_txfm_sse2.c

@@ -158,8 +158,8 @@

   const __m128i zero = _mm_setzero_si128();

   int a;

-  a = dct_const_round_shift(input[0] * cospi_16_64);

-  a = dct_const_round_shift(a * cospi_16_64);

+  a = (int)dct_const_round_shift(input[0] * cospi_16_64);

+  a = (int)dct_const_round_shift(a * cospi_16_64);

   a = ROUND_POWER_OF_TWO(a, 4);

   dc_value = _mm_set1_epi16(a);

@@ -527,8 +527,8 @@

   const __m128i zero = _mm_setzero_si128();

   int a;

-  a = dct_const_round_shift(input[0] * cospi_16_64);

-  a = dct_const_round_shift(a * cospi_16_64);

+  a = (int)dct_const_round_shift(input[0] * cospi_16_64);

+  a = (int)dct_const_round_shift(a * cospi_16_64);

   a = ROUND_POWER_OF_TWO(a, 5);

   dc_value = _mm_set1_epi16(a);

@@ -1305,8 +1305,8 @@

   const __m128i zero = _mm_setzero_si128();

   int a, i;

-  a = dct_const_round_shift(input[0] * cospi_16_64);

-  a = dct_const_round_shift(a * cospi_16_64);

+  a = (int)dct_const_round_shift(input[0] * cospi_16_64);

+  a = (int)dct_const_round_shift(a * cospi_16_64);

   a = ROUND_POWER_OF_TWO(a, 6);

   dc_value = _mm_set1_epi16(a);

@@ -3462,8 +3462,8 @@

   const __m128i zero = _mm_setzero_si128();

   int a, j;

-  a = dct_const_round_shift(input[0] * cospi_16_64);

-  a = dct_const_round_shift(a * cospi_16_64);

+  a = (int)dct_const_round_shift(input[0] * cospi_16_64);

+  a = (int)dct_const_round_shift(a * cospi_16_64);

   a = ROUND_POWER_OF_TWO(a, 6);

   dc_value = _mm_set1_epi16(a);