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/mjpeg_decoder.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/mjpeg_decoder.h')
| -rw-r--r-- | files/include/libyuv/mjpeg_decoder.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/files/include/libyuv/mjpeg_decoder.h b/files/include/libyuv/mjpeg_decoder.h index 8423121d..8a4f2822 100644 --- a/files/include/libyuv/mjpeg_decoder.h +++ b/files/include/libyuv/mjpeg_decoder.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_MJPEG_DECODER_H_ // NOLINT +#ifndef INCLUDE_LIBYUV_MJPEG_DECODER_H_ #define INCLUDE_LIBYUV_MJPEG_DECODER_H_ #include "libyuv/basic_types.h" @@ -37,7 +37,6 @@ static const uint32 kUnknownDataSize = 0xFFFFFFFF; enum JpegSubsamplingType { kJpegYuv420, kJpegYuv422, - kJpegYuv411, kJpegYuv444, kJpegYuv400, kJpegUnknown @@ -145,12 +144,16 @@ class LIBYUV_API MJpegDecoder { // callback function. Each call will get the data for a whole number of // image scanlines. // TODO(fbarchard): Add dst_x, dst_y to allow specific rect to be decoded. - LIBYUV_BOOL DecodeToCallback(CallbackFunction fn, void* opaque, - int dst_width, int dst_height); + LIBYUV_BOOL DecodeToCallback(CallbackFunction fn, + void* opaque, + int dst_width, + int dst_height); // The helper function which recognizes the jpeg sub-sampling type. static JpegSubsamplingType JpegSubsamplingTypeHelper( - int* subsample_x, int* subsample_y, int number_of_components); + int* subsample_x, + int* subsample_y, + int number_of_components); private: void AllocOutputBuffers(int num_outbufs); @@ -189,4 +192,4 @@ class LIBYUV_API MJpegDecoder { } // namespace libyuv #endif // __cplusplus -#endif // INCLUDE_LIBYUV_MJPEG_DECODER_H_ NOLINT +#endif // INCLUDE_LIBYUV_MJPEG_DECODER_H_ |