diff options
| author | Joris Van Damme <joris.at.lebbeke@skynet.be> | 2005-12-21 12:23:13 +0000 |
|---|---|---|
| committer | Joris Van Damme <joris.at.lebbeke@skynet.be> | 2005-12-21 12:23:13 +0000 |
| commit | 5cbfc68f0625d6c29d724b6e57fa7e98017ad325 (patch) | |
| tree | 78796f9d7b231ba6b69e2675e2b342f81e21dc50 /libtiff/tif_zip.c | |
| parent | 839c207d313ccf068c98aa4d466e81fdf1aef27b (diff) | |
| download | libtiff-git-5cbfc68f0625d6c29d724b6e57fa7e98017ad325.tar.gz | |
*** empty log message ***
Diffstat (limited to 'libtiff/tif_zip.c')
| -rw-r--r-- | libtiff/tif_zip.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libtiff/tif_zip.c b/libtiff/tif_zip.c index cb49589d..7e3a10f0 100644 --- a/libtiff/tif_zip.c +++ b/libtiff/tif_zip.c @@ -1,4 +1,4 @@ -/* $Id: tif_zip.c,v 1.6 2005-12-13 21:23:58 dron Exp $ */ +/* $Id: tif_zip.c,v 1.7 2005-12-21 12:23:14 joris Exp $ */ /* * Copyright (c) 1995-1997 Sam Leffler @@ -91,7 +91,7 @@ ZIPSetupDecode(TIFF* tif) assert(sp != NULL); if (inflateInit(&sp->stream) != Z_OK) { - TIFFError(module, "%s: %s", tif->tif_name, sp->stream.msg); + TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg); return (0); } else { sp->state |= ZSTATE_INIT; @@ -129,7 +129,7 @@ ZIPDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s) if (state == Z_STREAM_END) break; if (state == Z_DATA_ERROR) { - TIFFError(module, + TIFFErrorExt(tif->tif_clientdata, module, "%s: Decoding error at scanline %d, %s", tif->tif_name, tif->tif_row, sp->stream.msg); if (inflateSync(&sp->stream) != Z_OK) @@ -137,13 +137,13 @@ ZIPDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s) continue; } if (state != Z_OK) { - TIFFError(module, "%s: zlib error: %s", + TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s", tif->tif_name, sp->stream.msg); return (0); } } while (sp->stream.avail_out > 0); if (sp->stream.avail_out != 0) { - TIFFError(module, + TIFFErrorExt(tif->tif_clientdata, module, "%s: Not enough data at scanline %d (short %d bytes)", tif->tif_name, tif->tif_row, sp->stream.avail_out); return (0); @@ -159,7 +159,7 @@ ZIPSetupEncode(TIFF* tif) assert(sp != NULL); if (deflateInit(&sp->stream, sp->zipquality) != Z_OK) { - TIFFError(module, "%s: %s", tif->tif_name, sp->stream.msg); + TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg); return (0); } else { sp->state |= ZSTATE_INIT; @@ -196,7 +196,7 @@ ZIPEncode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s) sp->stream.avail_in = cc; do { if (deflate(&sp->stream, Z_NO_FLUSH) != Z_OK) { - TIFFError(module, "%s: Encoder error: %s", + TIFFErrorExt(tif->tif_clientdata, module, "%s: Encoder error: %s", tif->tif_name, sp->stream.msg); return (0); } @@ -237,7 +237,7 @@ ZIPPostEncode(TIFF* tif) } break; default: - TIFFError(module, "%s: zlib error: %s", + TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s", tif->tif_name, sp->stream.msg); return (0); } @@ -274,7 +274,7 @@ ZIPVSetField(TIFF* tif, ttag_t tag, va_list ap) if (tif->tif_mode != O_RDONLY && (sp->state&ZSTATE_INIT)) { if (deflateParams(&sp->stream, sp->zipquality, Z_DEFAULT_STRATEGY) != Z_OK) { - TIFFError(module, "%s: zlib error: %s", + TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s", tif->tif_name, sp->stream.msg); return (0); } @@ -360,7 +360,7 @@ TIFFInitZIP(TIFF* tif, int scheme) (void) TIFFPredictorInit(tif); return (1); bad: - TIFFError("TIFFInitZIP", "No space for ZIP state block"); + TIFFErrorExt(tif->tif_clientdata, "TIFFInitZIP", "No space for ZIP state block"); return (0); } #endif /* ZIP_SUPORT */ |