Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

imgcodecs(tiff): add more checks

Browse Source 
backporting of commit: f6230ae019
pull/14783/head
Alexander Alekhin 6 years ago
parent b3e6c97d98
commit db7f689728
1 changed files with 7 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      modules/imgcodecs/src/grfmt_tiff.cpp

10
modules/imgcodecs/src/grfmt_tiff.cpp
Unescape View File

@ -537,6 +537,7 @@ bool TiffDecoder::readData( Mat& img )
} }
else else
{ {
CV_CheckEQ(wanted_channels, 3, "TIFF-8bpp: BGR/BGRA images are supported only");
icvCvt_BGRA2BGR_8u_C4C3R(bstart + i*tile_width0*4, 0, icvCvt_BGRA2BGR_8u_C4C3R(bstart + i*tile_width0*4, 0,
img.ptr(img_y + tile_height - i - 1, x), 0, img.ptr(img_y + tile_height - i - 1, x), 0,
Size(tile_width, 1), 2); Size(tile_width, 1), 2);
@ -544,6 +545,7 @@ bool TiffDecoder::readData( Mat& img )
} }
else else
{ {
CV_CheckEQ(wanted_channels, 1, "");
icvCvt_BGRA2Gray_8u_C4C1R( bstart + i*tile_width0*4, 0, icvCvt_BGRA2Gray_8u_C4C1R( bstart + i*tile_width0*4, 0,
img.ptr(img_y + tile_height - i - 1, x), 0, img.ptr(img_y + tile_height - i - 1, x), 0,
Size(tile_width, 1), 2); Size(tile_width, 1), 2);
@ -569,12 +571,14 @@ bool TiffDecoder::readData( Mat& img )
{ {
if (ncn == 1) if (ncn == 1)
{ {
CV_CheckEQ(wanted_channels, 3, "");
icvCvt_Gray2BGR_16u_C1C3R(buffer16 + i*tile_width0*ncn, 0, icvCvt_Gray2BGR_16u_C1C3R(buffer16 + i*tile_width0*ncn, 0,
img.ptr<ushort>(img_y + i, x), 0, img.ptr<ushort>(img_y + i, x), 0,
Size(tile_width, 1)); Size(tile_width, 1));
} }
else if (ncn == 3) else if (ncn == 3)
{ {
CV_CheckEQ(wanted_channels, 3, "");
icvCvt_RGB2BGR_16u_C3R(buffer16 + i*tile_width0*ncn, 0, icvCvt_RGB2BGR_16u_C3R(buffer16 + i*tile_width0*ncn, 0,
img.ptr<ushort>(img_y + i, x), 0, img.ptr<ushort>(img_y + i, x), 0,
Size(tile_width, 1)); Size(tile_width, 1));
@ -589,6 +593,7 @@ bool TiffDecoder::readData( Mat& img )
} }
else else
{ {
CV_CheckEQ(wanted_channels, 3, "TIFF-16bpp: BGR/BGRA images are supported only");
icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0, icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0,
img.ptr<ushort>(img_y + i, x), 0, img.ptr<ushort>(img_y + i, x), 0,
Size(tile_width, 1), 2); Size(tile_width, 1), 2);
@ -596,13 +601,12 @@ bool TiffDecoder::readData( Mat& img )
} }
else else
{ {
icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0, CV_Error(Error::StsError, "Not supported");
img.ptr<ushort>(img_y + i, x), 0,
Size(tile_width, 1), 2);
} }
} }
else else
{ {
CV_CheckEQ(wanted_channels, 1, "");
if( ncn == 1 ) if( ncn == 1 )
{ {
memcpy(img.ptr<ushort>(img_y + i, x), memcpy(img.ptr<ushort>(img_y + i, x),

Write Preview
Loading…
Cancel
Save