Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats
authorAlexander Enaldiev <alexander.enaldiev@gmail.com>
Tue, 22 May 2018 15:10:15 +0000 (18:10 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 22 May 2018 15:10:15 +0000 (15:10 +0000)
commit84584002f2a579f9c63bde73e44e7a695271bd39
tree4346122f851ec1f6fc772989d078c332998358f4
parent573e79010715d83996260bc2aeb05d87da067d36
Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats

* imgcodecs cmake: the option to customize supported formats list (WITH_IMGCODEC_HDR, WITH_IMGCODEC_SUNRASTER, WITH_IMGCODEC_PXM)

* imgcodecs: fixes

- fixed CMake scripts (=OFF doesn't really work)
- restore dropped GDCM block
- added _IMGCODEC_ prefix
- fixed tests
- include PAM format under WITH_IMGCODEC_PXM option
14 files changed:
CMakeLists.txt
cmake/OpenCVFindLibsGrfmt.cmake
modules/imgcodecs/CMakeLists.txt
modules/imgcodecs/src/grfmt_hdr.cpp
modules/imgcodecs/src/grfmt_hdr.hpp
modules/imgcodecs/src/grfmt_pam.cpp
modules/imgcodecs/src/grfmt_pam.hpp
modules/imgcodecs/src/grfmt_pxm.cpp
modules/imgcodecs/src/grfmt_pxm.hpp
modules/imgcodecs/src/grfmt_sunras.cpp
modules/imgcodecs/src/grfmt_sunras.hpp
modules/imgcodecs/src/loadsave.cpp
modules/imgcodecs/test/test_grfmt.cpp
modules/imgcodecs/test/test_read_write.cpp