[poppler] fofi/Makefile.am splash/SplashClip.h splash/SplashPath.h splash/SplashXPath.h

[Albert Astals Cid]

 fofi/Makefile.am     |   10 ++++++++++
 splash/SplashClip.h  |    2 +-
 splash/SplashPath.h  |    2 +-
 splash/SplashXPath.h |    2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 0179e21b128ffccb5afd13203137ab8435197609
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Dec 12 00:16:38 2008 +0100

    Be more helpful with bad boys that want to use poppler core directly

diff --git a/fofi/Makefile.am b/fofi/Makefile.am
index 78cf3a8..7a30248 100644
--- a/fofi/Makefile.am
+++ b/fofi/Makefile.am
@@ -3,6 +3,16 @@ INCLUDES =					\
 
 noinst_LTLIBRARIES = libfofi.la
 
+if ENABLE_XPDF_HEADERS
+poppler_fofi_includedir = $(includedir)/poppler/fofi
+poppler_fofi_include_HEADERS =	\
+	FoFiBase.h		\
+	FoFiEncodings.h		\
+	FoFiTrueType.h		\
+	FoFiType1.h		\
+	FoFiType1C.h
+endif
+
 libfofi_la_SOURCES =		\
 	FoFiBase.cc		\
 	FoFiBase.h		\
diff --git a/splash/SplashClip.h b/splash/SplashClip.h
index 2420f9c..1864149 100644
--- a/splash/SplashClip.h
+++ b/splash/SplashClip.h
@@ -88,7 +88,7 @@ public:
   // Get the number of arbitrary paths used by the clip region.
   int getNumPaths() { return length; }
 
-private:
+protected:
 
   SplashClip(SplashClip *clip);
   void grow(int nPaths);
diff --git a/splash/SplashPath.h b/splash/SplashPath.h
index ea58af0..991e114 100644
--- a/splash/SplashPath.h
+++ b/splash/SplashPath.h
@@ -96,7 +96,7 @@ public:
   // Get the current point.
   GBool getCurPt(SplashCoord *x, SplashCoord *y);
 
-private:
+protected:
 
   SplashPath(SplashPath *path);
   void grow(int nPts);
diff --git a/splash/SplashXPath.h b/splash/SplashXPath.h
index 942104f..64c4796 100644
--- a/splash/SplashXPath.h
+++ b/splash/SplashXPath.h
@@ -68,7 +68,7 @@ public:
   // Sort by upper coordinate (lower y), in y-major order.
   void sort();
 
-private:
+protected:
 
   SplashXPath();
   SplashXPath(SplashXPath *xPath);