Commit bcd82380 authored by Frank Barchard's avatar Frank Barchard

remove guard nolints from all headers

Remove NOLINT from guards

TEST=git cl lint
BUG=libyuv:634

Review URL: https://codereview.chromium.org/2374653002 .
parent 51a3500c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_H_ // NOLINT #ifndef INCLUDE_LIBYUV_H_
#define INCLUDE_LIBYUV_H_ #define INCLUDE_LIBYUV_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
#include "libyuv/version.h" #include "libyuv/version.h"
#include "libyuv/video_common.h" #include "libyuv/video_common.h"
#endif // INCLUDE_LIBYUV_H_ NOLINT #endif // INCLUDE_LIBYUV_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_BASIC_TYPES_H_ // NOLINT #ifndef INCLUDE_LIBYUV_BASIC_TYPES_H_
#define INCLUDE_LIBYUV_BASIC_TYPES_H_ #define INCLUDE_LIBYUV_BASIC_TYPES_H_
#include <stddef.h> // for NULL, size_t #include <stddef.h> // for NULL, size_t
...@@ -115,4 +115,4 @@ typedef signed char int8; ...@@ -115,4 +115,4 @@ typedef signed char int8;
#define LIBYUV_LITTLE_ENDIAN #define LIBYUV_LITTLE_ENDIAN
#endif #endif
#endif // INCLUDE_LIBYUV_BASIC_TYPES_H_ NOLINT #endif // INCLUDE_LIBYUV_BASIC_TYPES_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_COMPARE_H_ // NOLINT #ifndef INCLUDE_LIBYUV_COMPARE_H_
#define INCLUDE_LIBYUV_COMPARE_H_ #define INCLUDE_LIBYUV_COMPARE_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -75,4 +75,4 @@ double I420Ssim(const uint8* src_y_a, int stride_y_a, ...@@ -75,4 +75,4 @@ double I420Ssim(const uint8* src_y_a, int stride_y_a,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_COMPARE_H_ NOLINT #endif // INCLUDE_LIBYUV_COMPARE_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_COMPARE_ROW_H_ // NOLINT #ifndef INCLUDE_LIBYUV_COMPARE_ROW_H_
#define INCLUDE_LIBYUV_COMPARE_ROW_H_ #define INCLUDE_LIBYUV_COMPARE_ROW_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -81,4 +81,4 @@ uint32 HashDjb2_AVX2(const uint8* src, int count, uint32 seed); ...@@ -81,4 +81,4 @@ uint32 HashDjb2_AVX2(const uint8* src, int count, uint32 seed);
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_COMPARE_ROW_H_ NOLINT #endif // INCLUDE_LIBYUV_COMPARE_ROW_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_CONVERT_H_ // NOLINT #ifndef INCLUDE_LIBYUV_CONVERT_H_
#define INCLUDE_LIBYUV_CONVERT_H_ #define INCLUDE_LIBYUV_CONVERT_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -256,4 +256,4 @@ int ConvertToI420(const uint8* src_frame, size_t src_size, ...@@ -256,4 +256,4 @@ int ConvertToI420(const uint8* src_frame, size_t src_size,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_CONVERT_H_ NOLINT #endif // INCLUDE_LIBYUV_CONVERT_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_CONVERT_ARGB_H_ // NOLINT #ifndef INCLUDE_LIBYUV_CONVERT_ARGB_H_
#define INCLUDE_LIBYUV_CONVERT_ARGB_H_ #define INCLUDE_LIBYUV_CONVERT_ARGB_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -316,4 +316,4 @@ int ConvertToARGB(const uint8* src_frame, size_t src_size, ...@@ -316,4 +316,4 @@ int ConvertToARGB(const uint8* src_frame, size_t src_size,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_CONVERT_ARGB_H_ NOLINT #endif // INCLUDE_LIBYUV_CONVERT_ARGB_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_CONVERT_FROM_H_ // NOLINT #ifndef INCLUDE_LIBYUV_CONVERT_FROM_H_
#define INCLUDE_LIBYUV_CONVERT_FROM_H_ #define INCLUDE_LIBYUV_CONVERT_FROM_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -176,4 +176,4 @@ int ConvertFromI420(const uint8* y, int y_stride, ...@@ -176,4 +176,4 @@ int ConvertFromI420(const uint8* y, int y_stride,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_CONVERT_FROM_H_ NOLINT #endif // INCLUDE_LIBYUV_CONVERT_FROM_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_CONVERT_FROM_ARGB_H_ // NOLINT #ifndef INCLUDE_LIBYUV_CONVERT_FROM_ARGB_H_
#define INCLUDE_LIBYUV_CONVERT_FROM_ARGB_H_ #define INCLUDE_LIBYUV_CONVERT_FROM_ARGB_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -187,4 +187,4 @@ int ARGBToUYVY(const uint8* src_argb, int src_stride_argb, ...@@ -187,4 +187,4 @@ int ARGBToUYVY(const uint8* src_argb, int src_stride_argb,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_CONVERT_FROM_ARGB_H_ NOLINT #endif // INCLUDE_LIBYUV_CONVERT_FROM_ARGB_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_CPU_ID_H_ // NOLINT #ifndef INCLUDE_LIBYUV_CPU_ID_H_
#define INCLUDE_LIBYUV_CPU_ID_H_ #define INCLUDE_LIBYUV_CPU_ID_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -78,4 +78,4 @@ void CpuId(uint32 eax, uint32 ecx, uint32* cpu_info); ...@@ -78,4 +78,4 @@ void CpuId(uint32 eax, uint32 ecx, uint32* cpu_info);
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_CPU_ID_H_ NOLINT #endif // INCLUDE_LIBYUV_CPU_ID_H_
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_MACROS_MSA_H_ // NOLINT #ifndef INCLUDE_LIBYUV_MACROS_MSA_H_
#define INCLUDE_LIBYUV_MACROS_MSA_H_ #define INCLUDE_LIBYUV_MACROS_MSA_H_
#if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa) #if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa)
#include <stdint.h> #include <stdint.h>
#include <msa.h> #include <msa.h>
#define LD_B(RTYPE, psrc) *((RTYPE*)(psrc)) #define LD_B(RTYPE, psrc) *((RTYPE*)(psrc)) /* NOLINT */
#define LD_UB(...) LD_B(v16u8, __VA_ARGS__) #define LD_UB(...) LD_B(v16u8, __VA_ARGS__)
#define ST_B(RTYPE, in, pdst) *((RTYPE*)(pdst)) = (in) #define ST_B(RTYPE, in, pdst) *((RTYPE*)(pdst)) = (in) /* NOLINT */
#define ST_UB(...) ST_B(v16u8, __VA_ARGS__) #define ST_UB(...) ST_B(v16u8, __VA_ARGS__)
/* Description : Load two vectors with 16 'byte' sized elements /* Description : Load two vectors with 16 'byte' sized elements
...@@ -73,4 +73,4 @@ ...@@ -73,4 +73,4 @@
#endif /* !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa) */ #endif /* !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa) */
#endif // INCLUDE_LIBYUV_MACROS_MSA_H_ NOLINT #endif // INCLUDE_LIBYUV_MACROS_MSA_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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_ #define INCLUDE_LIBYUV_MJPEG_DECODER_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -189,4 +189,4 @@ class LIBYUV_API MJpegDecoder { ...@@ -189,4 +189,4 @@ class LIBYUV_API MJpegDecoder {
} // namespace libyuv } // namespace libyuv
#endif // __cplusplus #endif // __cplusplus
#endif // INCLUDE_LIBYUV_MJPEG_DECODER_H_ NOLINT #endif // INCLUDE_LIBYUV_MJPEG_DECODER_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_ // NOLINT #ifndef INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
#define INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_ #define INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -518,4 +518,4 @@ int ARGBSobelXY(const uint8* src_argb, int src_stride_argb, ...@@ -518,4 +518,4 @@ int ARGBSobelXY(const uint8* src_argb, int src_stride_argb,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_ NOLINT #endif // INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_ROTATE_H_ // NOLINT #ifndef INCLUDE_LIBYUV_ROTATE_H_
#define INCLUDE_LIBYUV_ROTATE_H_ #define INCLUDE_LIBYUV_ROTATE_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -114,4 +114,4 @@ void TransposeUV(const uint8* src, int src_stride, ...@@ -114,4 +114,4 @@ void TransposeUV(const uint8* src, int src_stride,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_ROTATE_H_ NOLINT #endif // INCLUDE_LIBYUV_ROTATE_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_ROTATE_ARGB_H_ // NOLINT #ifndef INCLUDE_LIBYUV_ROTATE_ARGB_H_
#define INCLUDE_LIBYUV_ROTATE_ARGB_H_ #define INCLUDE_LIBYUV_ROTATE_ARGB_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -30,4 +30,4 @@ int ARGBRotate(const uint8* src_argb, int src_stride_argb, ...@@ -30,4 +30,4 @@ int ARGBRotate(const uint8* src_argb, int src_stride_argb,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_ROTATE_ARGB_H_ NOLINT #endif // INCLUDE_LIBYUV_ROTATE_ARGB_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_ROTATE_ROW_H_ // NOLINT #ifndef INCLUDE_LIBYUV_ROTATE_ROW_H_
#define INCLUDE_LIBYUV_ROTATE_ROW_H_ #define INCLUDE_LIBYUV_ROTATE_ROW_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -118,4 +118,4 @@ void TransposeUVWx8_Any_DSPR2(const uint8* src, int src_stride, ...@@ -118,4 +118,4 @@ void TransposeUVWx8_Any_DSPR2(const uint8* src, int src_stride,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_ROTATE_ROW_H_ NOLINT #endif // INCLUDE_LIBYUV_ROTATE_ROW_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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_ #define INCLUDE_LIBYUV_ROW_H_
#include <stdlib.h> // For malloc. #include <stdlib.h> // For malloc.
...@@ -22,16 +22,9 @@ extern "C" { ...@@ -22,16 +22,9 @@ extern "C" {
#define IS_ALIGNED(p, a) (!((uintptr_t)(p) & ((a) - 1))) #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) \ #define align_buffer_64(var, size) \
uint8* var##_mem = (uint8*)(malloc((size) + 63)); /* NOLINT */ \ uint8* var##_mem = (uint8*)(malloc((size) + 63)); /* NOLINT */ \
uint8* var = (uint8*)(((intptr_t)(var##_mem) + 63) & ~63) /* NOLINT */ uint8* var = (uint8*)(((intptr_t)(var##_mem) + 63) & ~63) /* NOLINT */
#endif
#define free_aligned_buffer_64(var) \ #define free_aligned_buffer_64(var) \
free(var##_mem); \ free(var##_mem); \
...@@ -1950,4 +1943,4 @@ void ARGBLumaColorTableRow_SSSE3(const uint8* src_argb, uint8* dst_argb, ...@@ -1950,4 +1943,4 @@ void ARGBLumaColorTableRow_SSSE3(const uint8* src_argb, uint8* dst_argb,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_ROW_H_ NOLINT #endif // INCLUDE_LIBYUV_ROW_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_SCALE_H_ // NOLINT #ifndef INCLUDE_LIBYUV_SCALE_H_
#define INCLUDE_LIBYUV_SCALE_H_ #define INCLUDE_LIBYUV_SCALE_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -100,4 +100,4 @@ void SetUseReferenceImpl(LIBYUV_BOOL use); ...@@ -100,4 +100,4 @@ void SetUseReferenceImpl(LIBYUV_BOOL use);
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_SCALE_H_ NOLINT #endif // INCLUDE_LIBYUV_SCALE_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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_ #define INCLUDE_LIBYUV_SCALE_ARGB_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -53,4 +53,4 @@ int YUVToARGBScaleClip(const uint8* src_y, int src_stride_y, ...@@ -53,4 +53,4 @@ int YUVToARGBScaleClip(const uint8* src_y, int src_stride_y,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_SCALE_ARGB_H_ NOLINT #endif // INCLUDE_LIBYUV_SCALE_ARGB_H_
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_SCALE_ROW_H_ // NOLINT #ifndef INCLUDE_LIBYUV_SCALE_ROW_H_
#define INCLUDE_LIBYUV_SCALE_ROW_H_ #define INCLUDE_LIBYUV_SCALE_ROW_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -500,4 +500,4 @@ void ScaleRowDown38_3_Box_DSPR2(const uint8* src_ptr, ptrdiff_t src_stride, ...@@ -500,4 +500,4 @@ void ScaleRowDown38_3_Box_DSPR2(const uint8* src_ptr, ptrdiff_t src_stride,
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_SCALE_ROW_H_ NOLINT #endif // INCLUDE_LIBYUV_SCALE_ROW_H_
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1620 #define LIBYUV_VERSION 1620
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
// Common definitions for video, including fourcc and VideoFormat. // Common definitions for video, including fourcc and VideoFormat.
#ifndef INCLUDE_LIBYUV_VIDEO_COMMON_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VIDEO_COMMON_H_
#define INCLUDE_LIBYUV_VIDEO_COMMON_H_ #define INCLUDE_LIBYUV_VIDEO_COMMON_H_
#include "libyuv/basic_types.h" #include "libyuv/basic_types.h"
...@@ -181,4 +181,4 @@ LIBYUV_API uint32 CanonicalFourCC(uint32 fourcc); ...@@ -181,4 +181,4 @@ LIBYUV_API uint32 CanonicalFourCC(uint32 fourcc);
} // namespace libyuv } // namespace libyuv
#endif #endif
#endif // INCLUDE_LIBYUV_VIDEO_COMMON_H_ NOLINT #endif // INCLUDE_LIBYUV_VIDEO_COMMON_H_
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
// Get SSIM for video sequence. Assuming RAW 4:2:0 Y:Cb:Cr format // Get SSIM for video sequence. Assuming RAW 4:2:0 Y:Cb:Cr format
#ifndef UTIL_SSIM_H_ // NOLINT #ifndef UTIL_SSIM_H_
#define UTIL_SSIM_H_ #define UTIL_SSIM_H_
#include <math.h> // For log10() #include <math.h> // For log10()
...@@ -33,4 +33,4 @@ double CalcLSSIM(double ssim); ...@@ -33,4 +33,4 @@ double CalcLSSIM(double ssim);
} // extern "C" } // extern "C"
#endif #endif
#endif // UTIL_SSIM_H_ // NOLINT #endif // UTIL_SSIM_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment