Attachment #135309 for bug #198236




pdftoepdf.o: pdftoepdf.cc epdf.h ../../kpathsea/c-auto.h \
  ../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \
  ../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h
 ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \
 ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
 ptexmac.h
utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
 ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \
 ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \
 ../../../libs/md5/md5.h pdftexextra.h \
 ../../../libs/obsdcompat/openbsd-compat.h
vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \
 ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
 ptexmac.h
pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
 ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \
 ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \
 ../texmfmem.h ../pdftexcoerce.h ptexmac.h
writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
 ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
 ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \
 ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
 ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h
writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \
 ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
 ptexmac.h
writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \
 ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
 ptexmac.h macnames.c
writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
 ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
 ptexmac.h image.h
writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \
 ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
 ptexmac.h image.h
writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
 ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
 ptexmac.h image.h
pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \
 ../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \
 ../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \
 ../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \
 ../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \
 ../../../libs/xpdf/xpdf/Error.h epdf.h
ttf2afm.o: ttf2afm.c writettf.h macnames.c
pdftosrc.o: pdftosrc.cc
 ../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \
 ../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \
 ../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \
 ../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \
 ../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h




#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <aconf.h>
#include <GString.h>
#include <gmem.h>
#include <gfile.h>
#include <config.h>
#include <assert.h>
#include <dirent.h>
#include <poppler/poppler-config.h>
#include <poppler/goo/GooString.h>
#include <poppler/goo/gmem.h>
#include <poppler/goo/gfile.h>
#include "poppler/Object.h"
#include "poppler/Stream.h"
#include "poppler/Array.h"
#include "poppler/Dict.h"
#include "poppler/XRef.h"
#include "poppler/Link.h"
#include "poppler/Catalog.h"
#include "poppler/Page.h"
#include "poppler/GfxFont.h"
#include "poppler/PDFDoc.h"
#include "poppler/GlobalParams.h"
#include "poppler/Error.h"
#include "epdf.h"

// This file is mostly C and not very much C++; it's just used to interface

    fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
            p->occurences);
