[poppler] poppler/qt4/src: poppler-document.cc, 1.31, 1.32 poppler-private.h, 1.20, 1.21 poppler-qt4.h, 1.45, 1.46

[Albert Astals Cid]

Update of /cvs/poppler/poppler/qt4/src
In directory kemper:/tmp/cvs-serv20555/qt4/src

Modified Files:
	poppler-document.cc poppler-private.h poppler-qt4.h 
Log Message:
2007-02-25  Albert Astals Cid <aacid at kde.org>

        * configure.ac:
        * glib/poppler-document.cc:
        * poppler/GlobalParams.cc:
        * poppler/GlobalParams.h:
        * poppler/PSOutputDev.cc:
        * qt/poppler-document.cc:
        * qt4/src/poppler-document.cc:
        * qt4/src/poppler-private.h:
        * qt4/src/poppler-qt4.h:
        * test/gtk-splash-test.cc:
        * test/pdf-inspector.cc:
        * utils/pdffonts.cc:
        * utils/pdfimages.cc:
        * utils/pdfinfo.cc:
        * utils/pdftohtml.cc:
        * utils/pdftoppm.cc:
        * utils/pdftops.cc:
        * utils/pdftotext.cc: Remove dependency on xpdfrc file and cleanup
                              GlobalParams accordingly


Index: poppler-document.cc
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/poppler-document.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- poppler-document.cc	21 Jan 2007 22:35:23 -0000	1.31
+++ poppler-document.cc	24 Feb 2007 23:43:35 -0000	1.32
@@ -431,7 +431,7 @@
         {
             foreach(int page, pageList)
             {
-                m_doc->doc->displayPage(psOut, page, hDPI, vDPI, rotate, gFalse, globalParams->getPSCrop(), gFalse);
+                m_doc->doc->displayPage(psOut, page, hDPI, vDPI, rotate, gFalse, gTrue, gFalse);
             }
 
             delete psOut;

Index: poppler-private.h
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/poppler-private.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- poppler-private.h	21 Jan 2007 22:35:23 -0000	1.20
+++ poppler-private.h	24 Feb 2007 23:43:35 -0000	1.21
@@ -95,7 +95,7 @@
 		delete ownerPassword;
 		delete userPassword;
 		
-		if ( count == 0 ) globalParams = new GlobalParams("/etc/xpdfrc");
+		if ( count == 0 ) globalParams = new GlobalParams();
 		count ++;
 	    }
 	

Index: poppler-qt4.h
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/poppler-qt4.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- poppler-qt4.h	21 Jan 2007 22:35:23 -0000	1.45
+++ poppler-qt4.h	24 Feb 2007 23:43:35 -0000	1.46
@@ -450,8 +450,12 @@
 
 	   \param filePath the name (and path, if required) of the file to load
 
+	   \return NULL on error
+
 	   \warning The application owns the pointer to Document, and this should
 	   be deleted when no longer required.
+	
+	   \warning The returning document may be locked.
 	*/
 	static Document *load(const QString & filePath,
 			      const QByteArray &ownerPassword=QByteArray(),
@@ -780,7 +784,7 @@
     /**
        Container class for a sound file in a PDF document.
 
-       A sound can be either External (in that case should be loaded the file
+	A sound can be either External (in that case should be loaded the file
        whose url is represented by url() ), or Embedded, and the player has to
        play the data contained in data().
     */