Merge pull request #8523 from mshabunin:fix-cvtcolor-ocl
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 5 Apr 2017 10:02:01 +0000 (10:02 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 5 Apr 2017 10:02:01 +0000 (10:02 +0000)

Trivial merge