cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BigTIFF upgrade in tif_dirwrite.c - still temp mess

Browse Source
This commit is contained in:
Joris Van Damme 2007-06-07 12:15:18 +00:00
parent 92c13c9aac
commit 0b44a7943b
3 changed files with 960 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtiff/tif_dir.h
View File

@ -1,4 +1,4 @@
/* $Id: tif_dir.h,v 1.37 2007-06-06 10:01:01 joris Exp $ */ /* $Id: tif_dir.h,v 1.38 2007-06-07 12:15:18 joris Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -180,7 +180,7 @@ extern "C" {
extern const TIFFFieldInfo *_TIFFGetFieldInfo(size_t *); extern const TIFFFieldInfo *_TIFFGetFieldInfo(size_t *);
extern const TIFFFieldInfo *_TIFFGetExifFieldInfo(size_t *); extern const TIFFFieldInfo *_TIFFGetExifFieldInfo(size_t *);
extern void _TIFFSetupFieldInfo(TIFF* tif, const TIFFFieldInfo unfo[], uint32 n); extern void _TIFFSetupFieldInfo(TIFF* tif, const TIFFFieldInfo unfo[], uint32 n);
extern int _TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], uint32); extern int _TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], uint32);
extern void _TIFFPrintFieldInfo(TIFF*, FILE*); extern void _TIFFPrintFieldInfo(TIFF*, FILE*);
extern TIFFDataType _TIFFSampleToTagType(TIFF*); extern TIFFDataType _TIFFSampleToTagType(TIFF*);
extern const TIFFFieldInfo* _TIFFFindOrRegisterFieldInfo(TIFF *tif, uint32 tag, extern const TIFFFieldInfo* _TIFFFindOrRegisterFieldInfo(TIFF *tif, uint32 tag,

930
libtiff/tif_dirwrite.c
View File

File diff suppressed because it is too large Load Diff

206
libtiff/tiffiop.h
View File

@ -1,4 +1,4 @@
/* $Id: tiffiop.h,v 1.58 2007-05-30 13:53:18 joris Exp $ */ /* $Id: tiffiop.h,v 1.59 2007-06-07 12:15:18 joris Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -93,108 +93,104 @@ typedef uint32 (*TIFFStripMethod)(TIFF*, uint32);
typedef void (*TIFFTileMethod)(TIFF*, uint32*, uint32*); typedef void (*TIFFTileMethod)(TIFF*, uint32*, uint32*);
struct tiff { struct tiff {
char* tif_name; /* name of open file */ char* tif_name; /* name of open file */
int tif_fd; /* open file descriptor */ int tif_fd; /* open file descriptor */
int tif_mode; /* open mode (O_*) */ int tif_mode; /* open mode (O_*) */
uint32 tif_flags; uint32 tif_flags;
#define TIFF_FILLORDER 0x00003 /* natural bit fill order for machine */ #define TIFF_FILLORDER 0x00003 /* natural bit fill order for machine */
#define TIFF_DIRTYHEADER 0x00004 /* header must be written on close */ #define TIFF_DIRTYHEADER 0x00004 /* header must be written on close */
#define TIFF_DIRTYDIRECT 0x00008 /* current directory must be written */ #define TIFF_DIRTYDIRECT 0x00008 /* current directory must be written */
#define TIFF_BUFFERSETUP 0x00010 /* data buffers setup */ #define TIFF_BUFFERSETUP 0x00010 /* data buffers setup */
#define TIFF_CODERSETUP 0x00020 /* encoder/decoder setup done */ #define TIFF_CODERSETUP 0x00020 /* encoder/decoder setup done */
#define TIFF_BEENWRITING 0x00040 /* written 1+ scanlines to file */ #define TIFF_BEENWRITING 0x00040 /* written 1+ scanlines to file */
#define TIFF_SWAB 0x00080 /* byte swap file information */ #define TIFF_SWAB 0x00080 /* byte swap file information */
#define TIFF_NOBITREV 0x00100 /* inhibit bit reversal logic */ #define TIFF_NOBITREV 0x00100 /* inhibit bit reversal logic */
#define TIFF_MYBUFFER 0x00200 /* my raw data buffer; free on close */ #define TIFF_MYBUFFER 0x00200 /* my raw data buffer; free on close */
#define TIFF_ISTILED 0x00400 /* file is tile, not strip- based */ #define TIFF_ISTILED 0x00400 /* file is tile, not strip- based */
#define TIFF_MAPPED 0x00800 /* file is mapped into memory */ #define TIFF_MAPPED 0x00800 /* file is mapped into memory */
#define TIFF_POSTENCODE 0x01000 /* need call to postencode routine */ #define TIFF_POSTENCODE 0x01000 /* need call to postencode routine */
#define TIFF_INSUBIFD 0x02000 /* currently writing a subifd */ #define TIFF_INSUBIFD 0x02000 /* currently writing a subifd */
#define TIFF_UPSAMPLED 0x04000 /* library is doing data up-sampling */ #define TIFF_UPSAMPLED 0x04000 /* library is doing data up-sampling */
#define TIFF_STRIPCHOP 0x08000 /* enable strip chopping support */ #define TIFF_STRIPCHOP 0x08000 /* enable strip chopping support */
#define TIFF_HEADERONLY 0x10000 /* read header only, do not process */ #define TIFF_HEADERONLY 0x10000 /* read header only, do not process the first directory */
/* the first directory */ #define TIFF_NOREADRAW 0x20000 /* skip reading of raw uncompressed image data */
#define TIFF_NOREADRAW 0x20000 /* skip reading of raw uncompressed */ #define TIFF_INCUSTOMIFD 0x40000 /* currently writing a custom IFD */
/* image data */ #define TIFF_BIGTIFF 0x80000 /* read/write bigtiff */
#define TIFF_INCUSTOMIFD 0x40000 /* currently writing a custom IFD */ uint64_new tif_diroff; /* file offset of current directory */
#define TIFF_BIGTIFF 0x80000 /* read/write bigtiff */ uint64_new tif_nextdiroff; /* file offset of following directory */
uint64_new tif_diroff; /* file offset of current directory */ uint64_new* tif_dirlist; /* list of offsets to already seen directories to prevent IFD looping */
uint64_new tif_nextdiroff; /* file offset of following directory */ uint16 tif_dirlistsize; /* number of entires in offset list */
uint64_new* tif_dirlist; /* list of offsets to already seen */ uint16 tif_dirnumber; /* number of already seen directories */
/* directories to prevent IFD looping */ TIFFDirectory tif_dir; /* internal rep of current directory */
uint16 tif_dirlistsize;/* number of entires in offset list */ TIFFDirectory tif_customdir; /* custom IFDs are separated from the main ones */
uint16 tif_dirnumber; /* number of already seen directories */
TIFFDirectory tif_dir; /* internal rep of current directory */
TIFFDirectory tif_customdir; /* custom IFDs are separated from
the main ones */
union { union {
TIFFHeaderCommon common; TIFFHeaderCommon common;
TIFFHeaderClassic classic; TIFFHeaderClassic classic;
TIFFHeaderBig big; TIFFHeaderBig big;
} tif_header; } tif_header;
uint16 tif_header_size; /* file's header block and its length */ uint16 tif_header_size; /* file's header block and its length */
const int* tif_typeshift; /* data type shift counts */ const int* tif_typeshift; /* data type shift counts */
const long* tif_typemask; /* data type masks */ const long* tif_typemask; /* data type masks */
uint32 tif_row; /* current scanline */ uint32 tif_row; /* current scanline */
uint16 tif_curdir; /* current directory (index) */ uint16 tif_curdir; /* current directory (index) */
uint32 tif_curstrip; /* current strip for read/write */ uint32 tif_curstrip; /* current strip for read/write */
uint64_new tif_curoff; /* current offset for read/write */ uint64_new tif_curoff; /* current offset for read/write */
uint64_new tif_dataoff; /* current offset for writing dir */ uint64_new tif_dataoff; /* current offset for writing dir */
/* SubIFD support */ /* SubIFD support */
uint16 tif_nsubifd; /* remaining subifds to write */ uint16 tif_nsubifd; /* remaining subifds to write */
uint64_new tif_subifdoff; /* offset for patching SubIFD link */ uint64_new tif_subifdoff; /* offset for patching SubIFD link */
/* tiling support */ /* tiling support */
uint32 tif_col; /* current column (offset by row too) */ uint32 tif_col; /* current column (offset by row too) */
uint32 tif_curtile; /* current tile for read/write */ uint32 tif_curtile; /* current tile for read/write */
tmsize_t tif_tilesize; /* # of bytes in a tile */ tmsize_t tif_tilesize; /* # of bytes in a tile */
/* compression scheme hooks */ /* compression scheme hooks */
int tif_decodestatus; int tif_decodestatus;
TIFFBoolMethod tif_fixuptags; /* called in TIFFReadDirectory */ TIFFBoolMethod tif_fixuptags; /* called in TIFFReadDirectory */
TIFFBoolMethod tif_setupdecode;/* called once before predecode */ TIFFBoolMethod tif_setupdecode; /* called once before predecode */
TIFFPreMethod tif_predecode; /* pre- row/strip/tile decoding */ TIFFPreMethod tif_predecode; /* pre- row/strip/tile decoding */
TIFFBoolMethod tif_setupencode;/* called once before preencode */ TIFFBoolMethod tif_setupencode; /* called once before preencode */
int tif_encodestatus; int tif_encodestatus;
TIFFPreMethod tif_preencode; /* pre- row/strip/tile encoding */ TIFFPreMethod tif_preencode; /* pre- row/strip/tile encoding */
TIFFBoolMethod tif_postencode; /* post- row/strip/tile encoding */ TIFFBoolMethod tif_postencode; /* post- row/strip/tile encoding */
TIFFCodeMethod tif_decoderow; /* scanline decoding routine */ TIFFCodeMethod tif_decoderow; /* scanline decoding routine */
TIFFCodeMethod tif_encoderow; /* scanline encoding routine */ TIFFCodeMethod tif_encoderow; /* scanline encoding routine */
TIFFCodeMethod tif_decodestrip;/* strip decoding routine */ TIFFCodeMethod tif_decodestrip; /* strip decoding routine */
TIFFCodeMethod tif_encodestrip;/* strip encoding routine */ TIFFCodeMethod tif_encodestrip; /* strip encoding routine */
TIFFCodeMethod tif_decodetile; /* tile decoding routine */ TIFFCodeMethod tif_decodetile; /* tile decoding routine */
TIFFCodeMethod tif_encodetile; /* tile encoding routine */ TIFFCodeMethod tif_encodetile; /* tile encoding routine */
TIFFVoidMethod tif_close; /* cleanup-on-close routine */ TIFFVoidMethod tif_close; /* cleanup-on-close routine */
TIFFSeekMethod tif_seek; /* position within a strip routine */ TIFFSeekMethod tif_seek; /* position within a strip routine */
TIFFVoidMethod tif_cleanup; /* cleanup state routine */ TIFFVoidMethod tif_cleanup; /* cleanup state routine */
TIFFStripMethod tif_defstripsize;/* calculate/constrain strip size */ TIFFStripMethod tif_defstripsize; /* calculate/constrain strip size */
TIFFTileMethod tif_deftilesize;/* calculate/constrain tile size */ TIFFTileMethod tif_deftilesize; /* calculate/constrain tile size */
uint8* tif_data; /* compression scheme private data */ uint8* tif_data; /* compression scheme private data */
/* input/output buffering */ /* input/output buffering */
tmsize_t tif_scanlinesize;/* # of bytes in a scanline */ tmsize_t tif_scanlinesize; /* # of bytes in a scanline */
tmsize_t tif_scanlineskew;/* scanline skew for reading strips */ tmsize_t tif_scanlineskew; /* scanline skew for reading strips */
uint8* tif_rawdata; /* raw data buffer */ uint8* tif_rawdata; /* raw data buffer */
tmsize_t tif_rawdatasize;/* # of bytes in raw data buffer */ tmsize_t tif_rawdatasize; /* # of bytes in raw data buffer */
uint8* tif_rawcp; /* current spot in raw buffer */ uint8* tif_rawcp; /* current spot in raw buffer */
tmsize_t tif_rawcc; /* bytes unread from raw buffer */ tmsize_t tif_rawcc; /* bytes unread from raw buffer */
/* memory-mapped file support */ /* memory-mapped file support */
uint8* tif_base; /* base of mapped file */ uint8* tif_base; /* base of mapped file */
tmsize_t tif_size; /* size of mapped file region (bytes) */ tmsize_t tif_size; /* size of mapped file region (bytes) */
TIFFMapFileProc tif_mapproc; /* map file method */ TIFFMapFileProc tif_mapproc; /* map file method */
TIFFUnmapFileProc tif_unmapproc;/* unmap file method */ TIFFUnmapFileProc tif_unmapproc; /* unmap file method */
/* input/output callback methods */ /* input/output callback methods */
thandle_t tif_clientdata; /* callback parameter */ thandle_t tif_clientdata; /* callback parameter */
TIFFReadWriteProc tif_readproc; /* read method */ TIFFReadWriteProc tif_readproc; /* read method */
TIFFReadWriteProc tif_writeproc;/* write method */ TIFFReadWriteProc tif_writeproc; /* write method */
TIFFSeekProc tif_seekproc; /* lseek method */ TIFFSeekProc tif_seekproc; /* lseek method */
TIFFCloseProc tif_closeproc; /* close method */ TIFFCloseProc tif_closeproc; /* close method */
TIFFSizeProc tif_sizeproc; /* filesize method */ TIFFSizeProc tif_sizeproc; /* filesize method */
/* post-decoding support */ /* post-decoding support */
TIFFPostMethod tif_postdecode; /* post decoding routine */ TIFFPostMethod tif_postdecode; /* post decoding routine */
/* tag support */ /* tag support */
TIFFFieldInfo** tif_fieldinfo; /* sorted table of registered tags */ TIFFFieldInfo** tif_fieldinfo; /* sorted table of registered tags */
uint32 tif_nfields; /* # entries in registered tag table */ uint32 tif_nfields; /* # entries in registered tag table */
const TIFFFieldInfo *tif_foundfield;/* cached pointer to already found tag */ const TIFFFieldInfo* tif_foundfield; /* cached pointer to already found tag */
TIFFTagMethods tif_tagmethods; /* tag get/set/print routines */ TIFFTagMethods tif_tagmethods; /* tag get/set/print routines */
TIFFClientInfoLink *tif_clientinfo; /* extra client information. */ TIFFClientInfoLink* tif_clientinfo; /* extra client information. */
}; };
#define isPseudoTag(t) (t > 0xffff) /* is tag value normal or pseudo */ #define isPseudoTag(t) (t > 0xffff) /* is tag value normal or pseudo */
@ -291,45 +287,45 @@ extern TIFFErrorHandlerExt _TIFFerrorHandlerExt;
extern void* _TIFFCheckMalloc(TIFF* tif, tmsize_t nmemb, tmsize_t elem_size, const char* what); extern void* _TIFFCheckMalloc(TIFF* tif, tmsize_t nmemb, tmsize_t elem_size, const char* what);
extern void* _TIFFCheckRealloc(TIFF* tif, void* buffer, tmsize_t nmemb, tmsize_t elem_size, const char* what); extern void* _TIFFCheckRealloc(TIFF* tif, void* buffer, tmsize_t nmemb, tmsize_t elem_size, const char* what);
extern int TIFFInitDumpMode(TIFF*, int); extern int TIFFInitDumpMode(TIFF*, int);
#ifdef PACKBITS_SUPPORT #ifdef PACKBITS_SUPPORT
extern int TIFFInitPackBits(TIFF*, int); extern int TIFFInitPackBits(TIFF*, int);
#endif #endif
#ifdef CCITT_SUPPORT #ifdef CCITT_SUPPORT
extern int TIFFInitCCITTRLE(TIFF*, int), TIFFInitCCITTRLEW(TIFF*, int); extern int TIFFInitCCITTRLE(TIFF*, int), TIFFInitCCITTRLEW(TIFF*, int);
extern int TIFFInitCCITTFax3(TIFF*, int), TIFFInitCCITTFax4(TIFF*, int); extern int TIFFInitCCITTFax3(TIFF*, int), TIFFInitCCITTFax4(TIFF*, int);
#endif #endif
#ifdef THUNDER_SUPPORT #ifdef THUNDER_SUPPORT
extern int TIFFInitThunderScan(TIFF*, int); extern int TIFFInitThunderScan(TIFF*, int);
#endif #endif
#ifdef NEXT_SUPPORT #ifdef NEXT_SUPPORT
extern int TIFFInitNeXT(TIFF*, int); extern int TIFFInitNeXT(TIFF*, int);
#endif #endif
#ifdef LZW_SUPPORT #ifdef LZW_SUPPORT
extern int TIFFInitLZW(TIFF*, int); extern int TIFFInitLZW(TIFF*, int);
#endif #endif
#ifdef OJPEG_SUPPORT #ifdef OJPEG_SUPPORT
extern int TIFFInitOJPEG(TIFF*, int); extern int TIFFInitOJPEG(TIFF*, int);
#endif #endif
#ifdef JPEG_SUPPORT #ifdef JPEG_SUPPORT
extern int TIFFInitJPEG(TIFF*, int); extern int TIFFInitJPEG(TIFF*, int);
#endif #endif
#ifdef JBIG_SUPPORT #ifdef JBIG_SUPPORT
extern int TIFFInitJBIG(TIFF*, int); extern int TIFFInitJBIG(TIFF*, int);
#endif #endif
#ifdef ZIP_SUPPORT #ifdef ZIP_SUPPORT
extern int TIFFInitZIP(TIFF*, int); extern int TIFFInitZIP(TIFF*, int);
#endif #endif
#ifdef PIXARLOG_SUPPORT #ifdef PIXARLOG_SUPPORT
extern int TIFFInitPixarLog(TIFF*, int); extern int TIFFInitPixarLog(TIFF*, int);
#endif #endif
#ifdef LOGLUV_SUPPORT #ifdef LOGLUV_SUPPORT
extern int TIFFInitSGILog(TIFF*, int); extern int TIFFInitSGILog(TIFF*, int);
#endif #endif
#ifdef VMS #ifdef VMS
extern const TIFFCodec _TIFFBuiltinCODECS[]; extern const TIFFCodec _TIFFBuiltinCODECS[];
#else #else
extern TIFFCodec _TIFFBuiltinCODECS[]; extern TIFFCodec _TIFFBuiltinCODECS[];
#endif #endif
#if defined(__cplusplus) #if defined(__cplusplus)