Merge pull request #1703 from bitwangyaoyao:2.4_fix1480

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Mon, 28 Oct 2013 15:01:51 +0000 (19:01 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Mon, 28 Oct 2013 15:01:51 +0000 (19:01 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 28 Oct 2013 15:01:51 +0000 (19:01 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Oct 2013 15:01:51 +0000 (19:01 +0400)
diff --cc modules/ocl/src/filtering.cpp
Simple merge
diff --cc modules/ocl/test/test_filters.cpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Mon, 28 Oct 2013 15:01:51 +0000 (19:01 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Mon, 28 Oct 2013 15:01:51 +0000 (19:01 +0400)
		1	2
modules/ocl/src/filtering.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_filters.cpp	patch \|	diff1 \|	diff2 \|	blob \| history