cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tif_ojpeg.c: avoid relying on isTiled macro being wrapped in ()

Browse Source
This commit is contained in:
Even Rouault 2019-09-02 16:22:10 +02:00
parent 7475a28508
commit 6de57f7e0f
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtiff/tif_ojpeg.c
View File

@ -679,7 +679,7 @@ OJPEGPreDecode(TIFF* tif, uint16 s)
if (OJPEGReadSecondarySos(tif,s)==0) if (OJPEGReadSecondarySos(tif,s)==0)
return(0); return(0);
} }
if isTiled(tif) if (isTiled(tif))
m=tif->tif_curtile; m=tif->tif_curtile;
else else
m=tif->tif_curstrip; m=tif->tif_curstrip;
@ -1084,7 +1084,7 @@ OJPEGReadHeaderInfo(TIFF* tif)
assert(sp->readheader_done==0); assert(sp->readheader_done==0);
sp->image_width=tif->tif_dir.td_imagewidth; sp->image_width=tif->tif_dir.td_imagewidth;
sp->image_length=tif->tif_dir.td_imagelength; sp->image_length=tif->tif_dir.td_imagelength;
if isTiled(tif) if (isTiled(tif))
{ {
sp->strile_width=tif->tif_dir.td_tilewidth; sp->strile_width=tif->tif_dir.td_tilewidth;
sp->strile_length=tif->tif_dir.td_tilelength; sp->strile_length=tif->tif_dir.td_tilelength;