Merge pull request #1703 from bitwangyaoyao:2.4_fix1480
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 28 Oct 2013 15:01:51 +0000 (19:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Oct 2013 15:01:51 +0000 (19:01 +0400)
commitbb15c00665f26b589ac785014cd7914ec5a2c965
tree833f4a150e4541ff548ce62e08dcb9e07cdcf5ca
parentd3c0b36cd03f3271da6b1425b6f6e5df9609dd02
parent0fd872bfa9e8b3a5e6e77652201df1b86912ace8
Merge pull request #1703 from bitwangyaoyao:2.4_fix1480
modules/ocl/src/filtering.cpp
modules/ocl/test/test_filters.cpp