[poppler] poppler/qt4/src: poppler-link.cc,1.10,1.11

[Albert Astals Cid]

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

Modified Files:
	poppler-link.cc 
Log Message:
2007-03-07  Carlos Garcia Campos <carlosgc at gnome.org>
        reviewed by: Albert Astals Cid <aacid at kde.org>

        * poppler/Page.cc: Consider 0x0 boxes as invalid. Fixes
        http://bugzilla.gnome.org/show_bug.cgi?id=408682

2007-03-06  Pino Toscano <pino at kde.org>
        reviewed by: Albert Astals Cid <aacid at kde.org>

       * configure.ac:
       * qt/Makefile.am:
       * qt/poppler-link.cc:
       * qt/poppler-page.cc:
       * qt/poppler-private.h:
       * qt4/poppler-link.cc:
       Make the Qt4 frontend compilable again with no Splash.
       Make the Qt3 frontend compilable with no Splash.


Index: poppler-link.cc
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/poppler-link.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- poppler-link.cc	13 Jan 2007 23:19:21 -0000	1.10
+++ poppler-link.cc	7 Mar 2007 19:15:32 -0000	1.11
@@ -66,12 +66,14 @@
 		m_changeTop = ld->getChangeTop();
 		m_changeZoom = ld->getChangeZoom();
 		
-		int leftAux, topAux, rightAux, bottomAux;
+		int leftAux = 0, topAux = 0, rightAux = 0, bottomAux = 0;
 		
 		OutputDev *sod = data.doc->getOutputDev();
-		if (sod == NULL) return;
-		sod->cvtUserToDev( left, top, &leftAux, &topAux );
-		sod->cvtUserToDev( right, bottom, &rightAux, &bottomAux );
+		if (sod)
+		{
+			sod->cvtUserToDev( left, top, &leftAux, &topAux );
+			sod->cvtUserToDev( right, bottom, &rightAux, &bottomAux );
+		}
 		
 		m_left = leftAux;
 		m_top = topAux;