diff options
author | Owen Taylor <otaylor@redhat.com> | 2004-12-21 21:47:36 (GMT) |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2004-12-21 21:47:36 (GMT) |
commit | 179af30116fcee661c68d64885f4a6fe6c0cd679 (patch) | |
tree | 65b210e70cd8268f3f02b72660ced35c25bb6107 /pdf/splash | |
parent | 496dac3760529669c8d4fa2e32e1797b092e7632 (diff) |
Import of xpdf code from gpdf.
Tue Dec 21 16:30:58 2004 Owen Taylor <otaylor@redhat.com>
* pdf/**: Import of xpdf code from gpdf.
* pdf/xpdf/xpdfconfig.h: Move the non-config.h config.h to xpdfconfig.h
* pdf/splash/SplashFTFont.{cc,h} pdf/splash/SplashFTFont.h
pdf/splash/SplashFTFontEngine.h pdf/splash/SplashFTFontFile.h:
Fix FreeType includes.
* pdf/xpdf/{Error.h GnomeVFSStream.cc ImageOutputDev.cc PDFDoc.cc\
pdffonts.cc pdfimages.cc pdfinfo.cc pdftoppm.cc pdftops.cc
pdftotext.cc PSOutputDev.cc PSOutputDev.h SplashOutputDev.h
Stream.cc TextOutputDev.cc XPDFApp.cc xpdf.cc XPDFViewer.cc
pdf/xpdf/Error.h PSOutputDev.h SplashOutputDev.h}:
Include xpdfconfig.h
Diffstat (limited to 'pdf/splash')
-rw-r--r-- | pdf/splash/Makefile.am | 10 | ||||
-rw-r--r-- | pdf/splash/SplashFTFont.cc | 5 | ||||
-rw-r--r-- | pdf/splash/SplashFTFont.h | 3 | ||||
-rw-r--r-- | pdf/splash/SplashFTFontEngine.h | 3 | ||||
-rw-r--r-- | pdf/splash/SplashFTFontFile.h | 3 |
5 files changed, 15 insertions, 9 deletions
diff --git a/pdf/splash/Makefile.am b/pdf/splash/Makefile.am index b115112..180a470 100644 --- a/pdf/splash/Makefile.am +++ b/pdf/splash/Makefile.am @@ -1,7 +1,9 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/goo \ - -I$(top_srcdir)/fofi +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pdf \ + -I$(top_srcdir)/pdf/goo \ + -I$(top_srcdir)/pdf/fofi \ + $(FREETYPE_CFLAGS) noinst_LIBRARIES = libsplash.a diff --git a/pdf/splash/SplashFTFont.cc b/pdf/splash/SplashFTFont.cc index a7d0396..8234014 100644 --- a/pdf/splash/SplashFTFont.cc +++ b/pdf/splash/SplashFTFont.cc @@ -12,8 +12,6 @@ #pragma implementation #endif -#include "freetype/ftoutln.h" -#include "freetype/internal/ftobjs.h" // needed for FT_New_Size decl #include "gmem.h" #include "SplashMath.h" #include "SplashGlyphBitmap.h" @@ -22,6 +20,9 @@ #include "SplashFTFontFile.h" #include "SplashFTFont.h" +#include FT_OUTLINE_H +#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl + //------------------------------------------------------------------------ static int glyphPathMoveTo(FT_Vector *pt, void *path); diff --git a/pdf/splash/SplashFTFont.h b/pdf/splash/SplashFTFont.h index 7628a2b..efd0eda 100644 --- a/pdf/splash/SplashFTFont.h +++ b/pdf/splash/SplashFTFont.h @@ -15,7 +15,8 @@ #pragma interface #endif -#include <freetype/freetype.h> +#include <ft2build.h> +#include FT_FREETYPE_H #include "SplashFont.h" class SplashFTFontFile; diff --git a/pdf/splash/SplashFTFontEngine.h b/pdf/splash/SplashFTFontEngine.h index 0497a46..c87108d 100644 --- a/pdf/splash/SplashFTFontEngine.h +++ b/pdf/splash/SplashFTFontEngine.h @@ -15,7 +15,8 @@ #pragma interface #endif -#include <freetype/freetype.h> +#include <ft2build.h> +#include FT_FREETYPE_H #include "gtypes.h" class SplashFontFile; diff --git a/pdf/splash/SplashFTFontFile.h b/pdf/splash/SplashFTFontFile.h index 522d055..76f1f81 100644 --- a/pdf/splash/SplashFTFontFile.h +++ b/pdf/splash/SplashFTFontFile.h @@ -15,7 +15,8 @@ #pragma interface #endif -#include <freetype/freetype.h> +#include <ft2build.h> +#include FT_FREETYPE_H #include "SplashFontFile.h" class SplashFontFileID; |