Remove blank lint from OWNERS. Move FixedDiv into row functions to avoid changing build files.

BUG=none
TEST=none
R=johannkoenig@google.com

Review URL: https://webrtc-codereview.appspot.com/1680004

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

OWNERS

 fbarchard@chromium.org
 mflodman@chromium.org
-

README.chromium

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

include/libyuv/row.h

@@ -1516,6 +1516,17 @@ void SobelXYRow_SSE2(const uint8* src_sobelx, const uint8* src_sobely,
                      uint8* dst_argb, int width);
 void SobelXYRow_NEON(const uint8* src_sobelx, const uint8* src_sobely,
                      uint8* dst_argb, int width);
+extern const float kRecipTable[4097];
+
+// Divide num by div and return value as 16.16 fixed point.
+#ifdef __cplusplus
+static __inline int FixedDiv(int num, int div) {
+  if (static_cast<unsigned int>(div) <= 4096u) {
+    return static_cast<int>(num * kRecipTable[div]);
+  }
+  return static_cast<int>((static_cast<int64>(num) << 16) / div);
+}
+#endif
 
 #ifdef __cplusplus
 }  // extern "C"

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 729
+#define LIBYUV_VERSION 730
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

libyuv.gyp

@@ -91,8 +91,6 @@
         'source/convert_to_argb.cc',
         'source/convert_to_i420.cc',
         'source/cpu_id.cc',
-        'source/fixed_math.cc',
-        'source/fixed_math.h',
         'source/format_conversion.cc',
         'source/mjpeg_decoder.cc',
         'source/mjpeg_validate.cc',

source/fixed_math.h

-/*
- *  Copyright 2013 The LibYuv Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS. All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef INCLUDE_LIBYUV_FIXED_MATH_H_  // NOLINT
-#define INCLUDE_LIBYUV_FIXED_MATH_H_
-
-#include "libyuv/basic_types.h"
-
-#ifdef __cplusplus
-namespace libyuv {
-extern "C" {
-#endif
-
-extern const float kRecipTable[4097];
-
-// Divide num by div and return value as 16.16 fixed point.
-static __inline int FixedDiv(int num, int div) {
-  if (static_cast<unsigned int>(div) <= 4096u) {
-    return static_cast<int>(num * kRecipTable[div]);
-  }
-  return static_cast<int>((static_cast<int64>(num) << 16) / div);
-}
-
-#ifdef __cplusplus
-}  // extern "C"
-}  // namespace libyuv
-#endif
-
-#endif  // INCLUDE_LIBYUV_FIXED_MATH_H_  NOLINT

unit_test/math_test.cc

@@ -12,9 +12,7 @@
 #include <string.h>
 
 #include "libyuv/basic_types.h"
-#include "libyuv/cpu_id.h"
-#include "libyuv/version.h"
-#include "../source/fixed_math.h"
+#include "libyuv/row.h"
 #include "../unit_test/unit_test.h"
 
 namespace libyuv {