summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-05-02 13:21:48 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-05-02 13:21:48 +0000
commit82afe5c389e5b796a5f83cb3431a607b6bc70a41 (patch)
tree89417cf63947529c30bfa6403d42e86bd1a56657 /Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
parentb681ffb23a916a6f89af5487777f06be79ab7c43 (diff)
final cleanup of pdftex headers
git-svn-id: svn://tug.org/texlive/trunk@18079 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir/pdftoepdf.cc')
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftoepdf.cc26
1 files changed, 20 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index 40a1102046b..c48676579c9 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -1,5 +1,5 @@
/*
-Copyright 1996-2007 Han The Thanh, <thanh@pdftex.org>
+Copyright 1996-2010 Han The Thanh, <thanh@pdftex.org>
This file is part of pdfTeX.
@@ -46,8 +46,6 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <assert.h>
#endif
-#undef boolean
-
#include "Object.h"
#include "Stream.h"
#include "Array.h"
@@ -61,11 +59,27 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "GlobalParams.h"
#include "Error.h"
-#include "pdftoepdf.h"
+#undef boolean
// 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++.
+extern "C" {
+
+#include <openbsd-compat.h>
+
+#include <kpathsea/c-auto.h>
+#include <kpathsea/c-proto.h>
+#include <kpathsea/lib.h>
+
+#include <c-auto.h> /* define SIZEOF_LONG */
+#include <config.h> /* define type integer */
+
+#include <pdftexdir/ptexmac.h>
+#include <pdftexdir/pdftex-common.h>
+
+}
+
// The prefix "PTEX" for the PDF keys is special to pdfTeX;
// this has been registered with Adobe by Hans Hagen.
@@ -768,7 +782,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
// get page by number
if (page_num <= 0 || page_num > epdf_num_pages)
pdftex_fail("PDF inclusion: required page does not exist <%i>",
- (int) epdf_num_pages);
+ epdf_num_pages);
}
// get the required page
page = pdf_doc->doc->getCatalog()->getPage(page_num);
@@ -846,7 +860,7 @@ void write_epdf(void)
pdf_printf("/%s.FileName (%s)\n", pdfkeyprefix,
convertStringToPDFString(pdf_doc->file_name,
strlen(pdf_doc->file_name)));
- pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) epdf_selected_page);
+ pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, epdf_selected_page);
pdf_doc->doc->getDocInfoNF(&info);
if (info.isRef()) {
// the info dict must be indirect (PDF Ref p. 61)