summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schröder <martin@oneiros.de>2008-05-08 14:25:16 +0000
committerMartin Schröder <martin@oneiros.de>2008-05-08 14:25:16 +0000
commit827cf5621c44c3d315ac95c52c15a23f88d5d44d (patch)
tree9ec064331f207aa7e08b5057bdae34843df381ef
parentccae75643e0bad3a0450768463491b7760e8ad7c (diff)
Import pdftex 1.40.8-beta-20080506
git-svn-id: svn://tug.org/texlive/trunk@7945 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/pdftexdir/NEWS10
-rw-r--r--Build/source/texk/web2c/pdftexdir/epdf.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/epdf.h6
-rw-r--r--Build/source/texk/web2c/pdftexdir/macnames.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/mapfile.c18
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web19
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftoepdf.cc5
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftosrc.cc5
-rw-r--r--Build/source/texk/web2c/pdftexdir/pkin.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/subfont.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/tounicode.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/ttf2afm.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/utils.c9
-rw-r--r--Build/source/texk/web2c/pdftexdir/vfpacket.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writeenc.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writefont.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writeimg.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writejbig2.c23
-rw-r--r--Build/source/texk/web2c/pdftexdir/writejpg.c8
-rw-r--r--Build/source/texk/web2c/pdftexdir/writepng.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writet1.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writet3.c5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writettf.c7
-rw-r--r--Build/source/texk/web2c/pdftexdir/writezip.c5
24 files changed, 107 insertions, 73 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index c601c93b90e..424dd18e752 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -1,11 +1,15 @@
--------------------------------------------------
-pdfTeX 3.1415926-1.40.8 was released on 2008-03-??
+pdfTeX 3.1415926-1.40.8 was released on 2008-05-??
--------------------------------------------------
- Incorporated the new version of TeX: 3.1415926
- Bugfix:
- Fonts from included PDFs for which maplines existed missed their /StemV
values
-- pdfTeX uses libpng 1.2.25
+ - \pdflastximagepages was broken for JBIG2 images
+ - included PDFs with a negative lly in the MediaBox with a depth != 0 with
+ \pdfximage were wrongly vertically diplaces (936)
+ - PDF inclusion was broken on ppc-darwin (941)
+- pdfTeX uses libpng 1.2.29
-------------------------------------------------
pdfTeX 3.141592-1.40.7 was released on 2008-02-17
@@ -79,7 +83,7 @@ pdfTeX 3.141592-1.40.4 was released on 2007-07-11
-------------------------------------------------
pdfTeX 3.141592-1.40.3 was released on 2007-02-04
-------------------------------------------------
-- bugfix: document which used type 1 and truetype or opentype fonts resulted in
+- bugfix: documents which used type 1 and truetype or opentype fonts resulted in
broken pdfs (729)
-------------------------------------------------
diff --git a/Build/source/texk/web2c/pdftexdir/epdf.c b/Build/source/texk/web2c/pdftexdir/epdf.c
index a7c164a6e4a..1c7c74c2ebc 100644
--- a/Build/source/texk/web2c/pdftexdir/epdf.c
+++ b/Build/source/texk/web2c/pdftexdir/epdf.c
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
@@ -25,6 +23,9 @@ $Id$
#include <kpathsea/c-proto.h>
#include <string.h>
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/epdf.c $";
+
extern void epdf_check_mem(void);
extern void register_fd_entry(fd_entry *);
diff --git a/Build/source/texk/web2c/pdftexdir/epdf.h b/Build/source/texk/web2c/pdftexdir/epdf.h
index d470d7d835a..33c54531da5 100644
--- a/Build/source/texk/web2c/pdftexdir/epdf.h
+++ b/Build/source/texk/web2c/pdftexdir/epdf.h
@@ -1,5 +1,5 @@
/*
-Copyright (c) 1996-2007 Han The Thanh, <thanh@pdftex.org>
+Copyright (c) 1996-2008 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -65,8 +65,8 @@ extern "C" {
extern integer pdfboxspectrim;
extern integer pdfboxspecart;
- extern integer pdfstreamlength;
- extern integer pdfptr;
+ extern longinteger pdfstreamlength;
+ extern longinteger pdfptr;
extern integer poolptr;
typedef unsigned char eightbits;
extern eightbits *pdfbuf;
diff --git a/Build/source/texk/web2c/pdftexdir/macnames.c b/Build/source/texk/web2c/pdftexdir/macnames.c
index c3ac053f0a4..46f5090972c 100644
--- a/Build/source/texk/web2c/pdftexdir/macnames.c
+++ b/Build/source/texk/web2c/pdftexdir/macnames.c
@@ -16,10 +16,11 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
+static const char _svn__version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/macnames.c $";
+
const char notdef[] = ".notdef";
const char *mac_glyph_names[] = {
diff --git a/Build/source/texk/web2c/pdftexdir/mapfile.c b/Build/source/texk/web2c/pdftexdir/mapfile.c
index 2a40209aa18..5b7a1e982c4 100644
--- a/Build/source/texk/web2c/pdftexdir/mapfile.c
+++ b/Build/source/texk/web2c/pdftexdir/mapfile.c
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 1996-2007 Han The Thanh, <thanh@pdftex.org>
+/* mapfile.c: handling of map files/lines
+Copyright (c) 1996-2008 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include <math.h>
@@ -26,6 +24,9 @@ $Id$
#include <kpathsea/c-memstr.h>
#include <string.h>
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/mapfile.c $";
+
#define FM_BUF_SIZE 1024
static FILE *fm_file;
@@ -371,11 +372,12 @@ int check_std_t1font(char *s)
{ -1, -1, -1, -1, -1, -1, 8, 0, -1, 4, 10, 9, -1, -1, 5, 2, 12, 6, -1,
3, -1, 7
};
- assert(s != NULL);
- const size_t n = strlen(s);
+ size_t n;
int k = -1;
+ assert(s != NULL);
+ n = strlen(s);
if (n > 21)
- return false;
+ return -1;
if (n == 12) { /* three names have length 12 */
switch (*s) {
case 'C':
@@ -388,7 +390,7 @@ int check_std_t1font(char *s)
k = 13; /* ZapfDingbats */
break;
default:
- return false;
+ return -1;
}
} else
k = index[n];
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 7397beb961f..050154437c6 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -289,7 +289,7 @@ known as `\eTeX'.
@#
@d pdftex_version==140 { \.{\\pdftexversion} }
@d pdftex_revision=="8" { \.{\\pdftexrevision} }
-@d pdftex_version_string=='-1.40.8-alpha-20080323' {current \pdfTeX\ version}
+@d pdftex_version_string=='-1.40.8-beta-20080506' {current \pdfTeX\ version}
@#
@d pdfeTeX_banner=='This is pdfeTeX, Version 3.1415926',pdftex_version_string,eTeX_version_string
{printed when \pdfeTeX\ starts}
@@ -11181,12 +11181,15 @@ pdf_insert_ht_code: begin
print("pt");
end;
pdf_ximage_bbox_code: begin
- case j of
- 1: print_scaled(epdf_orig_x(i));
- 2: print_scaled(epdf_orig_y(i));
- 3: print_scaled(epdf_orig_x(i) + image_width(i));
- 4: print_scaled(epdf_orig_y(i) + image_height(i));
- endcases;
+ if is_pdf_image(i) then begin
+ case j of
+ 1: print_scaled(epdf_orig_x(i));
+ 2: print_scaled(epdf_orig_y(i));
+ 3: print_scaled(epdf_orig_x(i) + image_width(i));
+ 4: print_scaled(epdf_orig_y(i) + image_height(i));
+ endcases;
+ end else
+ print_scaled(0);
print("pt");
end;
job_name_code: print(job_name);
@@ -35846,7 +35849,7 @@ begin
image_width(image)));
pdf_out(" ");
pdf_print_bp(pdf_y(cur_v) -
- ext_xn_over_d(pdf_height(p), epdf_orig_y(image),
+ ext_xn_over_d(pdf_height(p) + pdf_depth(p), epdf_orig_y(image),
image_height(image)));
end;
pdf_print_ln(" cm");
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index f4d66cb5464..35683d600c9 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include <stdlib.h>
@@ -47,6 +45,9 @@ $Id$
#include "epdf.h"
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf.cc $";
+
// This file is mostly C and not very much C++; it's just used to interface
// the functions of xpdf, which happens to be written in C++.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
index 3fcf4a6852e..cf9beaea582 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include <stdlib.h>
@@ -42,6 +40,9 @@ $Id$
#include "GlobalParams.h"
#include "Error.h"
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc.cc $";
+
static XRef *xref = 0;
int main(int argc, char *argv[])
diff --git a/Build/source/texk/web2c/pdftexdir/pkin.c b/Build/source/texk/web2c/pdftexdir/pkin.c
index 738931c317e..4b469d84b6e 100644
--- a/Build/source/texk/web2c/pdftexdir/pkin.c
+++ b/Build/source/texk/web2c/pdftexdir/pkin.c
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
/*
@@ -45,6 +43,9 @@ $Id$
#include "ptexlib.h"
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/pkin.c $";
+
/*
* Now we have some routines to get stuff from the pk file. pkbyte returns
* the next byte from the pk file.
diff --git a/Build/source/texk/web2c/pdftexdir/subfont.c b/Build/source/texk/web2c/pdftexdir/subfont.c
index aaf20f8132a..25795e6517e 100644
--- a/Build/source/texk/web2c/pdftexdir/subfont.c
+++ b/Build/source/texk/web2c/pdftexdir/subfont.c
@@ -16,13 +16,14 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
#include <string.h>
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/subfont.c $";
+
static struct avl_table *sfd_tree = NULL;
#define SFD_BUF_SIZE SMALL_BUF_SIZE
diff --git a/Build/source/texk/web2c/pdftexdir/tounicode.c b/Build/source/texk/web2c/pdftexdir/tounicode.c
index e4db308a298..8a3e0aa9b74 100644
--- a/Build/source/texk/web2c/pdftexdir/tounicode.c
+++ b/Build/source/texk/web2c/pdftexdir/tounicode.c
@@ -16,12 +16,13 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/tounicode.c $";
+
#define isXdigit(c) (isdigit(c) || ('A' <= (c) && (c) <= 'F'))
#define UNI_UNDEF -1
#define UNI_STRING -2 /* string allocated by deftounicode() */
diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
index 609fc6ca7f5..e5916cfeb24 100644
--- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c
+++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
/*
@@ -38,6 +36,9 @@ $Id$
#include <pdftexdir/writettf.h>
#include <string.h>
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/ttf2afm.c $";
+
/* constants used for print_glyph */
#define AS_NAME 0
#define AS_INDEX 1
diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c
index 8d50fb9a9f8..44b3993fa74 100644
--- a/Build/source/texk/web2c/pdftexdir/utils.c
+++ b/Build/source/texk/web2c/pdftexdir/utils.c
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "openbsd-compat.h"
@@ -39,6 +37,9 @@ $Id$
#include "png.h"
#include "xpdf/config.h" /* just to get the xpdf version */
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/utils.c $";
+
#define check_nprintf(size_get, size_want) \
if ((unsigned)(size_get) >= (unsigned)(size_want)) \
pdftex_fail ("snprintf failed: file %s, line %d", __FILE__, __LINE__);
@@ -406,9 +407,9 @@ void writestreamlength(integer length, longinteger offset)
if (jobname_cstr == NULL)
jobname_cstr = xstrdup(makecstring(jobname));
if (fixedpdfdraftmode == 0) {
- xfseek(pdffile, (off_t)offset, SEEK_SET, jobname_cstr);
+ xfseeko(pdffile, (off_t) offset, SEEK_SET, jobname_cstr);
fprintf(pdffile, "%li", (long int) length);
- xfseek(pdffile, (off_t)pdfoffset(), SEEK_SET, jobname_cstr);
+ xfseeko(pdffile, (off_t) pdfoffset(), SEEK_SET, jobname_cstr);
}
}
diff --git a/Build/source/texk/web2c/pdftexdir/vfpacket.c b/Build/source/texk/web2c/pdftexdir/vfpacket.c
index 5cf36e5ce2f..c854fe954a2 100644
--- a/Build/source/texk/web2c/pdftexdir/vfpacket.c
+++ b/Build/source/texk/web2c/pdftexdir/vfpacket.c
@@ -16,12 +16,13 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/vfpacket.c $";
+
typedef struct {
char *dataptr;
integer len;
diff --git a/Build/source/texk/web2c/pdftexdir/writeenc.c b/Build/source/texk/web2c/pdftexdir/writeenc.c
index 74a42e5f112..42740e5bb66 100644
--- a/Build/source/texk/web2c/pdftexdir/writeenc.c
+++ b/Build/source/texk/web2c/pdftexdir/writeenc.c
@@ -16,12 +16,13 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writeenc.c $";
+
/**********************************************************************/
/* All encoding entries go into AVL tree for fast search by name. */
diff --git a/Build/source/texk/web2c/pdftexdir/writefont.c b/Build/source/texk/web2c/pdftexdir/writefont.c
index 9ab6f113b63..8f3fe234f11 100644
--- a/Build/source/texk/web2c/pdftexdir/writefont.c
+++ b/Build/source/texk/web2c/pdftexdir/writefont.c
@@ -16,12 +16,13 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writefont.c $";
+
/**********************************************************************/
struct avl_table *fo_tree = NULL; /* tree of font dictionaries */
diff --git a/Build/source/texk/web2c/pdftexdir/writeimg.c b/Build/source/texk/web2c/pdftexdir/writeimg.c
index 080ab3a37a6..9a1caf40ae2 100644
--- a/Build/source/texk/web2c/pdftexdir/writeimg.c
+++ b/Build/source/texk/web2c/pdftexdir/writeimg.c
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
@@ -25,6 +23,9 @@ $Id$
#include <kpathsea/c-auto.h>
#include <kpathsea/c-memstr.h>
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writeimg.c $";
+
#define bp2int(p) round(p*(onehundredbp/100.0))
/* define image_ptr, image_array & image_limit */
diff --git a/Build/source/texk/web2c/pdftexdir/writejbig2.c b/Build/source/texk/web2c/pdftexdir/writejbig2.c
index 9fc6ffaf2a6..102ed339aeb 100644
--- a/Build/source/texk/web2c/pdftexdir/writejbig2.c
+++ b/Build/source/texk/web2c/pdftexdir/writejbig2.c
@@ -1,5 +1,5 @@
/***********************************************************************
-Copyright (c) 2002-2007 Han The Thanh, <thanh@pdftex.org>
+Copyright (c) 2002-2008 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -75,7 +75,6 @@ object exists, reference it. Else create fresh one.
09 Dec. 2002: JBIG2 seg. page numbers > 0 are now set to 1, see PDF Ref.
-$Id$
***********************************************************************/
#include "writejbig2.h"
@@ -83,6 +82,11 @@ $Id$
/**********************************************************************/
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writejbig2.c $";
+
+/**********************************************************************/
+
struct avl_table *file_tree = NULL;
static int comp_file_entry(const void *pa, const void *pb, void *p)
@@ -292,7 +296,7 @@ void readfilehdr(FILEINFO * fip)
fip->sequentialaccess = (fip->filehdrflags & 0x01) ? true : false;
if (fip->sequentialaccess) { /* Annex D.1 vs. Annex D.2 */
xfseek(fip->file, 0, SEEK_END, fip->filename);
- fip->filesize = xftell(fip->file, fip->filename);
+ fip->filesize = (long) xftello(fip->file, fip->filename);
xfseek(fip->file, 9, SEEK_SET, fip->filename);
}
/* Annex D.4.3 Number of pages */
@@ -363,7 +367,7 @@ boolean readseghdr(FILEINFO * fip, SEGINFO * sip)
sip->segpage = ygetc(fip->file);
/* 7.2.7 Segment data length */
sip->segdatalen = read4bytes(fip->file);
- sip->hdrend = xftell(fip->file, fip->filename);
+ sip->hdrend = (long) xftello(fip->file, fip->filename);
/* ---- at end of segment header ---- */
return true;
}
@@ -583,7 +587,7 @@ void rd_jbig2_info(FILEINFO * fip)
sip->dataend = sip->datastart + sip->segdatalen;
if (!fip->sequentialaccess
&& (sip->pageinfoflag || sip->endofstripeflag))
- xfseek(fip->file, sip->datastart, SEEK_SET, fip->filename);
+ xfseeko(fip->file, (off_t) sip->datastart, SEEK_SET, fip->filename);
seekdist = sip->segdatalen;
/* 7.4.8 Page information segment syntax */
if (sip->pageinfoflag) {
@@ -603,11 +607,11 @@ void rd_jbig2_info(FILEINFO * fip)
}
if (!fip->sequentialaccess
&& (sip->pageinfoflag || sip->endofstripeflag))
- xfseek(fip->file, sip->hdrend, SEEK_SET, fip->filename);
+ xfseeko(fip->file, (off_t) sip->hdrend, SEEK_SET, fip->filename);
if (!fip->sequentialaccess)
streampos += sip->segdatalen;
if (fip->sequentialaccess)
- xfseek(fip->file, seekdist, SEEK_CUR, fip->filename);
+ xfseeko(fip->file, (off_t) seekdist, SEEK_CUR, fip->filename);
if (sip->endofpageflag && currentpage && (pip->stripinginfo >> 15))
pip->height = pip->stripedheight;
}
@@ -656,10 +660,10 @@ void wr_jbig2(FILEINFO * fip, unsigned long page)
for (slip = pip->segments.first; slip != NULL; slip = slip->next) { /* loop over page segments */
sip = slip->d;
if (sip->isrefered || page > 0) {
- xfseek(fip->file, sip->hdrstart, SEEK_SET, fip->filename);
+ xfseeko(fip->file, (off_t) sip->hdrstart, SEEK_SET, fip->filename);
/* mark refered-to page 0 segments, change segpages > 1 to 1 */
writeseghdr(fip, sip);
- xfseek(fip->file, sip->datastart, SEEK_SET, fip->filename);
+ xfseeko(fip->file, (off_t) sip->datastart, SEEK_SET, fip->filename);
for (i = sip->datastart; i < sip->dataend; i++)
pdfout(ygetc(fip->file));
}
@@ -704,6 +708,7 @@ void read_jbig2_info(integer img)
if (pip == NULL)
pdftex_fail("read_jbig2_info(): page %d not found in JBIG2 image file",
(int) jbig2_ptr(img)->selected_page);
+ img_pages(img) = fip->numofpages;
img_width(img) = pip->width;
img_height(img) = pip->height;
img_xres(img) = (int) (pip->xres * 0.0254 + 0.5);
diff --git a/Build/source/texk/web2c/pdftexdir/writejpg.c b/Build/source/texk/web2c/pdftexdir/writejpg.c
index 3f5534d6c4e..5080dfd4ae5 100644
--- a/Build/source/texk/web2c/pdftexdir/writejpg.c
+++ b/Build/source/texk/web2c/pdftexdir/writejpg.c
@@ -1,5 +1,5 @@
/*
-Copyright (c) 1996-2007 Han The Thanh, <thanh@pdftex.org>
+Copyright (c) 1996-2008 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -16,13 +16,14 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
#include "image.h"
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writejpg.c $";
+
#define JPG_GRAY 1 /* Gray color space, use /DeviceGray */
#define JPG_RGB 3 /* RGB color space, use /DeviceRGB */
#define JPG_CMYK 4 /* CMYK color space, use /DeviceCMYK */
@@ -106,6 +107,7 @@ void read_jpg_info(integer img)
unsigned char jpg_id[] = "JFIF";
img_xres(img) = img_yres(img) = 0;
jpg_ptr(img)->file = xfopen(img_name(img), FOPEN_RBIN_MODE);
+ /* no LFS needed, as JPEG is limited to <4GiB */
xfseek(jpg_ptr(img)->file, 0, SEEK_END, cur_file_name);
jpg_ptr(img)->length = xftell(jpg_ptr(img)->file, cur_file_name);
xfseek(jpg_ptr(img)->file, 0, SEEK_SET, cur_file_name);
diff --git a/Build/source/texk/web2c/pdftexdir/writepng.c b/Build/source/texk/web2c/pdftexdir/writepng.c
index 0b4ec4c1609..fc833d7d30e 100644
--- a/Build/source/texk/web2c/pdftexdir/writepng.c
+++ b/Build/source/texk/web2c/pdftexdir/writepng.c
@@ -16,13 +16,14 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
#include "image.h"
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writepng.c $";
+
static int transparent_page_group = -1;
void read_png_info(integer img)
diff --git a/Build/source/texk/web2c/pdftexdir/writet1.c b/Build/source/texk/web2c/pdftexdir/writet1.c
index bd6939a82c8..0aaa2680073 100644
--- a/Build/source/texk/web2c/pdftexdir/writet1.c
+++ b/Build/source/texk/web2c/pdftexdir/writet1.c
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
@@ -25,6 +23,9 @@ $Id$
#include <kpathsea/c-proto.h>
#include <string.h>
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writet1.c $";
+
#define t1_log(s) tex_printf("%s",s)
#define get_length1() t1_length1 = t1_offset() - t1_save_offset
#define get_length2() t1_length2 = t1_offset() - t1_save_offset
diff --git a/Build/source/texk/web2c/pdftexdir/writet3.c b/Build/source/texk/web2c/pdftexdir/writet3.c
index 719fd52beea..6652ab42fd1 100644
--- a/Build/source/texk/web2c/pdftexdir/writet3.c
+++ b/Build/source/texk/web2c/pdftexdir/writet3.c
@@ -16,8 +16,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
@@ -25,6 +23,9 @@ $Id$
#include <kpathsea/magstep.h>
#include <string.h>
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writet3.c $";
+
#define T3_BUF_SIZE 1024
typedef char t3_line_entry;
diff --git a/Build/source/texk/web2c/pdftexdir/writettf.c b/Build/source/texk/web2c/pdftexdir/writettf.c
index c8a22a6739d..9e3900c5de0 100644
--- a/Build/source/texk/web2c/pdftexdir/writettf.c
+++ b/Build/source/texk/web2c/pdftexdir/writettf.c
@@ -1,5 +1,5 @@
/*
-Copyright (c) 1996-2007 Han The Thanh, <thanh@pdftex.org>
+Copyright (c) 1996-2008 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -16,14 +16,15 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
#include "writettf.h"
#include <string.h>
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writettf.c $";
+
#define DEFAULT_NTABS 14
#define NEW_CMAP_SIZE 2
diff --git a/Build/source/texk/web2c/pdftexdir/writezip.c b/Build/source/texk/web2c/pdftexdir/writezip.c
index 1cd16ec8ffb..d5372fa11df 100644
--- a/Build/source/texk/web2c/pdftexdir/writezip.c
+++ b/Build/source/texk/web2c/pdftexdir/writezip.c
@@ -16,14 +16,15 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-$Id$
*/
#include "ptexlib.h"
#include "zlib.h"
#include <assert.h>
+static const char _svn_version[] =
+ "$Id$ $URL: http://scm.foundry.supelec.fr/svn/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/writezip.c $";
+
#define ZIP_BUF_SIZE 32768
#define check_err(f, fn) \