| Index: include/libyuv/row.h
|
| diff --git a/include/libyuv/row.h b/include/libyuv/row.h
|
| index 28090fa9b4a1ca828399932f39e483b9f8423092..f04c15527478d68577e49be71bad23df0bc945cc 100644
|
| --- a/include/libyuv/row.h
|
| +++ b/include/libyuv/row.h
|
| @@ -8,7 +8,7 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#ifndef INCLUDE_LIBYUV_ROW_H_ // NOLINT
|
| +#ifndef INCLUDE_LIBYUV_ROW_H_
|
| #define INCLUDE_LIBYUV_ROW_H_
|
|
|
| #include <stdlib.h> // For malloc.
|
| @@ -22,16 +22,9 @@ extern "C" {
|
|
|
| #define IS_ALIGNED(p, a) (!((uintptr_t)(p) & ((a) - 1)))
|
|
|
| -#ifdef __cplusplus
|
| -#define align_buffer_64(var, size) \
|
| - uint8* var##_mem = reinterpret_cast<uint8*>(malloc((size) + 63)); \
|
| - uint8* var = reinterpret_cast<uint8*> \
|
| - ((reinterpret_cast<intptr_t>(var##_mem) + 63) & ~63)
|
| -#else
|
| #define align_buffer_64(var, size) \
|
| uint8* var##_mem = (uint8*)(malloc((size) + 63)); /* NOLINT */ \
|
| uint8* var = (uint8*)(((intptr_t)(var##_mem) + 63) & ~63) /* NOLINT */
|
| -#endif
|
|
|
| #define free_aligned_buffer_64(var) \
|
| free(var##_mem); \
|
| @@ -1950,4 +1943,4 @@ void ARGBLumaColorTableRow_SSSE3(const uint8* src_argb, uint8* dst_argb,
|
| } // namespace libyuv
|
| #endif
|
|
|
| -#endif // INCLUDE_LIBYUV_ROW_H_ NOLINT
|
| +#endif // INCLUDE_LIBYUV_ROW_H_
|
|
|