Merge pull request #7392 from K-Shinotsuka:issue25
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Oct 2016 11:19:43 +0000 (11:19 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Oct 2016 11:19:43 +0000 (11:19 +0000)
1  2 
modules/imgproc/src/color.cpp

Simple merge