Merge branch 'fix_jpg2000' into 2.4

This commit is contained in:
Andrey Kamaev 2013-01-28 12:41:35 +04:00
commit 8521ac5d21

View File

@ -212,7 +212,7 @@ bool Jpeg2KDecoder::readData( Mat& img )
cmptlut[0] = jas_image_getcmptbytype( image, JAS_IMAGE_CT_RGB_B );
cmptlut[1] = jas_image_getcmptbytype( image, JAS_IMAGE_CT_RGB_G );
cmptlut[2] = jas_image_getcmptbytype( image, JAS_IMAGE_CT_RGB_R );
if( cmptlut[0] < 0 || cmptlut[1] < 0 || cmptlut[0] < 0 )
if( cmptlut[0] < 0 || cmptlut[1] < 0 || cmptlut[2] < 0 )
result = false;
ncmpts = 3;
}