diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2018-03-27 14:08:47 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2018-03-29 13:44:03 +0100 |
| commit | 003c4211a019eb5c4719860f353777e177553490 (patch) | |
| tree | e526be8e98c305b1cc135714fa7c9e272ecfd20a /tiff/libtiff/tif_zip.c | |
| parent | bc817a3afdb932eadac17155834f89efd1c96da4 (diff) | |
| download | ghostpdl-003c4211a019eb5c4719860f353777e177553490.tar.gz | |
Update libtiff to 4.0.9
Add in portability changes to tiffiop.h
Portability tiffiop.h
Remove globals from tif_pixarlog.c
Tweaks to support libtiff 4.0.9
Diffstat (limited to 'tiff/libtiff/tif_zip.c')
| -rw-r--r-- | tiff/libtiff/tif_zip.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tiff/libtiff/tif_zip.c b/tiff/libtiff/tif_zip.c index 8c35aea83..42943fbb1 100644 --- a/tiff/libtiff/tif_zip.c +++ b/tiff/libtiff/tif_zip.c @@ -1,4 +1,4 @@ -/* $Id: tif_zip.c,v 1.36 2016-11-12 16:48:28 erouault Exp $ */ +/* $Id: tif_zip.c,v 1.37 2017-05-10 15:21:16 erouault Exp $ */ /* * Copyright (c) 1995-1997 Sam Leffler @@ -107,7 +107,11 @@ ZIPSetupDecode(TIFF* tif) sp->state = 0; } - if (inflateInit(&sp->stream) != Z_OK) { + /* This function can possibly be called several times by */ + /* PredictorSetupDecode() if this function succeeds but */ + /* PredictorSetup() fails */ + if ((sp->state & ZSTATE_INIT_DECODE) == 0 && + inflateInit(&sp->stream) != Z_OK) { TIFFErrorExt(tif->tif_clientdata, module, "%s", SAFE_MSG(sp)); return (0); } else { |