Add and remove explicit type conversions

Change-Id: I8b791fda7c64a0363549add99dc9fcae3b29beae

diff --git a/vp10/common/vp10_inv_txfm.h b/vp10/common/vp10_inv_txfm.h
index 1751f62c3a6d0c5aa5f3155f113344ab83d69f37..b79dde3b38d8b060ea584f4952b0a466d6ef9066 100644 (file)
--- a/vp10/common/vp10_inv_txfm.h
+++ b/vp10/common/vp10_inv_txfm.h
@@ -120,13 +120,13 @@ void vp10_highbd_iadst16_c(const tran_low_t *input, tran_low_t *output, int bd);
 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"

diff --git a/vpx_dsp/inv_txfm.h b/vpx_dsp/inv_txfm.h
index 6397e66b6bb25a7aa1261f44d3add7b18cde452e..6b369ed33dff83a45a0eb164d3b2511e1431ca9e 100644 (file)
--- a/vpx_dsp/inv_txfm.h
+++ b/vpx_dsp/inv_txfm.h
@@ -37,7 +37,7 @@ static INLINE tran_high_t check_range(tran_high_t input) {
 
 static INLINE tran_high_t dct_const_round_shift(tran_high_t input) {
   tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);
-  return (tran_high_t)rv;
+  return rv;
 }
 
 #if CONFIG_VP9_HIGHBITDEPTH
@@ -61,7 +61,7 @@ static INLINE tran_high_t highbd_check_range(tran_high_t input,
 
 static INLINE tran_high_t highbd_dct_const_round_shift(tran_high_t input) {
   tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);
-  return (tran_high_t)rv;
+  return rv;
 }
 #endif  // CONFIG_VP9_HIGHBITDEPTH