#endif
    GooString *docName = new GooString(p->file_name);
    p->doc = new PDFDoc(docName);       // takes ownership of docName
    if (!p->doc->isOk() || !p->doc->okToPrint()) {
        pdftex_fail("xpdf: reading PDF image failed");

    int i, l, c;
    Ref ref;
    char *p;
    GooString *s;
    if (obj->isBool()) {
        pdf_printf("%s", obj->getBool()? "true" : "false");
    } else if (obj->isInt()) {

    epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
    if (page_name) {
        // get page by name
        GooString name(page_name);
        LinkDest *link = pdf_doc->doc->findDest(&name);
        if (link == 0 || !link->isOk())
            pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);




#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <aconf.h>
#include <assert.h>

#include <dirent.h>
#include <poppler/goo/GooString.h>
#include <poppler/goo/gmem.h>
#include <poppler/goo/gfile.h>
#include "poppler/Object.h"
#include "poppler/Stream.h"
#include "poppler/Array.h"
#include "poppler/Dict.h"
#include "poppler/XRef.h"
#include "poppler/Catalog.h"
#include "poppler/Page.h"
#include "poppler/GfxFont.h"
#include "poppler/PDFDoc.h"
#include "poppler/GlobalParams.h"
#include "poppler/Error.h"

static XRef *xref = 0;


{
    char *p, buf[1024];
    PDFDoc *doc;
    GooString *fileName;
    Stream *s;
    Object srcStream, srcName, catalogDict;
    FILE *outfile;

                "Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
        exit(1);
    }
    fileName = new GooString(argv[1]);
    globalParams = new GlobalParams(NULL);
    doc = new PDFDoc(fileName);
    if (!doc->isOk()) {
        fprintf(stderr, "Invalid PDF file\n");

    }
    srcStream.initNull();
    if (objnum == 0) {
        catalogDict.dictLookup(UGooString("SourceObject"), &srcStream);
        if (!srcStream.isStream("SourceFile")) {
            fprintf(stderr, "No SourceObject found\n");
            exit(1);

Lines 8-14 Link Here

(-)texlive-bin-2007.orig/build/source/texk/web2c/pdftexdir/Makefile.in (-1 / +1 lines)
8	kpathsea_srcdir_parent = $(srcdir)/../..	8	kpathsea_srcdir_parent = $(srcdir)/../..
9	kpathsea_dir_parent = ../..	9	kpathsea_dir_parent = ../..
10		10
11	ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) @LIBXPDFCPPFLAGS@ -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/..	11	ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) -I. -I$(srcdir) -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) -I/usr/include/poppler -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/..
12	CXX = @CXX@	12	CXX = @CXX@
13		13
14	.SUFFIXES: .cc .o	14	.SUFFIXES: .cc .o

Lines 2-7 Link Here

(-)texlive-bin-2007.orig/build/source/texk/web2c/pdftexdir/pdftex.mk (-3 / +6 lines)
2	# This fragment contains the parts of the makefile that are most likely to	2	# This fragment contains the parts of the makefile that are most likely to
3	# differ between releases of pdfeTeX.	3	# differ between releases of pdfeTeX.
4		4
		5	# use libpoppler instead of included xpdf code
		6	ADDLDFLAGS = -lpoppler
		7
5	# We build pdftex	8	# We build pdftex
6	pdftex = @PETEX@ pdftex	9	pdftex = @PETEX@ pdftex
7	pdftexdir = pdftexdir	10	pdftexdir = pdftexdir
Lines 29-35 Link Here
29		32
30	# Making pdftex	33	# Making pdftex
31	pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep)	34	pdftex: pdftexd.h $(pdftex_o) $(pdftexextra_o) $(pdftexlibsdep)
32	@CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@	35	@CXXHACKLINK@ $(pdftex_o) $(pdftexextra_o) $(pdftexlibs) $(socketlibs) @CXXHACKLDLIBS@ @CXXLDEXTRA@ $(ADDLDFLAGS)
33		36
34	# C file dependencies.	37	# C file dependencies.
35	$(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h	38	$(pdftex_c) pdftexcoerce.h pdftexd.h: pdftex.p $(web2c_texmf) $(srcdir)/$(pdftexdir)/pdftex.defines $(srcdir)/$(pdftexdir)/pdftex.h
Lines 153-162 Link Here
153	rm -f ttf2afm.c macnames.c	156	rm -f ttf2afm.c macnames.c
154	#	157	#
155	# pdftosrc	158	# pdftosrc
156	pdftosrc = pdftosrc	159	pdftosrc =
157		160
158	pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP)	161	pdftosrc: $(pdftexdir)/pdftosrc.o $(LIBXPDFDEP)
159	@CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@	162	@CXXHACKLINK@ $(pdftexdir)/pdftosrc.o $(LDLIBXPDF) -lm @CXXLDEXTRA@ $(ADDLDFLAGS)
160	$(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc	163	$(pdftexdir)/pdftosrc.o:$(srcdir)/$(pdftexdir)/pdftosrc.cc
161	cd $(pdftexdir) && $(MAKE) pdftosrc.o	164	cd $(pdftexdir) && $(MAKE) pdftosrc.o
162	check: pdftosrc-check	165	check: pdftosrc-check

Lines 3459-3467 Link Here

(-)texlive-bin-2007.orig/build/source/configure (-3 / +3 lines)
3459		3459
3460	# we need libxpdf for pdf[ex]tex, xetex	3460	# we need libxpdf for pdf[ex]tex, xetex
3461	test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}	3461	test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
3462	test "$with_pdftex" != no && : ${needs_libxpdf=yes}	3462	test "$with_pdftex" != no && : ${needs_libxpdf=no}
3463	test "$with_pdfetex" != no && : ${needs_libxpdf=yes}	3463	test "$with_pdfetex" != no && : ${needs_libxpdf=no}
3464	test "$with_xetex" != no && : ${needs_libxpdf=yes}	3464	test "$with_xetex" != no && : ${needs_libxpdf=no}
3465	: ${needs_libxpdf=no}	3465	: ${needs_libxpdf=no}
3466	export needs_libxpdf	3466	export needs_libxpdf
3467		3467





# we need libxpdf for pdf[ex]tex, xetex
test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
test "$with_pdftex"  != no    && : ${needs_libxpdf=no}
test "$with_pdfetex" != no    && : ${needs_libxpdf=no}
test "$with_xetex"   != no    && : ${needs_libxpdf=no}
: ${needs_libxpdf=no}
export needs_libxpdf


