lint cleanup of headers

BUG=none
TEST=gcl lint
Review URL: https://webrtc-codereview.appspot.com/459003

git-svn-id: http://libyuv.googlecode.com/svn/trunk@221 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 220
+Version: 221
 License: BSD
 License File: LICENSE
 

include/libyuv.h

@@ -8,9 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
-#ifndef LIBYUV_INCLUDE_LIBYUV_H_
-#define LIBYUV_INCLUDE_LIBYUV_H_
+#ifndef INCLUDE_LIBYUV_H_
+#define INCLUDE_LIBYUV_H_
 
 #include "libyuv/basic_types.h"
 #include "libyuv/compare.h"
@@ -23,4 +22,5 @@
 #include "libyuv/scale.h"
 #include "libyuv/version.h"
 #include "libyuv/video_common.h"
-#endif  // LIBYUV_INCLUDE_LIBYUV_H_
+
+#endif  // INCLUDE_LIBYUV_H_

include/libyuv/cpu_id.h

@@ -37,8 +37,9 @@ static __inline int TestCpuFlag(int test_flag) {
 
 // For testing, allow CPU flags to be disabled.
 // ie MaskCpuFlags(~kCpuHasSSSE3) to disable SSSE3.
-// -1 to enable all cpu specific optimizations.
-// 0 to disable all cpu specific optimizations.
+// MaskCpuFlags(-1) to enable all cpu specific optimizations.
+// MaskCpuFlags(kCpuInitialized) to disable all cpu specific optimizations.
+// MaskCpuFlags(0) to re-initialize all cpu detection.
 void MaskCpuFlags(int enable_flags);
 
 #ifdef __cplusplus

include/libyuv/mjpeg_decoder.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef LIBYUV_MJPEG_DECODER_H_
-#define LIBYUV_MJPEG_DECODER_H_
+#ifndef INCLUDE_LIBYUV_MJPEG_DECODER_H_
+#define INCLUDE_LIBYUV_MJPEG_DECODER_H_
 
 #include "libyuv/basic_types.h"
 #include "libyuv/scoped_ptr.h"
@@ -135,7 +135,7 @@ class MJpegDecoder {
   };
 
   struct BufferVector {
-    Buffer *buffers;
+    Buffer* buffers;
     int len;
     int pos;
   };
@@ -143,7 +143,8 @@ class MJpegDecoder {
   // Methods that are passed to jpeglib.
   static int fill_input_buffer(jpeg_decompress_struct *cinfo);
   static void init_source(jpeg_decompress_struct *cinfo);
-  static void skip_input_data(jpeg_decompress_struct *cinfo, long num_bytes);
+  static void skip_input_data(jpeg_decompress_struct *cinfo,
+                              long num_bytes);  // NOLINT
   static void term_source(jpeg_decompress_struct *cinfo);
 
   static void ErrorHandler(jpeg_common_struct *cinfo);
@@ -183,4 +184,4 @@ class MJpegDecoder {
 
 }  // namespace libyuv
 
-#endif  // LIBYUV_MJPEG_DECODER_H_
+#endif  // INCLUDE_LIBYUV_MJPEG_DECODER_H_

include/libyuv/scoped_ptr.h

@@ -33,8 +33,8 @@
 
 // TODO(fbarchard): move into source as implementation detail
 
-#ifndef LIBYUV_SCOPED_PTR_H__
-#define LIBYUV_SCOPED_PTR_H__
+#ifndef INCLUDE_LIBYUV_SCOPED_PTR_H_
+#define INCLUDE_LIBYUV_SCOPED_PTR_H_
 
 #include <cstddef>             // for std::ptrdiff_t
 #include <stdlib.h>            // for free() decl
@@ -255,4 +255,4 @@ void swap(scoped_ptr_malloc<T,FF>& a, scoped_ptr_malloc<T,FF>& b) {
 
 } // namespace libyuv
 
-#endif  // #ifndef LIBYUV_SCOPED_PTR_H__
+#endif  // INCLUDE_LIBYUV_SCOPED_PTR_H_

include/libyuv/version.h

@@ -11,7 +11,7 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 220
+#define INCLUDE_LIBYUV_VERSION 221
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
 

source/convert.cc

@@ -782,11 +782,11 @@ int UYVYToI420(const uint8* src_uyvy, int src_stride_uyvy,
 // gcc provided macros
 #if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN)
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-#define LIBYUV_LITTLE_ENDIAN
+#define INCLUDE_LIBYUV_LITTLE_ENDIAN
 #endif
 // Visual C for x86 defines these
 #elif defined(_M_X64) || defined(_M_IX86)
-#define LIBYUV_LITTLE_ENDIAN
+#define INCLUDE_LIBYUV_LITTLE_ENDIAN
 #endif
 
 #ifdef LIBYUV_LITTLE_ENDIAN

source/convert_from.cc

@@ -398,11 +398,11 @@ static void I42xToUYVYRow_C(const uint8* src_y, const uint8* src_u, const uint8*
 // gcc provided macros
 #if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN)
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-#define LIBYUV_LITTLE_ENDIAN
+#define INCLUDE_LIBYUV_LITTLE_ENDIAN
 #endif
 // Visual C for x86 defines these
 #elif defined(_M_X64) || defined(_M_IX86)
-#define LIBYUV_LITTLE_ENDIAN
+#define INCLUDE_LIBYUV_LITTLE_ENDIAN
 #endif
 
 #ifdef LIBYUV_LITTLE_ENDIAN