Merge pull request #18194 from VadimLevin:dev/vlevin/openjpeg-source-intergration

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Wed, 2 Sep 2020 22:48:09 +0000 (22:48 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Wed, 2 Sep 2020 22:48:09 +0000 (22:48 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 2 Sep 2020 22:48:09 +0000 (22:48 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 2 Sep 2020 22:48:09 +0000 (22:48 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc modules/imgcodecs/src/grfmt_jpeg2000_openjpeg.cpp
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Wed, 2 Sep 2020 22:48:09 +0000 (22:48 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Wed, 2 Sep 2020 22:48:09 +0000 (22:48 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgcodecs/src/grfmt_jpeg2000_openjpeg.cpp	patch \|	diff1 \|	diff2 \|	blob \| history