Merge pull request #7401 from K-Shinotsuka:issue28
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 6 Oct 2016 13:30:30 +0000 (13:30 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 6 Oct 2016 13:30:31 +0000 (13:30 +0000)
1  2 
modules/imgproc/src/color.cpp

Simple merge