generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes tab indentation - replacing with 4 spaces

Browse Source
This commit is contained in:
Kobi Gurkan 2014-07-27 17:14:54 +03:00
parent fc8f0e341b
commit 6cac76bfe4
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/imgcodecs/src/grfmt_tiff.cpp
View File

@ -158,7 +158,7 @@ bool TiffDecoder::readHeader()
m_type = CV_MAKETYPE(CV_8U, photometric > 1 ? wanted_channels : 1); m_type = CV_MAKETYPE(CV_8U, photometric > 1 ? wanted_channels : 1);
break; break;
case 16: case 16:
m_type = CV_MAKETYPE(CV_16U, photometric > 1 ? wanted_channels : 1); m_type = CV_MAKETYPE(CV_16U, photometric > 1 ? wanted_channels : 1);
break; break;
case 32: case 32:
@ -326,21 +326,21 @@ bool TiffDecoder::readData( Mat& img )
(ushort*)(data + img.step*i) + x*3, 0, (ushort*)(data + img.step*i) + x*3, 0,
cvSize(tile_width,1) ); cvSize(tile_width,1) );
} }
else if (ncn == 4) else if (ncn == 4)
{ {
if (wanted_channels == 4) if (wanted_channels == 4)
{ {
icvCvt_BGRA2RGBA_16u_C4R(buffer16 + i*tile_width0*ncn, 0, icvCvt_BGRA2RGBA_16u_C4R(buffer16 + i*tile_width0*ncn, 0,
(ushort*)(data + img.step*i) + x * 4, 0, (ushort*)(data + img.step*i) + x * 4, 0,
cvSize(tile_width, 1)); cvSize(tile_width, 1));
} }
else else
{ {
icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0, icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0,
(ushort*)(data + img.step*i) + x * 3, 0, (ushort*)(data + img.step*i) + x * 3, 0,
cvSize(tile_width, 1), 2); cvSize(tile_width, 1), 2);
} }
} }
else else
{ {
icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0, icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0,

2
modules/imgcodecs/test/test_grfmt.cpp
View File

@ -159,7 +159,7 @@ public:
#ifdef HAVE_TIFF #ifdef HAVE_TIFF
for (int num_channels = 1; num_channels <= 4; num_channels++) for (int num_channels = 1; num_channels <= 4; num_channels++)
{ {
if (num_channels == 2) continue; if (num_channels == 2) continue;
// tiff // tiff
ts->printf(ts->LOG, "image type depth:%d channels:%d ext: %s\n", CV_16U, num_channels, ".tiff"); ts->printf(ts->LOG, "image type depth:%d channels:%d ext: %s\n", CV_16U, num_channels, ".tiff");
Mat img(img_r * k, img_c * k, CV_MAKETYPE(CV_16U, num_channels), Scalar::all(0)); Mat img(img_r * k, img_c * k, CV_MAKETYPE(CV_16U, num_channels), Scalar::all(0));