sinclude(libs/libpng/libpng.ac)
sinclude(libs/zlib/zlib.ac)
sinclude(libs/ncurses/ncurses.ac)
#sinclude(libs/xpdf/libxpdf.ac)
sinclude(libs/t1lib/t1lib.ac)
sinclude(libs/gd/gd.ac)
sinclude(libs/freetype/freetype.ac)

Lines 33-39 Link Here

(-)texlive-bin-2007.orig/build/source/texk/web2c/xetexdir/XeTeX_ext.c (-2 / +2 lines)
33	*/	33	*/
34		34
35	#ifdef XETEX_OTHER	35	#ifdef XETEX_OTHER
36	#include "xpdf/config.h"	36	#include "poppler/poppler-config.h"
37	#include "png.h"	37	#include "png.h"
38	#endif	38	#endif
39		39
Lines 194-200 Link Here
194	#else	194	#else
195	"Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n"	195	"Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n"
196	"Compiled with libpng version %s; using %s\n"	196	"Compiled with libpng version %s; using %s\n"
197	"Compiled with xpdf version %s\n"	197	"Compiled with libpoppler version %s\n"
198	#endif	198	#endif
199	;	199	;
200		200





#include "pdfimage.h"

#include <dirent.h>
#include <poppler/poppler-config.h>
#include <poppler/goo/GooString.h>
#include <poppler/goo/gmem.h>
#include <poppler/goo/gfile.h>
#include "poppler/Object.h"
#include "poppler/Stream.h"
#include "poppler/Array.h"
#include "poppler/Dict.h"
#include "poppler/XRef.h"
#include "poppler/Link.h"
#include "poppler/Catalog.h"
#include "poppler/Page.h"
#include "poppler/GfxFont.h"
#include "poppler/PDFDoc.h"
#include "poppler/GlobalParams.h"
#include "poppler/Error.h"


#include "XeTeX_ext.h"


int
pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
{
	GooString*	name = new GooString(filename);
	PDFDoc*		doc = new PDFDoc(name);
	
	if (!doc) {

Lines 37-43 Link Here

(-)texlive-bin-2007.orig/build/source/texk/web2c/pdftexdir/utils.c (-2 / +2 lines)
37	#include "zlib.h"	37	#include "zlib.h"
38	#include "ptexlib.h"	38	#include "ptexlib.h"
39	#include "png.h"	39	#include "png.h"
40	#include "xpdf/config.h" /* just to get the xpdf version */	40	#include "poppler/poppler-config.h" /* just to get the xpdf version */
41		41
42	#define check_nprintf(size_get, size_want) \	42	#define check_nprintf(size_get, size_want) \
43	if ((unsigned)(size_get) >= (unsigned)(size_want)) \	43	if ((unsigned)(size_get) >= (unsigned)(size_want)) \
Lines 1261-1267 Link Here
1261	(void) asprintf(versions,	1261	(void) asprintf(versions,
1262	"Compiled with libpng %s; using libpng %s\n"	1262	"Compiled with libpng %s; using libpng %s\n"
1263	"Compiled with zlib %s; using zlib %s\n"	1263	"Compiled with zlib %s; using zlib %s\n"
1264	"Compiled with xpdf version %s\n",	1264	"Compiled with libpoppler version %s\n",
1265	PNG_LIBPNG_VER_STRING, png_libpng_ver,	1265	PNG_LIBPNG_VER_STRING, png_libpng_ver,
1266	ZLIB_VERSION, zlib_version, xpdfVersion);	1266	ZLIB_VERSION, zlib_version, xpdfVersion);
1267	}	1267	}

Lines 26-32 Link Here

(-)texlive-bin-2007.orig/build/source/texk/web2c/pdftexdir/pdftexextra.in (-1 / +1 lines)
26	(generated from ../lib/texmfmp.c).	26	(generated from ../lib/texmfmp.c).
27	*/	27	*/
28		28
29	#define BANNER "This is pdfTeX, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"	29	#define BANNER "This is pdfTeX using libpoppler, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
30	#define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"	30	#define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
31	#define AUTHOR NULL	31	#define AUTHOR NULL
32	#define PROGRAM_HELP PDFTEXHELP	32	#define PROGRAM_HELP PDFTEXHELP

