diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-01-18 11:18:30 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-01-18 11:18:30 +0000 |
commit | d5b1d635e3cbfd4d919e11ec0bcb4fced2d7b212 (patch) | |
tree | cf13487ebe01f7931bea29e1136a37ea762a076f /Build/source/texk/web2c/luatexdir | |
parent | 31accee3d73f4b87a333844e128eb9258f5f8f11 (diff) |
web2c: Printing of file offsets when sizeof(off_t) > sizeof(long)
git-svn-id: svn://tug.org/texlive/trunk@25140 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/image/writejbig2.w | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 358943084b4..e0e43e8d65c 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-01-18 Peter Breitenlohner <peb@mppmu.mpg.de> + + * image/writejbig2.w (getstreamlen): Change type to `off_t'. + Use LONGINTEGER_TYPE and LONGINTEGER_PRId for printing. + 2012-01-11 Peter Breitenlohner <peb@mppmu.mpg.de> Consistent support for large JBIG2 files. diff --git a/Build/source/texk/web2c/luatexdir/image/writejbig2.w b/Build/source/texk/web2c/luatexdir/image/writejbig2.w index 8b186b6b740..d23183fab6c 100644 --- a/Build/source/texk/web2c/luatexdir/image/writejbig2.w +++ b/Build/source/texk/web2c/luatexdir/image/writejbig2.w @@ -362,15 +362,14 @@ unsigned int read4bytes(FILE * f) } @ @c -static unsigned long getstreamlen(LITEM * slip, boolean refer) +static off_t getstreamlen(LITEM * slip, boolean refer) { SEGINFO *sip; - unsigned long len = 0; + off_t len = 0; for (; slip != NULL; slip = slip->next) { sip = slip->d; if (refer || sip->isrefered) - len += (unsigned long) (sip->hdrend - sip->hdrstart) - + (unsigned long) (sip->dataend - sip->datastart); + len += (sip->hdrend - sip->hdrstart) + (sip->dataend - sip->datastart); } return len; } @@ -729,8 +728,8 @@ static void wr_jbig2(PDF pdf, FILEINFO * fip, unsigned long page) pdf_printf(pdf, "/Height %i\n", pip->height); pdf_puts(pdf, "/ColorSpace /DeviceGray\n"); pdf_puts(pdf, "/BitsPerComponent 1\n"); - pdf_printf(pdf, "/Length %lu\n", - getstreamlen(pip->segments.first, true)); + pdf_printf(pdf, "/Length %" LONGINTEGER_PRId "\n", + (LONGINTEGER_TYPE) getstreamlen(pip->segments.first, true)); pdf_puts(pdf, "/Filter [/JBIG2Decode]\n"); if (fip->page0.last != NULL) { if (fip->pdfpage0objnum == 0) { @@ -744,8 +743,8 @@ static void wr_jbig2(PDF pdf, FILEINFO * fip, unsigned long page) pip = find_pageinfo(&(fip->page0), page); assert(pip != NULL); pdf_begin_dict(pdf, (int) fip->pdfpage0objnum, 0); - pdf_printf(pdf, "/Length %lu\n", - getstreamlen(pip->segments.first, false)); + pdf_printf(pdf, "/Length %" LONGINTEGER_PRId "\n", + (LONGINTEGER_TYPE) getstreamlen(pip->segments.first, false)); } pdf_puts(pdf, ">>\n"); pdf_puts(pdf, "stream\n"); |