diff options
Diffstat (limited to 'src/libtiff/tif_compress.c')
| -rw-r--r-- | src/libtiff/tif_compress.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/libtiff/tif_compress.c b/src/libtiff/tif_compress.c index 2efc9e2..4e2b4b6 100644 --- a/src/libtiff/tif_compress.c +++ b/src/libtiff/tif_compress.c @@ -1,4 +1,4 @@ -/* $Id: tif_compress.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */ +/* $Id: tif_compress.c,v 1.4 2010/01/26 15:56:36 scuri Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -37,13 +37,12 @@ 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); } @@ -75,13 +74,12 @@ 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); } @@ -111,7 +109,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); } @@ -146,7 +144,7 @@ _TIFFSetDefaultCompressionState(TIFF* tif) tif->tif_cleanup = _TIFFvoid; tif->tif_defstripsize = _TIFFDefaultStripSize; tif->tif_deftilesize = _TIFFDefaultTileSize; - tif->tif_flags &= ~(TIFF_NOBITREV|TIFF_NOREADRAW); + tif->tif_flags &= ~TIFF_NOBITREV; } int |