diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2005-11-21 03:35:05 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2005-11-21 03:35:05 +0000 |
| commit | b86f199feb9d2c4f1648606985b506636c59e44c (patch) | |
| tree | d2af210f523e01bba08a5524fcc3ed090439df64 /libtiff/tif_open.c | |
| parent | 7fd3fba4f3ec9dabde67f67e226e498510238fd2 (diff) | |
| download | libtiff-git-b86f199feb9d2c4f1648606985b506636c59e44c.tar.gz | |
preliminary support for MS MDI format, bug 1002
Diffstat (limited to 'libtiff/tif_open.c')
| -rw-r--r-- | libtiff/tif_open.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libtiff/tif_open.c b/libtiff/tif_open.c index 407a5804..195f3b70 100644 --- a/libtiff/tif_open.c +++ b/libtiff/tif_open.c @@ -1,4 +1,4 @@ -/* $Id: tif_open.c,v 1.27 2005-09-12 16:31:04 fwarmerdam Exp $ */ +/* $Id: tif_open.c,v 1.28 2005-11-21 03:35:05 fwarmerdam Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -357,8 +357,20 @@ TIFFClientOpen( * Setup the byte order handling. */ if (tif->tif_header.tiff_magic != TIFF_BIGENDIAN && - tif->tif_header.tiff_magic != TIFF_LITTLEENDIAN) { + tif->tif_header.tiff_magic != TIFF_LITTLEENDIAN +#if MDI_SUPPORT + && +#if HOST_BIGENDIAN + tif->tif_header.tiff_magic != MDI_BIGENDIAN +#else + tif->tif_header.tiff_magic != MDI_LITTLEENDIAN +#endif + ) { + TIFFError(name, "Not a TIFF or MDI file, bad magic number %d (0x%x)", +#else + ) { TIFFError(name, "Not a TIFF file, bad magic number %d (0x%x)", +#endif tif->tif_header.tiff_magic, tif->tif_header.tiff_magic); goto bad; |