diff options
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_compress.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_compress.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_compress.c b/src/3rdparty/libtiff/libtiff/tif_compress.c index f7bb2a5..6c3f322 100644 --- a/src/3rdparty/libtiff/libtiff/tif_compress.c +++ b/src/3rdparty/libtiff/libtiff/tif_compress.c @@ -1,4 +1,4 @@ -/* $Id: tif_compress.c,v 1.11 2005/12/21 12:23:13 joris Exp $ */ +/* $Id: tif_compress.c,v 1.13 2007/02/24 15:03:50 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -37,12 +37,13 @@ TIFFNoEncode(TIFF* tif, const char* method) const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression); if (c) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "%s %s encoding is not implemented", - c->name, method); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "%s %s encoding is not implemented", + c->name, method); } else { TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "Compression scheme %u %s encoding is not implemented", - tif->tif_dir.td_compression, method); + "Compression scheme %u %s encoding is not implemented", + tif->tif_dir.td_compression, method); } return (-1); } @@ -74,12 +75,13 @@ TIFFNoDecode(TIFF* tif, const char* method) const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression); if (c) - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "%s %s decoding is not implemented", - c->name, method); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "%s %s decoding is not implemented", + c->name, method); else TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "Compression scheme %u %s decoding is not implemented", - tif->tif_dir.td_compression, method); + "Compression scheme %u %s decoding is not implemented", + tif->tif_dir.td_compression, method); return (-1); } @@ -109,7 +111,7 @@ _TIFFNoSeek(TIFF* tif, uint32 off) { (void) off; TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "Compression algorithm does not support random access"); + "Compression algorithm does not support random access"); return (0); } @@ -144,7 +146,7 @@ _TIFFSetDefaultCompressionState(TIFF* tif) tif->tif_cleanup = _TIFFvoid; tif->tif_defstripsize = _TIFFDefaultStripSize; tif->tif_deftilesize = _TIFFDefaultTileSize; - tif->tif_flags &= ~TIFF_NOBITREV; + tif->tif_flags &= ~(TIFF_NOBITREV|TIFF_NOREADRAW); } int |