From 5e85f2318e021b29590ae201311350842122d1e8 Mon Sep 17 00:00:00 2001 From: kramm Date: Sun, 27 Jul 2008 09:38:35 +0000 Subject: [PATCH] applied external xpdf patch from Patrice Dumas --- lib/pdf/GFXOutputDev.cc | 10 +++++----- lib/pdf/InfoOutputDev.cc | 13 +++++++++++-- lib/pdf/InfoOutputDev.h | 15 ++++++++++++++- lib/pdf/Makefile.in | 22 +++++++++++++--------- 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc index 288de6e..cd0c87a 100644 --- a/lib/pdf/GFXOutputDev.cc +++ b/lib/pdf/GFXOutputDev.cc @@ -38,9 +38,13 @@ #endif //xpdf header files #include "config.h" +#ifdef HAVE_POPPLER +#include +#include +#else #include "gfile.h" #include "GString.h" -#include "gmem.h" +#endif #include "Object.h" #include "Stream.h" #include "Array.h" @@ -54,12 +58,8 @@ #include "OutputDev.h" #include "GfxFont.h" #include "GfxState.h" -#include "CharCodeToUnicode.h" #include "NameToUnicodeTable.h" #include "GlobalParams.h" -#include "FoFiType1C.h" -#include "FoFiTrueType.h" -#include "GHash.h" #include "GFXOutputDev.h" // swftools header files diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc index a0a4cac..1653978 100644 --- a/lib/pdf/InfoOutputDev.cc +++ b/lib/pdf/InfoOutputDev.cc @@ -1,9 +1,18 @@ +#include "config.h" #include "Object.h" -#include "SplashTypes.h" +#include "InfoOutputDev.h" #include "SplashOutputDev.h" +#ifdef HAVE_POPPLER +#include +#include +#include +#include +#else +#include "SplashTypes.h" #include "SplashPath.h" +#include "SplashFont.h" #include "SplashFontFile.h" -#include "InfoOutputDev.h" +#endif #include "GfxState.h" #include "../log.h" #include diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h index 13ba1e4..539addd 100644 --- a/lib/pdf/InfoOutputDev.h +++ b/lib/pdf/InfoOutputDev.h @@ -23,11 +23,24 @@ #include "GfxFont.h" #include "OutputDev.h" -#include "SplashFont.h" #include "SplashOutputDev.h" +#ifdef HAVE_POPPLER +#include +#include +#include +#include +#else +#include "SplashTypes.h" #include "SplashPath.h" +#include "SplashFont.h" #include "SplashFontFile.h" +#endif + +#ifdef HAVE_POPPLER +#include +#else #include "GHash.h" +#endif struct GlyphInfo { diff --git a/lib/pdf/Makefile.in b/lib/pdf/Makefile.in index 07425c7..1cbe6f1 100644 --- a/lib/pdf/Makefile.in +++ b/lib/pdf/Makefile.in @@ -1,7 +1,7 @@ # Generated automatically from Makefile.in by configure. top_builddir = ../.. -srcdir = . -top_srcdir = ../.. +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ include ../../Makefile.common all: ../libpdf$(A) pdf2swf$(E) @@ -10,6 +10,8 @@ libpdf: ../libpdf$(A) libpdf_objects = GFXOutputDev.$(O) InfoOutputDev.$(O) BitmapOutputDev.$(O) FullBitmapOutputDev.$(O) pdf.$(O) fonts.$(O) +xpdf_in_source = @xpdf_in_source@ + xpdf_objects = xpdf/GHash.$(O) xpdf/GList.$(O) xpdf/GString.$(O) xpdf/gmem.$(O) xpdf/gfile.$(O) \ xpdf/FoFiTrueType.$(O) xpdf/FoFiType1.$(O) xpdf/FoFiType1C.$(O) xpdf/FoFiBase.$(O) xpdf/FoFiEncodings.$(O) \ xpdf/OutputDev.$(O) xpdf/PDFDoc.$(O) xpdf/Error.$(O) xpdf/Stream.$(O) xpdf/Object.$(O) \ @@ -20,6 +22,8 @@ xpdf_objects = xpdf/GHash.$(O) xpdf/GList.$(O) xpdf/GString.$(O) xpdf/gmem.$(O) xpdf/PSTokenizer.$(O) xpdf/FontEncodingTables.$(O) xpdf/BuiltinFont.$(O) xpdf/BuiltinFontTables.$(O) \ xpdf/GfxState.$(O) xpdf/Function.$(O) xpdf/Annot.$(O) xpdf/NameToCharCode.$(O) xpdf/UnicodeMap.$(O) \ xpdf/SecurityHandler.$(O) + +splash_in_source = @splash_in_source@ splash_objects = xpdf/SplashOutputDev.$(O) xpdf/SplashFont.$(O) xpdf/SplashState.$(O) xpdf/Splash.$(O) \ xpdf/SplashBitmap.$(O) xpdf/SplashClip.$(O) xpdf/SplashPattern.$(O) \ xpdf/SplashFontEngine.$(O) xpdf/SplashFontFile.$(O) xpdf/SplashFontFileID.$(O) \ @@ -27,7 +31,7 @@ splash_objects = xpdf/SplashOutputDev.$(O) xpdf/SplashFont.$(O) xpdf/SplashState xpdf/SplashFTFontEngine.$(O) xpdf/SplashFTFontFile.$(O) xpdf/SplashFTFont.$(O) fonts.$(O): fonts.c - $(C) -I ./ -I xpdf fonts.c -o $@ + $(C) fonts.c -o $@ cmyk.$(O): cmyk.cc $(CC) -I ./ -I xpdf cmyk.cc -o $@ GFXOutputDev.$(O): GFXOutputDev.cc GFXOutputDev.h CommonOutputDev.h ../gfxpoly.h @@ -136,8 +140,8 @@ xpdf/%.$(O): xpdf/%.cc $(CC) -I ./ -I xpdf $< -o $@ -../libpdf$(A): $(libpdf_objects) $(xpdf_objects) $(splash_objects) - $(AR) r ../libpdf$(A) $(libpdf_objects) $(xpdf_objects) $(splash_objects) +../libpdf$(A): $(libpdf_objects) $(xpdf_in_source) $(splash_in_source) + $(AR) r ../libpdf$(A) $(libpdf_objects) $(xpdf_in_source) $(splash_in_source) $(RANLIB) ../libpdf$(A) xpdfapp_objects=xpdf/XPDF*.cc xpdf/PDFCore.cc xpdf/TextOutputDev.cc xpdf/xpdf.cc xpdf/CoreOutputDev.cc xpdf/UnicodeTypeTable.cc xpdf/PSOutputDev.cc @@ -152,10 +156,10 @@ pdftotext$(E): $(xpdf_objects) $(splash_objects) gfx_objects = ../libgfxswf$(A) ../libgfx$(A) ../librfxswf$(A) ../libbase$(A) gfx_objects2 = $(gfx_objects) ../devices/lrf.$(O) ../libocr$(A) -pdf2swf$(E): ../../src/pdf2swf.c $(libpdf_objects) $(xpdf_objects) $(splash_objects) $(gfx_objects) - $(LL) $(CPPFLAGS) -g ../../src/pdf2swf.c $(libpdf_objects) $(xpdf_objects) $(splash_objects) $(gfx_objects) -o pdf2swf$(E) $(LIBS) -gfx2gfx$(E): ../../src/gfx2gfx.c $(libpdf_objects) $(xpdf_objects) $(splash_objects) $(gfx_objects2) - $(LL) $(CPPFLAGS) -g ../../src/gfx2gfx.c $(libpdf_objects) $(xpdf_objects) $(splash_objects) $(gfx_objects2) -o gfx2gfx$(E) $(LIBS) +pdf2swf$(E): ../../src/pdf2swf.c $(libpdf_objects) $(xpdf_in_source) $(splash_in_source) $(gfx_objects) + $(LL) $(CPPFLAGS) -g ../../src/pdf2swf.c $(libpdf_objects) $(xpdf_in_source) $(splash_in_source) $(gfx_objects) -o pdf2swf$(E) $(LIBS) +gfx2gfx$(E): ../../src/gfx2gfx.c $(libpdf_objects) $(xpdf_in_source) $(splash_in_source) $(gfx_objects2) + $(LL) $(CPPFLAGS) -g ../../src/gfx2gfx.c $(libpdf_objects) $(xpdf_in_source) $(splash_in_source) $(gfx_objects2) -o gfx2gfx$(E) $(LIBS) install: uninstall: -- 1.7.10.4