From 7f00d67d7c279f13b73d3be9c2d85873a7e2fbaf Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 23 Mar 2020 02:56:11 -0700 Subject: [PATCH] Remove HAVE_JPEG requirement from headers. JPeg is currently only enabled on Windows and Linux builds, so only call the functions if needed and available for your target platform. Bug: b/152178870 Change-Id: I99082d2d6b1440b26c4fe6840dfafe6fc9b1df9d Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2115190 Reviewed-by: Hsiu Wang Reviewed-by: Frank Barchard Commit-Queue: Frank Barchard --- README.chromium | 2 +- include/libyuv/convert.h | 2 -- include/libyuv/convert_argb.h | 2 -- include/libyuv/version.h | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index 4a6830aa1..0aac5acc8 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1746 +Version: 1747 License: BSD License File: LICENSE diff --git a/include/libyuv/convert.h b/include/libyuv/convert.h index 509f034f2..f05a928bd 100644 --- a/include/libyuv/convert.h +++ b/include/libyuv/convert.h @@ -427,7 +427,6 @@ int RAWToJ400(const uint8_t* src_raw, int width, int height); -#ifdef HAVE_JPEG // src_width/height provided by capture. // dst_width/height for clipping determine final size. LIBYUV_API @@ -463,7 +462,6 @@ int MJPGSize(const uint8_t* sample, size_t sample_size, int* width, int* height); -#endif // Convert camera sample to I420 with cropping, rotation and vertical flip. // "src_size" is needed to parse MJPG. diff --git a/include/libyuv/convert_argb.h b/include/libyuv/convert_argb.h index bf776348f..2b857924e 100644 --- a/include/libyuv/convert_argb.h +++ b/include/libyuv/convert_argb.h @@ -956,7 +956,6 @@ int AR30ToAB30(const uint8_t* src_ar30, int width, int height); -#ifdef HAVE_JPEG // src_width/height provided by capture // dst_width/height for clipping determine final size. LIBYUV_API @@ -968,7 +967,6 @@ int MJPGToARGB(const uint8_t* sample, int src_height, int dst_width, int dst_height); -#endif // Convert Android420 to ARGB. LIBYUV_API diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 9d487f0cf..3f314b072 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1746 +#define LIBYUV_VERSION 1747 #endif // INCLUDE_LIBYUV_VERSION_H_