Merge pull request #7664 from K-Shinotsuka:issue35
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 22 Nov 2016 13:49:14 +0000 (13:49 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 22 Nov 2016 13:49:14 +0000 (13:49 +0000)
1  2 
modules/imgproc/src/color.cpp

Simple merge