Return to bug 198236

Lines 1-55 Link Here

(-)texlive-bin-2007.orig/build/source/texk/web2c/pdftexdir/depend.mk (-54 / +4 lines)
1	epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \	1	pdftoepdf.o: pdftoepdf.cc epdf.h ../../kpathsea/c-auto.h \
2	../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h	2	../../kpathsea/c-proto.h ../../web2c/c-auto.h ../../web2c/config.h \
3	mapfile.o: mapfile.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \	3	../../kpathsea/c-fopen.h ../../web2c/pdftexdir/ptexmac.h
4	../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
5	papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \
6	../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
7	ptexmac.h
8	utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
9	../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \
10	../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \
11	../../../libs/md5/md5.h pdftexextra.h \
12	../../../libs/obsdcompat/openbsd-compat.h
13	vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \
14	../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
15	ptexmac.h
16	pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
17	../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
18	writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \
19	../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \
20	../texmfmem.h ../pdftexcoerce.h ptexmac.h
21	writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
22	../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
23	writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
24	../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
25	writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \
26	../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
27	ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h
28	writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \
29	../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
30	ptexmac.h
31	writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \
32	../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
33	ptexmac.h macnames.c
34	writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
35	../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
36	ptexmac.h image.h
37	writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \
38	../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
39	ptexmac.h image.h
40	writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \
41	../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \
42	ptexmac.h image.h
43	pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \
44	../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \
45	../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \
46	../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \
47	../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \
48	../../../libs/xpdf/xpdf/Error.h epdf.h
49	ttf2afm.o: ttf2afm.c writettf.h macnames.c	4	ttf2afm.o: ttf2afm.c writettf.h macnames.c
50	pdftosrc.o: pdftosrc.cc ../../../libs/xpdf/xpdf/Object.h \	5	pdftosrc.o: pdftosrc.cc
51	../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \
52	../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \
53	../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \
54	../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \
55	../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h

Lines 26-50 Link Here

(-)texlive-bin-2007.orig/build/source/texk/web2c/pdftexdir/pdftoepdf.cc (-21 / +20 lines)
26	#include <stdio.h>	26	#include <stdio.h>
27	#include <string.h>	27	#include <string.h>
28	#include <ctype.h>	28	#include <ctype.h>
29	#include <aconf.h>
30	#include <GString.h>
31	#include <gmem.h>
32	#include <gfile.h>
33	#include <config.h>
34	#include <assert.h>	29	#include <assert.h>
35	#include "Object.h"	30	#include <dirent.h>
36	#include "Stream.h"	31	#include <poppler/poppler-config.h>
37	#include "Array.h"	32	#include <poppler/goo/GooString.h>
38	#include "Dict.h"	33	#include <poppler/goo/gmem.h>
39	#include "XRef.h"	34	#include <poppler/goo/gfile.h>
40	#include "Catalog.h"	35	#include "poppler/Object.h"
41	#include "Link.h"	36	#include "poppler/Stream.h"
42	#include "Page.h"	37	#include "poppler/Array.h"
43	#include "GfxFont.h"	38	#include "poppler/Dict.h"
44	#include "PDFDoc.h"	39	#include "poppler/XRef.h"
45	#include "GlobalParams.h"	40	#include "poppler/Link.h"
46	#include "Error.h"	41	#include "poppler/Catalog.h"
47		42	#include "poppler/Page.h"
		43	#include "poppler/GfxFont.h"
		44	#include "poppler/PDFDoc.h"
		45	#include "poppler/GlobalParams.h"
		46	#include "poppler/Error.h"
