Commit ba0eab93 authored by fbarchard@google.com's avatar fbarchard@google.com

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
parent e812e86e
......@@ -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
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 857
Version: 858
License: BSD
License File: LICENSE
......
......@@ -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
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment