From d799a9d35d61231aec8da6a08e31876bd367409b Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <tsdgeos@terra.es>
Date: Sun, 13 Sep 2009 22:05:27 +0000
Subject: [PATCH] Backport r1023096
 okular/trunk/KDE/kdegraphics/okular/generators/dvi/generator_dvi.cpp: move
 usage of m_dviRenderer to below the if it checks if it exists

svn path=/branches/KDE/4.3/kdegraphics/okular/; revision=1023097
---
 generators/dvi/generator_dvi.cpp | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/generators/dvi/generator_dvi.cpp b/generators/dvi/generator_dvi.cpp
index ebad08df7..6db486820 100644
--- a/generators/dvi/generator_dvi.cpp
+++ b/generators/dvi/generator_dvi.cpp
@@ -225,28 +225,28 @@ QImage DviGenerator::image( Okular::PixmapRequest *request )
 
     QMutexLocker lock( userMutex() );
 
-    SimplePageSize s = m_dviRenderer->sizeOfPage( pageInfo->pageNumber );
+    if ( m_dviRenderer )
+    {
+        SimplePageSize s = m_dviRenderer->sizeOfPage( pageInfo->pageNumber );
 
-/*   if ( s.width() != pageInfo->width) */
-    //   if (!useDocumentSpecifiedSize)
-    //    s = userPreferredSize;
+/*       if ( s.width() != pageInfo->width) */
+        //   if (!useDocumentSpecifiedSize)
+        //    s = userPreferredSize;
 
-    if (s.isValid())
-    {
-        ps = s; /* it should be the user specified size, if any, instead */
-    }
+        if (s.isValid())
+        {
+            ps = s; /* it should be the user specified size, if any, instead */
+        }
 
-    pageInfo->resolution = (double)(pageInfo->width)/ps.width().getLength_in_inch();
+        pageInfo->resolution = (double)(pageInfo->width)/ps.width().getLength_in_inch();
 
 #if 0
-    kDebug(DviDebug) << *request
-    << ", res:" << pageInfo->resolution << " - (" << pageInfo->width << ","
-    << ps.width().getLength_in_inch() << ")," << ps.width().getLength_in_mm()
-    << endl;
+        kDebug(DviDebug) << *request
+        << ", res:" << pageInfo->resolution << " - (" << pageInfo->width << ","
+        << ps.width().getLength_in_inch() << ")," << ps.width().getLength_in_mm()
+        << endl;
 #endif
 
-    if ( m_dviRenderer )
-    {
         m_dviRenderer->drawPage( pageInfo );
 
         if ( ! pageInfo->img.isNull() )
@@ -285,13 +285,13 @@ Okular::TextPage* DviGenerator::textPage( Okular::Page *page )
 
     QMutexLocker lock( userMutex() );
 
-    SimplePageSize s = m_dviRenderer->sizeOfPage( pageInfo->pageNumber );
-    pageInfo->resolution = (double)(pageInfo->width)/ps.width().getLength_in_inch();
-
     // get page text from m_dviRenderer
     Okular::TextPage *ktp = 0;
     if ( m_dviRenderer )
     {
+        SimplePageSize s = m_dviRenderer->sizeOfPage( pageInfo->pageNumber );
+        pageInfo->resolution = (double)(pageInfo->width)/ps.width().getLength_in_inch();
+
         m_dviRenderer->getText( pageInfo );
         lock.unlock();