tiff need check TIFFTAG_SAMPLEFORMAT, should not always use unsigned. #21400
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alalek
reviewed
Jan 6, 2022
modules/imgcodecs/src/grfmt_tiff.cpp
Outdated
| @@ -295,24 +295,30 @@ bool TiffDecoder::readHeader() | |||
| (ncn != 1 && ncn != 3 && ncn != 4))) | |||
| bpp = 8; | |||
|
|
|||
| char depth; | |||
There was a problem hiding this comment.
int depth;
It is better to move it below into "case" code blocks:
case XXX:
{
int depth = ...
.. use depth ...
break;
}
modules/imgcodecs/src/grfmt_tiff.cpp
Outdated
| @@ -295,24 +295,30 @@ bool TiffDecoder::readHeader() | |||
| (ncn != 1 && ncn != 3 && ncn != 4))) | |||
| bpp = 8; | |||
|
|
|||
| char depth; | |||
| uint16 fmt = SAMPLEFORMAT_UINT; | |||
modules/imgcodecs/src/grfmt_tiff.cpp
Outdated
| int wanted_channels = normalizeChannelsNumber(ncn); | ||
| switch(bpp) | ||
| { | ||
| case 1: | ||
| m_type = CV_MAKETYPE(CV_8U, !isGrayScale ? wanted_channels : 1); | ||
| depth = fmt == SAMPLEFORMAT_INT ? CV_8S : CV_8U; |
There was a problem hiding this comment.
We need to validate its value first:
CV_Check((int)sample_format, sample_format == SAMPLEFORMAT_UINT || sample_format == SAMPLEFORMAT_INT, "");
modules/imgcodecs/src/grfmt_tiff.cpp
Outdated
| result = true; | ||
| break; | ||
| case 16: | ||
| m_type = CV_MAKETYPE(CV_16U, !isGrayScale ? wanted_channels : 1); | ||
| depth = fmt == SAMPLEFORMAT_INT ? CV_16S : CV_16U; | ||
| m_type = CV_MAKETYPE(depth, !isGrayScale ? wanted_channels : 1); | ||
| result = true; | ||
| break; | ||
| case 32: |
There was a problem hiding this comment.
32 and 64 cases:
CV_CheckEQ((int)sample_format, SAMPLEFORMAT_IEEEFP, "");
There was a problem hiding this comment.
Done, for 32 case, since OpenCV has CV_32S, so 32 case should allow SAMPLEFORMAT_INT?
|
thanks for reviewing, I updated the code. |
Merged
a-sajjad72
pushed a commit
to a-sajjad72/opencv
that referenced
this pull request
Mar 30, 2023
tiff need check TIFFTAG_SAMPLEFORMAT, should not always use unsigned.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.