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

Applied Francois Dagand's patch to handle fax decompression bug.

Browse Source 
(sizes >= 65536 were failing)
This commit is contained in:
Mike Welles 1999-09-17 04:08:59 +00:00
parent 478d079ae1
commit 46301bebcf
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Sep 17 00:13:51 CEST 1999 Mike Welles <mike@onshore.com>
* Applied Francois Dagand's patch to handle fax decompression bug.
(sizes >= 65536 were failing)
Tue Sep 14 21:31:43 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
* Applied "a" mode fix to tif_win32.c/TIFFOpen() as suggested

22
libtiff/tif_fax3.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.2 1999-09-08 19:07:02 warmerda Exp $ */
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.3 1999-09-17 04:08:59 mwelles Exp $ */
/*
* Copyright (c) 1990-1997 Sam Leffler
@ -78,9 +78,9 @@ typedef struct {
int bit; /* current i/o bit in byte */
int EOLcnt; /* count of EOL codes recognized */
TIFFFaxFillFunc fill; /* fill routine */
uint16* runs; /* b&w runs for current/previous row */
uint16* refruns; /* runs for reference line */
uint16* curruns; /* runs for current line */
uint32* runs; /* b&w runs for current/previous row */
uint32* refruns; /* runs for reference line */
uint32* curruns; /* runs for current line */
} Fax3DecodeState;
#define DecoderState(tif) ((Fax3DecodeState*) Fax3State(tif))
@ -117,15 +117,15 @@ typedef struct {
int RunLength; /* length of current run */ \
u_char* cp; /* next byte of input data */ \
u_char* ep; /* end of input data */ \
uint16* pa; /* place to stuff next run */ \
uint16* thisrun; /* current row's run array */ \
uint32* pa; /* place to stuff next run */ \
uint32* thisrun; /* current row's run array */ \
int EOLcnt; /* # EOL codes recognized */ \
const u_char* bitmap = sp->bitmap; /* input data bit reverser */ \
const TIFFFaxTabEnt* TabEnt
#define DECLARE_STATE_2D(tif, sp, mod) \
DECLARE_STATE(tif, sp, mod); \
int b1; /* next change on prev line */ \
uint16* pb /* next run in reference line */\
uint32* pb /* next run in reference line */\
/*
* Load any state that may be changed during decoding.
*/
@ -295,7 +295,7 @@ Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
EXPAND2D(EOF2Da);
(*sp->fill)(buf, thisrun, pa, lastx);
SETVAL(0); /* imaginary change for reference */
SWAP(uint16*, sp->curruns, sp->refruns);
SWAP(uint32*, sp->curruns, sp->refruns);
buf += sp->b.rowbytes;
occ -= sp->b.rowbytes;
if (occ != 0)
@ -358,7 +358,7 @@ Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
* runs generated during G3/G4 decoding.
*/
void
_TIFFFax3fillruns(u_char* buf, uint16* runs, uint16* erun, uint32 lastx)
_TIFFFax3fillruns(u_char* buf, uint32* runs, uint32* erun, uint32 lastx)
{
static const unsigned char _fillmasks[] =
{ 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };
@ -499,7 +499,7 @@ Fax3SetupState(TIFF* tif)
uint32 nruns = needsRefLine ?
2*TIFFroundup(rowpixels,32) : rowpixels;
dsp->runs = (uint16*) _TIFFmalloc(nruns*sizeof (uint16));
dsp->runs = (uint32*) _TIFFmalloc(nruns*sizeof (uint16));
if (dsp->runs == NULL) {
TIFFError("Fax3SetupState",
"%s: No space for Group 3/4 run arrays",
@ -1375,7 +1375,7 @@ Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
EXPAND2D(EOFG4);
(*sp->fill)(buf, thisrun, pa, lastx);
SETVAL(0); /* imaginary change for reference */
SWAP(uint16*, sp->curruns, sp->refruns);
SWAP(uint32*, sp->curruns, sp->refruns);
buf += sp->b.rowbytes;
occ -= sp->b.rowbytes;
if (occ != 0)

10
libtiff/tif_fax3.h
View File

@ -1,4 +1,4 @@
/* $Id: tif_fax3.h,v 1.1 1999-07-27 21:50:27 mike Exp $ */
/* $Id: tif_fax3.h,v 1.2 1999-09-17 04:08:59 mwelles Exp $ */
/*
* Copyright (c) 1990-1997 Sam Leffler
@ -43,7 +43,7 @@
* The routine must have the type signature given below;
* for example:
*
* fillruns(unsigned char* buf, uint16* runs, uint16* erun, uint32 lastx)
* fillruns(unsigned char* buf, uint32* runs, uint32* erun, uint32 lastx)
*
* where buf is place to set the bits, runs is the array of b&w run
* lengths (white then black), erun is the last run in the array, and
@ -52,7 +52,7 @@
* data in the run array as needed (e.g. to append zero runs to bring
* the count up to a nice multiple).
*/
typedef void (*TIFFFaxFillFunc)(unsigned char*, uint16*, uint16*, uint32);
typedef void (*TIFFFaxFillFunc)(unsigned char*, uint32*, uint32*, uint32);
/*
* The default run filler; made external for other decoders.
@ -60,7 +60,7 @@ typedef void (*TIFFFaxFillFunc)(unsigned char*, uint16*, uint16*, uint32);
#if defined(__cplusplus)
extern "C" {
#endif
extern void _TIFFFax3fillruns(unsigned char*, uint16*, uint16*, uint32);
extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
#if defined(__cplusplus)
}
#endif
@ -84,7 +84,7 @@ extern void _TIFFFax3fillruns(unsigned char*, uint16*, uint16*, uint32);
typedef struct { /* state table entry */
unsigned char State; /* see above */
unsigned char Width; /* width of code in bits */
uint16 Param; /* unsigned 16-bit run length in bits */
uint32 Param; /* unsigned 32-bit run length in bits */
} TIFFFaxTabEnt;
extern const TIFFFaxTabEnt TIFFFaxMainTable[];