diff options
| author | Frank Barchard <fbarchard@google.com> | 2017-03-03 11:31:40 -0800 |
|---|---|---|
| committer | Frank Barchard <fbarchard@google.com> | 2017-03-03 19:57:35 +0000 |
| commit | 136aa9d37c35147f28f174b02755678c87be0b74 (patch) | |
| tree | 2db0e4a8429084da7e923366d626599e3ddb2f6d /source/scale_argb.cc | |
| parent | 3e62cfe68c462b565262bc0d9e5d2d9a08ffce0f (diff) | |
| download | libyuv-136aa9d37c35147f28f174b02755678c87be0b74.tar.gz | |
any11p fix for buffer overrun
BUG=libyuv:686
TESTED=untested
Change-Id: Idfae93349dd78b1b633a596631e5397e11b77d0b
Reviewed-on: https://chromium-review.googlesource.com/448320
Reviewed-by: Frank Barchard <fbarchard@google.com>
Reviewed-by: Henrik Kjellander <kjellander@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@google.com>
Diffstat (limited to 'source/scale_argb.cc')
| -rw-r--r-- | source/scale_argb.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/scale_argb.cc b/source/scale_argb.cc index 1ea28f0d..35178e95 100644 --- a/source/scale_argb.cc +++ b/source/scale_argb.cc @@ -263,10 +263,10 @@ static void ScaleARGBBilinearDown(int src_width, int dy, enum FilterMode filtering) { int j; - void (*InterpolateRow)(uint8 * dst_argb, const uint8* src_argb, + void (*InterpolateRow)(uint8* dst_argb, const uint8* src_argb, ptrdiff_t src_stride, int dst_width, int source_y_fraction) = InterpolateRow_C; - void (*ScaleARGBFilterCols)(uint8 * dst_argb, const uint8* src_argb, + void (*ScaleARGBFilterCols)(uint8* dst_argb, const uint8* src_argb, int dst_width, int x, int dx) = (src_width >= 32768) ? ScaleARGBFilterCols64_C : ScaleARGBFilterCols_C; int64 xlast = x + (int64)(dst_width - 1) * dx; @@ -380,10 +380,10 @@ static void ScaleARGBBilinearUp(int src_width, int dy, enum FilterMode filtering) { int j; - void (*InterpolateRow)(uint8 * dst_argb, const uint8* src_argb, + void (*InterpolateRow)(uint8* dst_argb, const uint8* src_argb, ptrdiff_t src_stride, int dst_width, int source_y_fraction) = InterpolateRow_C; - void (*ScaleARGBFilterCols)(uint8 * dst_argb, const uint8* src_argb, + void (*ScaleARGBFilterCols)(uint8* dst_argb, const uint8* src_argb, int dst_width, int x, int dx) = filtering ? ScaleARGBFilterCols_C : ScaleARGBCols_C; const int max_y = (src_height - 1) << 16; @@ -581,7 +581,7 @@ static void ScaleYUVToARGBBilinearUp(int src_width, } #endif - void (*InterpolateRow)(uint8 * dst_argb, const uint8* src_argb, + void (*InterpolateRow)(uint8* dst_argb, const uint8* src_argb, ptrdiff_t src_stride, int dst_width, int source_y_fraction) = InterpolateRow_C; #if defined(HAS_INTERPOLATEROW_SSSE3) @@ -623,7 +623,7 @@ static void ScaleYUVToARGBBilinearUp(int src_width, } #endif - void (*ScaleARGBFilterCols)(uint8 * dst_argb, const uint8* src_argb, + void (*ScaleARGBFilterCols)(uint8* dst_argb, const uint8* src_argb, int dst_width, int x, int dx) = filtering ? ScaleARGBFilterCols_C : ScaleARGBCols_C; if (src_width >= 32768) { @@ -762,7 +762,7 @@ static void ScaleARGBSimple(int src_width, int y, int dy) { int j; - void (*ScaleARGBCols)(uint8 * dst_argb, const uint8* src_argb, int dst_width, + void (*ScaleARGBCols)(uint8* dst_argb, const uint8* src_argb, int dst_width, int x, int dx) = (src_width >= 32768) ? ScaleARGBCols64_C : ScaleARGBCols_C; (void)src_height; |