Merge pull request #8297 from csukuangfj:csukuangfj-patch
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 2 Mar 2017 05:47:33 +0000 (05:47 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 2 Mar 2017 05:47:33 +0000 (05:47 +0000)
commit5f990566c4f15fd67dc982d28ccbc8818c25bbe3
treec31b1772ac951349aa4d92315d0983ec6b33936d
parentddfe688be68654417c82b7ce0326698ab6c2b53c
parent34c70e7a1c6c037280ce89a718fbab73c9d1bb85
Merge pull request #8297 from csukuangfj:csukuangfj-patch
modules/imgproc/include/opencv2/imgproc.hpp