]> granicus.if.org Git - openjpeg/commitdiff
[trunk] Fixed invalid check in in tiff reading method (fixes issue 449)
authorMatthieu Darbois <mayeut@users.noreply.github.com>
Thu, 11 Dec 2014 20:21:26 +0000 (20:21 +0000)
committerMatthieu Darbois <mayeut@users.noreply.github.com>
Thu, 11 Dec 2014 20:21:26 +0000 (20:21 +0000)
src/bin/jp2/convert.c

index 7d317aeea2265fa7161f8a66cab83b9606fc669f..2e40a12620eb353d67cd802109adb17435604017 100644 (file)
@@ -2907,7 +2907,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
 
                         for(i = 0; i < ssize; i += step)
                         {
-                            if((index < imgsize)&(index+1 < imgsize))
+                            if((index < imgsize)&&(index+1 < imgsize))
                             {
                                 image->comps[0].data[index]   = ( dat8[i+0]<<4 )        |(dat8[i+1]>>4);
                                 image->comps[1].data[index]   = ((dat8[i+1]& 0x0f)<< 8) | dat8[i+2];