From c105bae7925aa75cbd9acea7a8ce558f4c2d906d Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Wed, 28 Aug 2013 00:31:08 +0000
Subject: [PATCH] Move header and rename function to more generic scaleplane
 BUG=260 TEST=unittests R=wuwang@google.com

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

git-svn-id: http://libyuv.googlecode.com/svn/trunk@774 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 README.chromium            |  2 +-
 include/libyuv/scale_row.h | 34 ++++++++++++++++++++++++++++++++++
 include/libyuv/version.h   |  2 +-
 source/scale_argb.cc       |  4 ++--
 source/scale_row.h         | 36 ------------------------------------
 5 files changed, 38 insertions(+), 40 deletions(-)
 create mode 100644 include/libyuv/scale_row.h
 delete mode 100644 source/scale_row.h

diff --git a/README.chromium b/README.chromium
index 1b3e43c9d..873fe2cd7 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 773
+Version: 774
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/scale_row.h b/include/libyuv/scale_row.h
new file mode 100644
index 000000000..24fbb9c68
--- /dev/null
+++ b/include/libyuv/scale_row.h
@@ -0,0 +1,34 @@
+/*
+ *  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_ROW_H_  // NOLINT
+#define INCLUDE_LIBYUV_ROW_H_
+
+#include "libyuv/basic_types.h"
+
+#ifdef __cplusplus
+namespace libyuv {
+extern "C" {
+#endif
+
+// Scale ARGB vertically with bilinear interpolation.
+void ScalePlaneVertical(int src_height,
+                        int dst_width, int dst_height,
+                        int src_stride, int dst_stride,
+                        const uint8* src_argb, uint8* dst_argb,
+                        int x, int y, int dy,
+                        int bpp, FilterMode filtering);
+
+#ifdef __cplusplus
+}  // extern "C"
+}  // namespace libyuv
+#endif
+
+#endif  // INCLUDE_LIBYUV_ROW_H_  NOLINT
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 3b08ba14a..9a91fac55 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 773
+#define LIBYUV_VERSION 774
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/scale_argb.cc b/source/scale_argb.cc
index 81a45ae5a..6d334d9ce 100644
--- a/source/scale_argb.cc
+++ b/source/scale_argb.cc
@@ -16,7 +16,7 @@
 #include "libyuv/cpu_id.h"
 #include "libyuv/planar_functions.h"  // For CopyARGB
 #include "libyuv/row.h"
-#include "../source/scale_row.h"
+#include "libyuv/scale_row.h"
 
 #ifdef __cplusplus
 namespace libyuv {
@@ -1399,7 +1399,7 @@ static void ScaleARGB(const uint8* src, int src_stride,
   }
   if (dx == 0x10000 && (x & 0xffff) == 0) {
     // Arbitrary scale vertically, but unscaled vertically.
-    ScaleARGBBilinearVertical(src_height,
+    ScalePlaneVertical(src_height,
                               clip_width, clip_height,
                               src_stride, dst_stride, src, dst,
                               x, y, dy, 4, filtering);
diff --git a/source/scale_row.h b/source/scale_row.h
deleted file mode 100644
index cda2dad65..000000000
--- a/source/scale_row.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright 2011 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.
- */
-
-#include "libyuv/scale.h"
-
-#include <assert.h>
-#include <string.h>
-
-#include "libyuv/cpu_id.h"
-#include "libyuv/planar_functions.h"  // For CopyARGB
-#include "libyuv/row.h"
-
-#ifdef __cplusplus
-namespace libyuv {
-extern "C" {
-#endif
-
-// Scale ARGB vertically with bilinear interpolation.
-void ScaleARGBBilinearVertical(int src_height,
-                               int dst_width, int dst_height,
-                               int src_stride, int dst_stride,
-                               const uint8* src_argb, uint8* dst_argb,
-                               int x, int y, int dy,
-                               int bpp, FilterMode filtering);
-
-#ifdef __cplusplus
-}  // extern "C"
-}  // namespace libyuv
-#endif