Reduce blur radius based on width. And Makefile clean remove temp files.

BUG=none
TEST=Blur*
R=ryanpetrie@google.com

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

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

Makefile

@@ -44,5 +44,5 @@ convert: util/convert.cc Makefile
 	$(CC) $(CCFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a
 
 clean:
-	/bin/rm -f source/*.o libyuv.a convert
+	/bin/rm -f source/*.o *.ii *.s libyuv.a convert
 

README.chromium

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

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 857
+#define LIBYUV_VERSION 858
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

source/planar_functions.cc

@@ -1548,10 +1548,13 @@ int ARGBBlur(const uint8* src_argb, int src_stride_argb,
     src_stride_argb = -src_stride_argb;
   }
   if (radius > height) {
-      radius = height;
+    radius = height;
   }
-  if (radius > width) {
-      radius = width;
+  if (radius > (width / 2 - 1)) {
+    radius = width / 2 - 1;
+  }
+  if (radius <= 0) {
+    return -1;
   }
   void (*ComputeCumulativeSumRow)(const uint8 *row, int32 *cumsum,
       const int32* previous_cumsum, int width) = ComputeCumulativeSumRow_C;