Merge pull request #17007 from mshabunin:fix-openjpeg-vs
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 7 Apr 2020 19:55:37 +0000 (19:55 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 7 Apr 2020 19:55:37 +0000 (19:55 +0000)

Trivial merge