diff options
| author | Matthieu Darbois <mayeut@users.noreply.github.com> | 2014-12-11 20:21:26 +0000 |
|---|---|---|
| committer | Matthieu Darbois <mayeut@users.noreply.github.com> | 2014-12-11 20:21:26 +0000 |
| commit | c0710f557c661f78ef954d2fcf35352771b84369 (patch) | |
| tree | 1e641aebb5d3d60608e069faedd37971eb9990f6 /src/bin | |
| parent | f09502732916ed7823623eb54c71c649ec540d37 (diff) | |
[trunk] Fixed invalid check in in tiff reading method (fixes issue 449)
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/jp2/convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index 7d317aee..2e40a126 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -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]; |