Skip to content

O
opencv
Commit db7f6897 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

imgcodecs(tiff): add more checks 

backporting of commit: f6230ae0
parent b3e6c97d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
modules/imgcodecs/src/grfmt_tiff.cpp
View file @ db7f6897
......@@ -537,6 +537,7 @@ bool TiffDecoder::readData( Mat& img )
}
else
{
CV_CheckEQ(wanted_channels, 3, "TIFF-8bpp: BGR/BGRA images are supported only");
icvCvt_BGRA2BGR_8u_C4C3R(bstart + i*tile_width0*4, 0,
img.ptr(img_y + tile_height - i - 1, x), 0,
Size(tile_width, 1), 2);
......@@ -544,6 +545,7 @@ bool TiffDecoder::readData( Mat& img )
}
else
{
CV_CheckEQ(wanted_channels, 1, "");
icvCvt_BGRA2Gray_8u_C4C1R( bstart + i*tile_width0*4, 0,
img.ptr(img_y + tile_height - i - 1, x), 0,
Size(tile_width, 1), 2);
......@@ -569,12 +571,14 @@ bool TiffDecoder::readData( Mat& img )
{
if (ncn == 1)
{
CV_CheckEQ(wanted_channels, 3, "");
icvCvt_Gray2BGR_16u_C1C3R(buffer16 + i*tile_width0*ncn, 0,
img.ptr<ushort>(img_y + i, x), 0,
Size(tile_width, 1));
}
else if (ncn == 3)
{
CV_CheckEQ(wanted_channels, 3, "");
icvCvt_RGB2BGR_16u_C3R(buffer16 + i*tile_width0*ncn, 0,
img.ptr<ushort>(img_y + i, x), 0,
Size(tile_width, 1));
......@@ -589,6 +593,7 @@ bool TiffDecoder::readData( Mat& img )
}
else
{
CV_CheckEQ(wanted_channels, 3, "TIFF-16bpp: BGR/BGRA images are supported only");
icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0,
img.ptr<ushort>(img_y + i, x), 0,
Size(tile_width, 1), 2);
......@@ -596,13 +601,12 @@ bool TiffDecoder::readData( Mat& img )
}
else
{
icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0,
img.ptr<ushort>(img_y + i, x), 0,
Size(tile_width, 1), 2);
CV_Error(Error::StsError, "Not supported");
}
}
else
{
CV_CheckEQ(wanted_channels, 1, "");
if( ncn == 1 )
{
memcpy(img.ptr<ushort>(img_y + i, x),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment