From 4cd90347e78ff76755df2107009e900374aee9cd Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Tue, 23 Jul 2024 10:32:38 -0700 Subject: [PATCH] Rotate use NULL for C compatability Bug: b/353323977 Change-Id: I2472f23ce8fcc0bc09a292bd6fb758304c6c2b18 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/5735714 Reviewed-by: Wan-Teh Chang --- README.chromium | 2 +- include/libyuv/rotate_row.h | 2 +- include/libyuv/version.h | 2 +- source/rotate.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index ac18acfe4..daa113fd6 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: https://chromium.googlesource.com/libyuv/libyuv/ -Version: 1891 +Version: 1892 License: BSD License File: LICENSE Shipped: yes diff --git a/include/libyuv/rotate_row.h b/include/libyuv/rotate_row.h index 9ce9fad15..a45948094 100644 --- a/include/libyuv/rotate_row.h +++ b/include/libyuv/rotate_row.h @@ -28,7 +28,7 @@ extern "C" { #endif // clang >= 19.0.0 required for SME -#if defined(__clang__) && defined(__aarch64__) && !defined(LIBYUV_DISABLE_SME) +#if !defined(LIBYUV_DISABLE_SME) && defined(__clang__) && defined(__aarch64__) #if __clang_major__ < 19 #define LIBYUV_DISABLE_SME #endif diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 535a939ac..ba083f5bd 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 1891 +#define LIBYUV_VERSION 1892 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/source/rotate.cc b/source/rotate.cc index 5f898fd03..08ec2ccfb 100644 --- a/source/rotate.cc +++ b/source/rotate.cc @@ -33,7 +33,7 @@ void TransposePlane(const uint8_t* src, int i = height; #if defined(HAS_TRANSPOSEWXH_SME) void (*TransposeWxH)(const uint8_t* src, int src_stride, uint8_t* dst, - int dst_stride, int width, int height) = nullptr; + int dst_stride, int width, int height) = NULL; #endif #if defined(HAS_TRANSPOSEWX16_MSA) || defined(HAS_TRANSPOSEWX16_LSX) || \ defined(HAS_TRANSPOSEWX16_NEON)