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

BigTIFF upgrade: unchecked and untested version of upgraded tif_jbig.c

Browse Source
This commit is contained in:
Joris Van Damme 2007-06-28 13:13:18 +00:00
parent 3930fc6e3a
commit c3e2c83b14
1 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libtiff/tif_jbig.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_jbig.c,v 1.11 2007-06-28 12:44:28 joris Exp $ */ /* $Id: tif_jbig.c,v 1.12 2007-06-28 13:13:18 joris Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -63,18 +63,24 @@ static const TIFFFieldInfo jbigFieldInfo[] =
{TIFFTAG_FAXDCS, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_ASCII, FIELD_FAXDCS, TRUE, FALSE, "FaxDcs", NULL}, {TIFFTAG_FAXDCS, -1, -1, TIFF_ASCII, 0, TIFF_SETGET_ASCII, TIFF_SETGET_ASCII, FIELD_FAXDCS, TRUE, FALSE, "FaxDcs", NULL},
}; };
static int JBIGFixupTags(TIFF* tif)
{
(void) tif;
return 1;
}
static int JBIGSetupDecode(TIFF* tif) static int JBIGSetupDecode(TIFF* tif)
{ {
if (TIFFNumberOfStrips(tif) != 1) if (TIFFNumberOfStrips(tif) != 1)
{ {
TIFFError("JBIG", "Multistrip images not supported in decoder"); TIFFErrorExt(tif->tif_clientdata, "JBIG", "Multistrip images not supported in decoder");
return 0; return 0;
} }
return 1; return 1;
} }
static int JBIGDecode(TIFF* tif, tidata_t buffer, tsize_t size, uint16 s) static int JBIGDecode(TIFF* tif, uint8* buffer, tmsize_t size, uint16 s)
{ {
struct jbg_dec_state decoder; struct jbg_dec_state decoder;
int decodeStatus = 0; int decodeStatus = 0;
@ -83,13 +89,13 @@ static int JBIGDecode(TIFF* tif, tidata_t buffer, tsize_t size, uint16 s)
if (isFillOrder(tif, tif->tif_dir.td_fillorder)) if (isFillOrder(tif, tif->tif_dir.td_fillorder))
{ {
TIFFReverseBits(tif->tif_rawdata, tif->tif_rawdatasize); ddd TIFFReverseBits(tif->tif_rawdata, tif->tif_rawdatasize);
} }
jbg_dec_init(&decoder); jbg_dec_init(&decoder);
#if defined(HAVE_JBG_NEWLEN) #if defined(HAVE_JBG_NEWLEN)
jbg_newlen(tif->tif_rawdata, tif->tif_rawdatasize); ddd jbg_newlen(tif->tif_rawdata, (size_t)tif->tif_rawdatasize);
/* /*
* I do not check the return status of jbg_newlen because even if this * I do not check the return status of jbg_newlen because even if this
* function fails it does not necessarily mean that decoding the image * function fails it does not necessarily mean that decoding the image
@ -102,11 +108,11 @@ static int JBIGDecode(TIFF* tif, tidata_t buffer, tsize_t size, uint16 s)
*/ */
#endif /* HAVE_JBG_NEWLEN */ #endif /* HAVE_JBG_NEWLEN */
decodeStatus = jbg_dec_in(&decoder, tif->tif_rawdata, decodeStatus = jbg_dec_in(&decoder, (unsigned char*)tif->tif_rawdata,
tif->tif_rawdatasize, NULL); ddd (size_t)tif->tif_rawdatasize, NULL);
if (JBG_EOK != decodeStatus) if (JBG_EOK != decodeStatus)
{ {
TIFFError("JBIG", "Error (%d) decoding: %s", TIFFErrorExt(tif->tif_clientdata, "JBIG", "Error (%d) decoding: %s",
decodeStatus, jbg_strerror(decodeStatus, JBG_EN)); decodeStatus, jbg_strerror(decodeStatus, JBG_EN));
return 0; return 0;
} }
@ -121,32 +127,32 @@ static int JBIGSetupEncode(TIFF* tif)
{ {
if (TIFFNumberOfStrips(tif) != 1) if (TIFFNumberOfStrips(tif) != 1)
{ {
TIFFError("JBIG", "Multistrip images not supported in encoder"); TIFFErrorExt(tif->tif_clientdata, "JBIG", "Multistrip images not supported in encoder");
return 0; return 0;
} }
return 1; return 1;
} }
static int JBIGCopyEncodedData(TIFF* tif, tidata_t pp, tsize_t cc, uint16 s) static int JBIGCopyEncodedData(TIFF* tif, unsigned char* pp, size_t cc, uint16 s)
{ {
(void) s; (void) s;
while (cc > 0) while (cc > 0)
{ {
tsize_t n = cc; tmsize_t n = (tmsize_t)cc;
if (tif->tif_rawcc + n > tif->tif_rawdatasize) ddd if (tif->tif_rawcc + n > tif->tif_rawdatasize)
{ {
n = tif->tif_rawdatasize - tif->tif_rawcc; ddd n = tif->tif_rawdatasize - tif->tif_rawcc;
} }
assert(n > 0); assert(n > 0);
_TIFFmemcpy(tif->tif_rawcp, pp, n); _TIFFmemcpy(tif->tif_rawcp, pp, n);
tif->tif_rawcp += n; tif->tif_rawcp += n;
tif->tif_rawcc += n; ddd tif->tif_rawcc += n;
pp += n; pp += n;
cc -= n; cc -= (size_t)n;
if (tif->tif_rawcc >= tif->tif_rawdatasize && ddd if (tif->tif_rawcc >= tif->tif_rawdatasize &&
!TIFFFlushData1(tif)) !TIFFFlushData1(tif))
{ {
return (-1); return (-1);
@ -162,13 +168,13 @@ static void JBIGOutputBie(unsigned char* buffer, size_t len, void *userData)
if (isFillOrder(tif, tif->tif_dir.td_fillorder)) if (isFillOrder(tif, tif->tif_dir.td_fillorder))
{ {
TIFFReverseBits(buffer, len); ddd TIFFReverseBits(buffer, (tmsize_t)len);
} }
JBIGCopyEncodedData(tif, buffer, len, 0); JBIGCopyEncodedData(tif, buffer, len, 0);
} }
static int JBIGEncode(TIFF* tif, tidata_t buffer, tsize_t size, uint16 s) static int JBIGEncode(TIFF* tif, uint8* buffer, tmsize_t size, uint16 s)
{ {
TIFFDirectory* dir = &tif->tif_dir; TIFFDirectory* dir = &tif->tif_dir;
struct jbg_enc_state encoder; struct jbg_enc_state encoder;
@ -321,7 +327,7 @@ int TIFFInitJBIG(TIFF* tif, int scheme)
tif->tif_data = (tdata_t)_TIFFmalloc(sizeof(JBIGState)); tif->tif_data = (tdata_t)_TIFFmalloc(sizeof(JBIGState));
if (tif->tif_data == NULL) if (tif->tif_data == NULL)
{ {
TIFFError("TIFFInitJBIG", "Not enough memory for JBIGState"); TIFFErrorExt(tif->tif_clientdata, "TIFFInitJBIG", "Not enough memory for JBIGState");
return 0; return 0;
} }
_TIFFmemset(tif->tif_data, 0, sizeof(JBIGState)); _TIFFmemset(tif->tif_data, 0, sizeof(JBIGState));
@ -339,7 +345,7 @@ int TIFFInitJBIG(TIFF* tif, int scheme)
codec->vgetparent = tif->tif_tagmethods.vgetfield; codec->vgetparent = tif->tif_tagmethods.vgetfield;
codec->vsetparent = tif->tif_tagmethods.vsetfield; codec->vsetparent = tif->tif_tagmethods.vsetfield;
tif->tif_tagmethods.vgetfield = JBIGVGetField; tif->tif_tagmethods.vgetfield = JBIGVGetField;
tif->tif_tagmethods.vsetfield = JBIGVSetField; ddd tif->tif_tagmethods.vsetfield = JBIGVSetField;
tif->tif_tagmethods.printdir = JBIGPrintDir; tif->tif_tagmethods.printdir = JBIGPrintDir;
/* /*
@ -351,12 +357,12 @@ int TIFFInitJBIG(TIFF* tif, int scheme)
tif->tif_flags &= ~TIFF_MAPPED; tif->tif_flags &= ~TIFF_MAPPED;
/* Setup the function pointers for encode, decode, and cleanup. */ /* Setup the function pointers for encode, decode, and cleanup. */
tif->tif_fixuptags = JBIGFixupTags; ddd tif->tif_fixuptags = JBIGFixupTags;
tif->tif_setupdecode = JBIGSetupDecode; tif->tif_setupdecode = JBIGSetupDecode;
tif->tif_decodestrip = JBIGDecode; ddd tif->tif_decodestrip = JBIGDecode;
tif->tif_setupencode = JBIGSetupEncode; tif->tif_setupencode = JBIGSetupEncode;
tif->tif_encodestrip = JBIGEncode; ddd tif->tif_encodestrip = JBIGEncode;
tif->tif_cleanup = JBIGCleanup; tif->tif_cleanup = JBIGCleanup;