kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-17 12:17:00 +00:00
Code Issues Projects Releases Wiki Activity

apply http://www.soft-switch.org/downloads/libtiff_fix_g3_2d_decode.patch from Steve Underwood

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15087 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-10-05 14:57:36 +00:00
parent 56afa42256
commit 6df15e21b0
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/tiff-3.8.2/.update
View File

@ -1 +1 @@
Wed Jul 22 15:05:52 EDT 2009 Mon Oct 5 09:57:20 CDT 2009

30
libs/tiff-3.8.2/libtiff/tif_fax3.c
View File

@ -85,6 +85,8 @@ typedef struct {
unsigned char* refline; /* reference line for 2d decoding */ unsigned char* refline; /* reference line for 2d decoding */
int k; /* #rows left that can be 2d encoded */ int k; /* #rows left that can be 2d encoded */
int maxk; /* max #rows that can be 2d encoded */ int maxk; /* max #rows that can be 2d encoded */
int line;
} Fax3CodecState; } Fax3CodecState;
#define DecoderState(tif) ((Fax3CodecState*) Fax3State(tif)) #define DecoderState(tif) ((Fax3CodecState*) Fax3State(tif))
#define EncoderState(tif) ((Fax3CodecState*) Fax3State(tif)) #define EncoderState(tif) ((Fax3CodecState*) Fax3State(tif))
@ -167,6 +169,7 @@ Fax3PreDecode(TIFF* tif, tsample_t s)
sp->refruns[0] = (uint32) sp->b.rowpixels; sp->refruns[0] = (uint32) sp->b.rowpixels;
sp->refruns[1] = 0; sp->refruns[1] = 0;
} }
sp->line = 0;
return (1); return (1);
} }
@ -184,7 +187,7 @@ Fax3Unexpected(const char* module, TIFF* tif, uint32 line, uint32 a0)
(unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip), (unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
(unsigned long) a0); (unsigned long) a0);
} }
#define unexpected(table, a0) Fax3Unexpected(module, tif, line, a0) #define unexpected(table, a0) Fax3Unexpected(module, tif, sp->line, a0)
static void static void
Fax3Extension(const char* module, TIFF* tif, uint32 line, uint32 a0) Fax3Extension(const char* module, TIFF* tif, uint32 line, uint32 a0)
@ -195,7 +198,7 @@ Fax3Extension(const char* module, TIFF* tif, uint32 line, uint32 a0)
(unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip), (unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
(unsigned long) a0); (unsigned long) a0);
} }
#define extension(a0) Fax3Extension(module, tif, line, a0) #define extension(a0) Fax3Extension(module, tif, sp->line, a0)
static void static void
Fax3BadLength(const char* module, TIFF* tif, uint32 line, uint32 a0, uint32 lastx) Fax3BadLength(const char* module, TIFF* tif, uint32 line, uint32 a0, uint32 lastx)
@ -207,7 +210,7 @@ Fax3BadLength(const char* module, TIFF* tif, uint32 line, uint32 a0, uint32 last
(unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip), (unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
(unsigned long) a0, lastx); (unsigned long) a0, lastx);
} }
#define badlength(a0,lastx) Fax3BadLength(module, tif, line, a0, lastx) #define badlength(a0,lastx) Fax3BadLength(module, tif, sp->line, a0, lastx)
static void static void
Fax3PrematureEOF(const char* module, TIFF* tif, uint32 line, uint32 a0) Fax3PrematureEOF(const char* module, TIFF* tif, uint32 line, uint32 a0)
@ -218,7 +221,7 @@ Fax3PrematureEOF(const char* module, TIFF* tif, uint32 line, uint32 a0)
(unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip), (unsigned long) (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
(unsigned long) a0); (unsigned long) a0);
} }
#define prematureEOF(a0) Fax3PrematureEOF(module, tif, line, a0) #define prematureEOF(a0) Fax3PrematureEOF(module, tif, sp->line, a0)
#define Nop #define Nop
@ -229,7 +232,6 @@ static int
Fax3Decode1D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s) Fax3Decode1D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
{ {
DECLARE_STATE(tif, sp, "Fax3Decode1D"); DECLARE_STATE(tif, sp, "Fax3Decode1D");
int line = 0;
(void) s; (void) s;
CACHE_STATE(tif, sp); CACHE_STATE(tif, sp);
@ -248,7 +250,7 @@ Fax3Decode1D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
(*sp->fill)(buf, thisrun, pa, lastx); (*sp->fill)(buf, thisrun, pa, lastx);
buf += sp->b.rowbytes; buf += sp->b.rowbytes;
occ -= sp->b.rowbytes; occ -= sp->b.rowbytes;
line++; sp->line++;
continue; continue;
EOF1D: /* premature EOF */ EOF1D: /* premature EOF */
CLEANUP_RUNS(); CLEANUP_RUNS();
@ -269,7 +271,6 @@ static int
Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s) Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
{ {
DECLARE_STATE_2D(tif, sp, "Fax3Decode2D"); DECLARE_STATE_2D(tif, sp, "Fax3Decode2D");
int line = 0;
int is1D; /* current line is 1d/2d-encoded */ int is1D; /* current line is 1d/2d-encoded */
(void) s; (void) s;
@ -302,7 +303,7 @@ Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
SWAP(uint32*, sp->curruns, sp->refruns); SWAP(uint32*, sp->curruns, sp->refruns);
buf += sp->b.rowbytes; buf += sp->b.rowbytes;
occ -= sp->b.rowbytes; occ -= sp->b.rowbytes;
line++; sp->line++;
continue; continue;
EOF2D: /* premature EOF */ EOF2D: /* premature EOF */
CLEANUP_RUNS(); CLEANUP_RUNS();
@ -492,14 +493,14 @@ Fax3SetupState(TIFF* tif)
); );
nruns = needsRefLine ? 2*TIFFroundup(rowpixels,32) : rowpixels; nruns = needsRefLine ? 2*TIFFroundup(rowpixels,32) : rowpixels;
nruns += 3;
dsp->runs = (uint32*) _TIFFCheckMalloc(tif, 2*nruns+3, sizeof (uint32), dsp->runs = (uint32*) _TIFFCheckMalloc(tif, 2*nruns, sizeof (uint32),
"for Group 3/4 run arrays"); "for Group 3/4 run arrays");
if (dsp->runs == NULL) if (dsp->runs == NULL)
return (0); return (0);
dsp->curruns = dsp->runs; dsp->curruns = dsp->runs;
if (needsRefLine) if (needsRefLine)
dsp->refruns = dsp->runs + (nruns>>1); dsp->refruns = dsp->runs + nruns;
else else
dsp->refruns = NULL; dsp->refruns = NULL;
if (td->td_compression == COMPRESSION_CCITTFAX3 if (td->td_compression == COMPRESSION_CCITTFAX3
@ -718,6 +719,7 @@ Fax3PreEncode(TIFF* tif, tsample_t s)
sp->k = sp->maxk-1; sp->k = sp->maxk-1;
} else } else
sp->k = sp->maxk = 0; sp->k = sp->maxk = 0;
sp->line = 0;
return (1); return (1);
} }
@ -1378,7 +1380,6 @@ static int
Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s) Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
{ {
DECLARE_STATE_2D(tif, sp, "Fax4Decode"); DECLARE_STATE_2D(tif, sp, "Fax4Decode");
int line = 0;
(void) s; (void) s;
CACHE_STATE(tif, sp); CACHE_STATE(tif, sp);
@ -1401,7 +1402,7 @@ Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
SWAP(uint32*, sp->curruns, sp->refruns); SWAP(uint32*, sp->curruns, sp->refruns);
buf += sp->b.rowbytes; buf += sp->b.rowbytes;
occ -= sp->b.rowbytes; occ -= sp->b.rowbytes;
line++; sp->line++;
continue; continue;
EOFG4: EOFG4:
NeedBits16( 13, BADG4 ); NeedBits16( 13, BADG4 );
@ -1487,7 +1488,6 @@ Fax3DecodeRLE(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
{ {
DECLARE_STATE(tif, sp, "Fax3DecodeRLE"); DECLARE_STATE(tif, sp, "Fax3DecodeRLE");
int mode = sp->b.mode; int mode = sp->b.mode;
int line = 0;
(void) s; (void) s;
CACHE_STATE(tif, sp); CACHE_STATE(tif, sp);
@ -1517,7 +1517,7 @@ Fax3DecodeRLE(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
} }
buf += sp->b.rowbytes; buf += sp->b.rowbytes;
occ -= sp->b.rowbytes; occ -= sp->b.rowbytes;
line++; sp->line++;
continue; continue;
EOFRLE: /* premature EOF */ EOFRLE: /* premature EOF */
(*sp->fill)(buf, thisrun, pa, lastx); (*sp->fill)(buf, thisrun, pa, lastx);