Merge branch 'fix_jpg2000' into 2.4

8521ac5d · Andrey Kamaev · d8f749da · e8735546 · 8521ac5d
Commit 8521ac5d authored Jan 28, 2013 by Andrey Kamaev
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

grfmt_jpeg2000.cpp modules/highgui/src/grfmt_jpeg2000.cpp +1 -1

No files found.
--- a/modules/highgui/src/grfmt_jpeg2000.cpp
+++ b/modules/highgui/src/grfmt_jpeg2000.cpp
@@ -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;
            }