mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 03:00:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26478 from xkszltl:exr_ver

Browse Source 
Check existence of OpenEXR version macros before using.
This commit is contained in:
Alexander Smorkalov 2024-11-18 11:03:34 +03:00 committed by GitHub
commit 474028ea87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/imgcodecs/src/grfmt_exr.cpp
View File

@ -754,7 +754,10 @@ bool ExrEncoder::write( const Mat& img, const std::vector<int>& params )
case IMWRITE_EXR_COMPRESSION_B44A: case IMWRITE_EXR_COMPRESSION_B44A:
header.compression() = B44A_COMPRESSION; header.compression() = B44A_COMPRESSION;
break; break;
#if ((OPENEXR_VERSION_MAJOR * 1000 + OPENEXR_VERSION_MINOR) >= (2 * 1000 + 2)) // available since version 2.2.0 // version macros introduced in openexr 2.0.1.
// - https://github.com/AcademySoftwareFoundation/openexr/commit/60cdff8a6f5c4e25a374e5f366d6e9b4efd869b3#diff-c4bae0726aebe410e407db9abd406d9cf2684f82dd8a08f46d84e8b7c35cf22aR67
#if defined(OPENEXR_VERSION_MAJOR) && defined(OPENEXR_VERSION_MINOR) && OPENEXR_VERSION_MAJOR * 1000 + OPENEXR_VERSION_MINOR >= 2 * 1000 + 2
// available since version 2.2.0
case IMWRITE_EXR_COMPRESSION_DWAA: case IMWRITE_EXR_COMPRESSION_DWAA:
header.compression() = DWAA_COMPRESSION; header.compression() = DWAA_COMPRESSION;
break; break;
@ -768,10 +771,12 @@ bool ExrEncoder::write( const Mat& img, const std::vector<int>& params )
} }
if (params[i] == IMWRITE_EXR_DWA_COMPRESSION_LEVEL) if (params[i] == IMWRITE_EXR_DWA_COMPRESSION_LEVEL)
{ {
#if OPENEXR_VERSION_MAJOR >= 3 #if !defined(OPENEXR_VERSION_MAJOR)
header.dwaCompressionLevel() = params[i + 1]; CV_LOG_ONCE_WARNING(NULL, "Setting `IMWRITE_EXR_DWA_COMPRESSION_LEVEL` not supported in unknown OpenEXR version possibly prior to 2.0.1 (version 3 is required)");
#else #elif OPENEXR_VERSION_MAJOR < 3
CV_LOG_ONCE_WARNING(NULL, "Setting `IMWRITE_EXR_DWA_COMPRESSION_LEVEL` not supported in OpenEXR version " + std::to_string(OPENEXR_VERSION_MAJOR) + " (version 3 is required)"); CV_LOG_ONCE_WARNING(NULL, "Setting `IMWRITE_EXR_DWA_COMPRESSION_LEVEL` not supported in OpenEXR version " + std::to_string(OPENEXR_VERSION_MAJOR) + " (version 3 is required)");
#else
header.dwaCompressionLevel() = params[i + 1];
#endif #endif
} }
} }