commit d650f276ce2142fef1460de843c1c02dbffa3aad
author Urvang Joshi <urvang@google.com> Tue Oct 25 13:00:22 2016 -0700
committer Urvang Joshi <urvang@google.com> Tue Oct 25 13:00:22 2016 -0700
tree 1628130c134884f12d792aeef9c1dd6115066d46
parent df70d29b72e7b3171fca4bc86895886c42eadcf7

Vertical scalers: Use signed int for src/dst pitch in parameters.

This avoids explicitly casting them to 'int' later.
These methods were already called with signed int arguments for pitch,
so this also avoids int -> unsigned int -> int conversion.

Change-Id: I2129f5ceff8f2525a188ee3ae52f9fe7067bd2e3

aom_scale/generic/aom_scale.c

diff --git a/aom_scale/generic/aom_scale.c b/aom_scale/generic/aom_scale.c
index 9007459..14f3ae0 100644
--- a/aom_scale/generic/aom_scale.c
+++ b/aom_scale/generic/aom_scale.c
@@ -252,8 +252,8 @@
 
   void (*horiz_line_scale)(const unsigned char *, unsigned int, unsigned char *,
                            unsigned int) = NULL;
-  void (*vert_band_scale)(unsigned char *, unsigned int, unsigned char *,
-                          unsigned int, unsigned int) = NULL;
+  void (*vert_band_scale)(unsigned char *, int, unsigned char *, int,
+                          unsigned int) = NULL;
 
   int ratio_scalable = 1;
   int interpolation = 0;

aom_scale/generic/gen_scalers.c

diff --git a/aom_scale/generic/gen_scalers.c b/aom_scale/generic/gen_scalers.c
index a37d67b..71fa82f 100644
--- a/aom_scale/generic/gen_scalers.c
+++ b/aom_scale/generic/gen_scalers.c
@@ -59,9 +59,8 @@
   }
 }
 
-void aom_vertical_band_5_4_scale_c(unsigned char *source,
-                                   unsigned int src_pitch, unsigned char *dest,
-                                   unsigned int dest_pitch,
+void aom_vertical_band_5_4_scale_c(unsigned char *source, int src_pitch,
+                                   unsigned char *dest, int dest_pitch,
                                    unsigned int dest_width) {
   const unsigned char *const dest_end = dest + dest_width;
   while (dest < dest_end) {
@@ -124,9 +123,8 @@
   }
 }
 
-void aom_vertical_band_5_3_scale_c(unsigned char *source,
-                                   unsigned int src_pitch, unsigned char *dest,
-                                   unsigned int dest_pitch,
+void aom_vertical_band_5_3_scale_c(unsigned char *source, int src_pitch,
+                                   unsigned char *dest, int dest_pitch,
                                    unsigned int dest_width) {
   const unsigned char *const dest_end = dest + dest_width;
   while (dest < dest_end) {
@@ -178,27 +176,23 @@
   }
 }
 
-void aom_vertical_band_2_1_scale_c(unsigned char *source,
-                                   unsigned int src_pitch, unsigned char *dest,
-                                   unsigned int dest_pitch,
+void aom_vertical_band_2_1_scale_c(unsigned char *source, int src_pitch,
+                                   unsigned char *dest, int dest_pitch,
                                    unsigned int dest_width) {
   (void)dest_pitch;
   (void)src_pitch;
   memcpy(dest, source, dest_width);
 }
 
-void aom_vertical_band_2_1_scale_i_c(unsigned char *source,
-                                     unsigned int src_pitch,
-                                     unsigned char *dest,
-                                     unsigned int dest_pitch,
+void aom_vertical_band_2_1_scale_i_c(unsigned char *source, int src_pitch,
+                                     unsigned char *dest, int dest_pitch,
                                      unsigned int dest_width) {
   const unsigned char *const dest_end = dest + dest_width;
-  const int src_step = src_pitch;
   (void)dest_pitch;
   while (dest < dest_end) {
-    const unsigned int a = source[-src_step] * 3;
+    const unsigned int a = source[-src_pitch] * 3;
     const unsigned int b = source[0] * 10;
-    const unsigned int c = source[src_step] * 3;
+    const unsigned int c = source[src_pitch] * 3;
     dest[0] = (unsigned char)((8 + a + b + c) >> 4);
     ++source;
     ++dest;