Scale a plane. Before eating an airplane, remove the scales, then fry and serve with tartar sauce.

BUG=260
TEST=try serving with lemon.
R=wuwang@google.com

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

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

README.chromium

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

include/libyuv/scale_row.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef INCLUDE_LIBYUV_ROW_H_  // NOLINT
-#define INCLUDE_LIBYUV_ROW_H_
+#ifndef INCLUDE_LIBYUV_SCALE_ROW_H_  // NOLINT
+#define INCLUDE_LIBYUV_SCALE_ROW_H_
 
 #include "libyuv/basic_types.h"
 
@@ -31,4 +31,4 @@ void ScalePlaneVertical(int src_height,
 }  // namespace libyuv
 #endif
 
-#endif  // INCLUDE_LIBYUV_ROW_H_  NOLINT
+#endif  // INCLUDE_LIBYUV_SCALE_ROW_H_  NOLINT

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 774
+#define LIBYUV_VERSION 775
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

source/scale_argb.cc

@@ -1400,9 +1400,9 @@ static void ScaleARGB(const uint8* src, int src_stride,
   if (dx == 0x10000 && (x & 0xffff) == 0) {
     // Arbitrary scale vertically, but unscaled vertically.
     ScalePlaneVertical(src_height,
-                              clip_width, clip_height,
-                              src_stride, dst_stride, src, dst,
-                              x, y, dy, 4, filtering);
+                       clip_width, clip_height,
+                       src_stride, dst_stride, src, dst,
+                       x, y, dy, 4, filtering);
     return;
   }
 

source/scale_common.cc

 /*
- *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
+ *  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
@@ -16,20 +16,20 @@
 #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 {
 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) {
+// Scale plane 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) {
   int dst_widthx4 = dst_width * bpp;
   src_argb += (x >> 16) * bpp;
   assert(src_height > 0);