[poppler] poppler/qt: Makefile.am, 1.3, 1.3.2.1 poppler-qt.h, 1.8, 1.8.2.1

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/qt
In directory gabe:/tmp/cvs-serv26067/qt

Modified Files:
      Tag: POPPLER_0_4_X
	Makefile.am poppler-qt.h 
Log Message:
2005-12-12  Kristian Høgsberg  <krh at redhat.com>

	* poppler/TextOutputDev.cc:
	* qt/poppler-qt.h: GCC-4.1 fixes (#5031).

	* qt/Makefile.am (noinst_PROGRAMS): Only build qt test program if
	splash is enabled.

	* poppler/CairoOutputDev.cc: Remove unused grid snapping code,
	sidestepping #4507.
	
	* glib/poppler-document.h: Fix glib-mkenums warning (#4600).

	* poppler/Makefile.am (libpoppler_la_LIBADD): Add $(FREETYPE_LIBS)
	(#4514).

	* poppler/TextOutputDev.cc (TextWord::visitSelection,
	TextWord::visitSelection): Fix selection crash (#4402).

	* poppler/CairoOutputDev.h: Fix wrong cairo-ft.h include (#4413).

	* poppler/JPXStream.cc:
	* poppler/Stream.cc:
	* poppler/Stream.h: CVE-2005-3191 security fix.

	* fofi/FoFiTrueType.cc:
	* poppler/SplashOutputDev.cc: CAN-2005-2097 security fix.



Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/qt/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Makefile.am	6 May 2005 16:38:57 -0000	1.3
+++ Makefile.am	12 Dec 2005 22:43:27 -0000	1.3.2.1
@@ -22,8 +22,12 @@
 	$(POPPLER_QT_LIBS)			\
 	$(FREETYPE_LIBS)
 
+if BUILD_SPLASH_OUTPUT
+
 noinst_PROGRAMS = test-poppler-qt
 
+endif
+
 test_poppler_qt_SOURCES =			\
        test-poppler-qt.cpp
 

Index: poppler-qt.h
===================================================================
RCS file: /cvs/poppler/poppler/qt/poppler-qt.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- poppler-qt.h	26 Jun 2005 23:35:27 -0000	1.8
+++ poppler-qt.h	12 Dec 2005 22:43:27 -0000	1.8.2.1
@@ -150,7 +150,7 @@
     UseOC
   };
   
-  static Document *Document::load(const QString & filePath);
+  static Document *load(const QString & filePath);
   
   Page *getPage(int index) const{ return new Page(this, index); }
   
@@ -172,11 +172,11 @@
   bool okToAddNotes() const;
   double getPDFVersion() const;
   
-  Document::~Document();
+  ~Document();
   
 private:
   DocumentData *data;
-  Document::Document(DocumentData *dataA);
+  Document(DocumentData *dataA);
 };
 
 }