diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-09-26 09:20:15 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2013-09-26 09:20:15 -0700 |
| commit | da0ce28fe3a73905b2cd7a07f3298a229a16c03d (patch) | |
| tree | 1a7b53c05c137ee608a18a94ae0fb0ce2298a944 /vp8/encoder/dct.c | |
| parent | 7755b9dada8881660826085d8ee8d9034a5c7c53 (diff) | |
| download | libvpx-da0ce28fe3a73905b2cd7a07f3298a229a16c03d.tar libvpx-da0ce28fe3a73905b2cd7a07f3298a229a16c03d.tar.gz libvpx-da0ce28fe3a73905b2cd7a07f3298a229a16c03d.tar.bz2 libvpx-da0ce28fe3a73905b2cd7a07f3298a229a16c03d.zip | |
fixed integer overflow warnings
Jenkins warns on left shift of negative numbers and non-aligned read
of int. This commit fixed the two issues.
Change-Id: I389a7fb6a572c643902e40a4c10fefef94500d2c
Diffstat (limited to 'vp8/encoder/dct.c')
| -rw-r--r-- | vp8/encoder/dct.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vp8/encoder/dct.c b/vp8/encoder/dct.c index b5a11ae34..091554a5d 100644 --- a/vp8/encoder/dct.c +++ b/vp8/encoder/dct.c @@ -20,10 +20,10 @@ void vp8_short_fdct4x4_c(short *input, short *output, int pitch) for (i = 0; i < 4; i++) { - a1 = ((ip[0] + ip[3])<<3); - b1 = ((ip[1] + ip[2])<<3); - c1 = ((ip[1] - ip[2])<<3); - d1 = ((ip[0] - ip[3])<<3); + a1 = ((ip[0] + ip[3]) * 8); + b1 = ((ip[1] + ip[2]) * 8); + c1 = ((ip[1] - ip[2]) * 8); + d1 = ((ip[0] - ip[3]) * 8); op[0] = a1 + b1; op[2] = a1 - b1; @@ -72,10 +72,10 @@ void vp8_short_walsh4x4_c(short *input, short *output, int pitch) for (i = 0; i < 4; i++) { - a1 = ((ip[0] + ip[2])<<2); - d1 = ((ip[1] + ip[3])<<2); - c1 = ((ip[1] - ip[3])<<2); - b1 = ((ip[0] - ip[2])<<2); + a1 = ((ip[0] + ip[2]) * 4); + d1 = ((ip[1] + ip[3]) * 4); + c1 = ((ip[1] - ip[3]) * 4); + b1 = ((ip[0] - ip[2]) * 4); op[0] = a1 + d1 + (a1!=0); op[1] = b1 + c1; |