[poppler] Please apply some changes to poppler to be able to extend separatelly

[Koji Otani]

Hi
I'm Koji Otani.

I'm developing a CUPS filter derived from poppler.
I included changed poppler sources into this.
But that is not good for maintainance.
So, I'd like to separate poppler sources and my sources.
Could you apply following changes to poppler so that I can do this ?

(1) include fofi headers into XPDF_HEADERS which are installed
      with 'configure --enable-xpdf-headers'.

(2) change private members of SplashClip, SplashPath
      and SplashXPath to 'protected'.

I attached a patch which do these.

I would appreciate it if you could apply the patch.

------------
Koji Otani.
-------------- next part --------------
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);