48	#include "epdf.h"	47	#include "epdf.h"
49		48
50	// This file is mostly C and not very much C++; it's just used to interface	49	// This file is mostly C and not very much C++; it's just used to interface
Lines 169-175 Link Here
169	fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,	168	fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
170	p->occurences);	169	p->occurences);
171	#endif	170	#endif
172	GString *docName = new GString(p->file_name);	171	GooString *docName = new GooString(p->file_name);
173	p->doc = new PDFDoc(docName); // takes ownership of docName	172	p->doc = new PDFDoc(docName); // takes ownership of docName
174	if (!p->doc->isOk() \|\| !p->doc->okToPrint()) {	173	if (!p->doc->isOk() \|\| !p->doc->okToPrint()) {
175	pdftex_fail("xpdf: reading PDF image failed");	174	pdftex_fail("xpdf: reading PDF image failed");
Lines 511-517 Link Here
511	int i, l, c;	510	int i, l, c;
512	Ref ref;	511	Ref ref;
513	char *p;	512	char *p;
514	GString *s;	513	GooString *s;
515	if (obj->isBool()) {	514	if (obj->isBool()) {
516	pdf_printf("%s", obj->getBool()? "true" : "false");	515	pdf_printf("%s", obj->getBool()? "true" : "false");
517	} else if (obj->isInt()) {	516	} else if (obj->isInt()) {
Lines 703-709 Link Here
703	epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();	702	epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
704	if (page_name) {	703	if (page_name) {
705	// get page by name	704	// get page by name
706	GString name(page_name);	705	GooString name(page_name);
707	LinkDest *link = pdf_doc->doc->findDest(&name);	706	LinkDest *link = pdf_doc->doc->findDest(&name);
708	if (link == 0 \|\| !link->isOk())	707	if (link == 0 \|\| !link->isOk())
709	pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);	708	pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);

Lines 11-20 Link Here

(-)texlive-bin-2007.orig/build/source/texk/web2c/xetexdir/pdfimage.cpp (-5 / +19 lines)
11		11
12	#include "pdfimage.h"	12	#include "pdfimage.h"
13		13
14	#include "PDFDoc.h"	14	#include <dirent.h>
15	#include "Catalog.h"	15	#include <poppler/poppler-config.h>
16	#include "Page.h"	16	#include <poppler/goo/GooString.h>
17	#include "GString.h"	17	#include <poppler/goo/gmem.h>
		18	#include <poppler/goo/gfile.h>
		19	#include "poppler/Object.h"
		20	#include "poppler/Stream.h"
		21	#include "poppler/Array.h"
		22	#include "poppler/Dict.h"
		23	#include "poppler/XRef.h"
		24	#include "poppler/Link.h"
		25	#include "poppler/Catalog.h"
		26	#include "poppler/Page.h"
		27	#include "poppler/GfxFont.h"
		28	#include "poppler/PDFDoc.h"
		29	#include "poppler/GlobalParams.h"
		30	#include "poppler/Error.h"
		31
18		32
19	#include "XeTeX_ext.h"	33	#include "XeTeX_ext.h"
20		34
Lines 28-34 Link Here
28	int	42	int
29	pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)	43	pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
30	{	44	{
31	GString* name = new GString(filename);	45	GooString* name = new GooString(filename);
32	PDFDoc* doc = new PDFDoc(name);	46	PDFDoc* doc = new PDFDoc(name);
33		47
34	if (!doc) {	48	if (!doc) {

Lines 4-9 Link Here

(-)texlive-bin-2007.orig/build/source/texk/web2c/xetexdir/xetex.mk (-2 / +6 lines)
4		4
5	Makefile: $(srcdir)/xetexdir/xetex.mk	5	Makefile: $(srcdir)/xetexdir/xetex.mk
6		6
		7	# use libpoppler instead of included xpdf code
		8	ADDLDFLAGS = -lpoppler
		9
		10
7	# We build xetex unless configure decides to skip it	11	# We build xetex unless configure decides to skip it
8	xetex = @XETEX@ xetex	12	xetex = @XETEX@ xetex
9		13
Lines 29-35 Link Here
29		33
30	@XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER	34	@XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER
31		35
32	@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@	36	@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@ $(ADDLDFLAGS)
33		37
34	@XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@	38	@XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@
35		39
Lines 144-150 Link Here
144	$(compile) $(ALL_CFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@	148	$(compile) $(ALL_CFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@
145		149
146	pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h	150	pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h
147	$(CXX) $(ALL_CFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@	151	$(CXX) $(ALL_CFLAGS) $(LIBXPDFCPPFLAGS) -I/usr/include/poppler -c $< -o $@
148		152
149	XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs)	153	XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs)
150	$(compile) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@	154	$(compile) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@