Merge pull request #12971 from sturkmen72:upd_imgproc_hpp
authorSuleyman TURKMEN <sturkmen@hotmail.com>
Wed, 31 Oct 2018 15:08:24 +0000 (18:08 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 31 Oct 2018 15:08:24 +0000 (18:08 +0300)
commit4d0ed5c13cee2091dde93617961afa9502bb1b95
treefb85a10008d0431b213a67b0c3656612ad5922e0
parentfcb56a5460b72160724d4070d41e5662af89c230
Merge pull request #12971 from sturkmen72:upd_imgproc_hpp

* Update imgproc.hpp

* update color conversion codes
modules/imgcodecs/src/grfmt_webp.cpp
modules/imgcodecs/test/test_png.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/demosaicing.cpp
modules/imgproc/test/test_color.cpp
modules/imgproc/test/test_cvtyuv.cpp
modules/imgproc/test/test_goodfeaturetotrack.cpp