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

Merge branch 'issue-45' into 'master'

Browse Source 
tiffcp: disable strip chopping when trying to convert to JBIG compression

Closes #45

See merge request libtiff/libtiff!138
This commit is contained in:
Even Rouault 2020-04-02 08:07:26 +00:00
commit 57449991d7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/tiffcp.c
View File

@ -152,12 +152,14 @@ static TIFF* openSrcImage (char **imageSpec)
no images specified, or a pointer to the next image number text
*/
{
/* disable strip shopping when using jbig compression */
const char *mode = (defcompression == COMPRESSION_JBIG) ? "rc" : "r";
TIFF *tif;
char *fn = *imageSpec;
*imageSpec = strchr (fn, comma);
if (*imageSpec) { /* there is at least one image number specifier */
**imageSpec = '\0';
tif = TIFFOpen (fn, "r");
tif = TIFFOpen (fn, mode);
/* but, ignore any single trailing comma */
if (!(*imageSpec)[1]) {*imageSpec = NULL; return tif;}
if (tif) {
@ -168,7 +170,7 @@ static TIFF* openSrcImage (char **imageSpec)
}
}
}else
tif = TIFFOpen (fn, "r");
tif = TIFFOpen (fn, mode);
return tif;
}