diff options
| author | Frank Barchard <fbarchard@google.com> | 2017-02-22 18:01:07 -0800 |
|---|---|---|
| committer | Frank Barchard <fbarchard@google.com> | 2017-03-06 09:54:15 -0800 |
| commit | b83bb38f0a92bedeb52baa31e515220927ef53bb (patch) | |
| tree | a31c9da19db3f909cad22293ad2964d1c41c953a /files/include/libyuv/scale_argb.h | |
| parent | 04676c9f110180a5ae1fa259a38fab17101c6b5b (diff) | |
| download | libyuv-b83bb38f0a92bedeb52baa31e515220927ef53bb.tar.gz | |
libyuv r1645 to fix android build warnings
r1602 under android.mk had unused parameter build warnings.
The warnings were disabled. This CL fixes the source and re-enables
the warning.
Bug: 35099807
Test: mm for libyuv builds cleanly.
Change-Id: If6b344ca39b2c321e277421cdeb817a5b1cc2514
Diffstat (limited to 'files/include/libyuv/scale_argb.h')
| -rw-r--r-- | files/include/libyuv/scale_argb.h | 56 |
1 files changed, 38 insertions, 18 deletions
diff --git a/files/include/libyuv/scale_argb.h b/files/include/libyuv/scale_argb.h index b56cf520..3d25e579 100644 --- a/files/include/libyuv/scale_argb.h +++ b/files/include/libyuv/scale_argb.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_SCALE_ARGB_H_ // NOLINT +#ifndef INCLUDE_LIBYUV_SCALE_ARGB_H_ #define INCLUDE_LIBYUV_SCALE_ARGB_H_ #include "libyuv/basic_types.h" @@ -20,32 +20,52 @@ extern "C" { #endif LIBYUV_API -int ARGBScale(const uint8* src_argb, int src_stride_argb, - int src_width, int src_height, - uint8* dst_argb, int dst_stride_argb, - int dst_width, int dst_height, +int ARGBScale(const uint8* src_argb, + int src_stride_argb, + int src_width, + int src_height, + uint8* dst_argb, + int dst_stride_argb, + int dst_width, + int dst_height, enum FilterMode filtering); // Clipped scale takes destination rectangle coordinates for clip values. LIBYUV_API -int ARGBScaleClip(const uint8* src_argb, int src_stride_argb, - int src_width, int src_height, - uint8* dst_argb, int dst_stride_argb, - int dst_width, int dst_height, - int clip_x, int clip_y, int clip_width, int clip_height, +int ARGBScaleClip(const uint8* src_argb, + int src_stride_argb, + int src_width, + int src_height, + uint8* dst_argb, + int dst_stride_argb, + int dst_width, + int dst_height, + int clip_x, + int clip_y, + int clip_width, + int clip_height, enum FilterMode filtering); // Scale with YUV conversion to ARGB and clipping. LIBYUV_API -int YUVToARGBScaleClip(const uint8* src_y, int src_stride_y, - const uint8* src_u, int src_stride_u, - const uint8* src_v, int src_stride_v, +int YUVToARGBScaleClip(const uint8* src_y, + int src_stride_y, + const uint8* src_u, + int src_stride_u, + const uint8* src_v, + int src_stride_v, uint32 src_fourcc, - int src_width, int src_height, - uint8* dst_argb, int dst_stride_argb, + int src_width, + int src_height, + uint8* dst_argb, + int dst_stride_argb, uint32 dst_fourcc, - int dst_width, int dst_height, - int clip_x, int clip_y, int clip_width, int clip_height, + int dst_width, + int dst_height, + int clip_x, + int clip_y, + int clip_width, + int clip_height, enum FilterMode filtering); #ifdef __cplusplus @@ -53,4 +73,4 @@ int YUVToARGBScaleClip(const uint8* src_y, int src_stride_y, } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_SCALE_ARGB_H_ NOLINT +#endif // INCLUDE_LIBYUV_SCALE_ARGB_H_ |