Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Sep 2013 12:46:32 +0000 (16:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Sep 2013 12:46:33 +0000 (16:46 +0400)
commit84435ba741f1d21f06436c8bf9b76c64a0af8d64
tree684767b2a2c6af891ce9591c21a2a476659d8331
parent574f011a33c3c75dc49bf732f1c7273e0fe0575a
parentab235cda74577aa93a65b0da959b4273e5498575
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
modules/imgproc/src/smooth.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/test/test_imgproc.cpp