diff options
Diffstat (limited to 'src/libtiff/tif_open.c')
| -rw-r--r-- | src/libtiff/tif_open.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/libtiff/tif_open.c b/src/libtiff/tif_open.c index 0ab465a..9adda1d 100644 --- a/src/libtiff/tif_open.c +++ b/src/libtiff/tif_open.c @@ -1,4 +1,4 @@ -/* $Id: tif_open.c,v 1.3 2009/12/11 15:17:41 scuri Exp $ */ +/* $Id: tif_open.c,v 1.4 2010/01/26 15:56:36 scuri Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -198,7 +198,7 @@ TIFFClientOpen( */ tif->tif_flags = FILLORDER_MSB2LSB; if (m == O_RDONLY ) - tif->tif_flags |= TIFF_MAPPED; + tif->tif_flags |= TIFF_MAPPED; #ifdef STRIPCHOP_DEFAULT if (m == O_RDONLY || m == O_RDWR) @@ -307,8 +307,7 @@ TIFFClientOpen( if (tif->tif_mode & O_TRUNC || !ReadOK(tif, &tif->tif_header, sizeof (TIFFHeader))) { if (tif->tif_mode == O_RDONLY) { - TIFFErrorExt(tif->tif_clientdata, name, - "Cannot read TIFF header"); + TIFFErrorExt(tif->tif_clientdata, name, "Cannot read TIFF header"); goto bad; } /* @@ -337,8 +336,7 @@ TIFFClientOpen( TIFFSeekFile( tif, 0, SEEK_SET ); if (!WriteOK(tif, &tif->tif_header, sizeof (TIFFHeader))) { - TIFFErrorExt(tif->tif_clientdata, name, - "Error writing TIFF header"); + TIFFErrorExt(tif->tif_clientdata, name, "Error writing TIFF header"); goto bad; } /* @@ -352,7 +350,6 @@ TIFFClientOpen( goto bad; tif->tif_diroff = 0; tif->tif_dirlist = NULL; - tif->tif_dirlistsize = 0; tif->tif_dirnumber = 0; return (tif); } @@ -369,12 +366,10 @@ TIFFClientOpen( tif->tif_header.tiff_magic != MDI_LITTLEENDIAN #endif ) { - TIFFErrorExt(tif->tif_clientdata, name, - "Not a TIFF or MDI file, bad magic number %d (0x%x)", + TIFFErrorExt(tif->tif_clientdata, name, "Not a TIFF or MDI file, bad magic number %d (0x%x)", #else ) { - TIFFErrorExt(tif->tif_clientdata, name, - "Not a TIFF file, bad magic number %d (0x%x)", + TIFFErrorExt(tif->tif_clientdata, name, "Not a TIFF file, bad magic number %d (0x%x)", #endif tif->tif_header.tiff_magic, tif->tif_header.tiff_magic); @@ -403,7 +398,7 @@ TIFFClientOpen( TIFFErrorExt(tif->tif_clientdata, name, "Not a TIFF file, bad version number %d (0x%x)", tif->tif_header.tiff_version, - tif->tif_header.tiff_version); + tif->tif_header.tiff_version); goto bad; } tif->tif_flags |= TIFF_MYBUFFER; |