Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-15 07:29:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

imgcodecs: tiff: refactor reading scanlines test

Browse Source
This commit is contained in:
Kumataro
2025-02-10 06:46:06 +09:00
parent 0e17a879d7
commit fbd8180cc1
3 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/imgcodecs/src/loadsave.cpp
View File

@@ -83,6 +83,13 @@ static Size validateInputImageSize(const Size& size)
static inline int calcType(int type, int flags)
{
if(flags != IMREAD_UNCHANGED)
{
CV_CheckNE(flags & (IMREAD_COLOR_BGR | IMREAD_COLOR_RGB),
IMREAD_COLOR_BGR | IMREAD_COLOR_RGB,
"IMREAD_COLOR_BGR (IMREAD_COLOR) and IMREAD_COLOR_RGB can not be set at the same time.");
}
if ( (flags & (IMREAD_COLOR | IMREAD_ANYCOLOR | IMREAD_ANYDEPTH)) == (IMREAD_COLOR | IMREAD_ANYCOLOR | IMREAD_ANYDEPTH))
return type;