[poppler] 2 commits - qt4/src

[Albert Astals Cid]

 qt4/src/poppler-document.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 348f4f9d9d5b0f91da6f46e0fcefec80255d4179
Merge: 8a8a4f0... 4eca2e0...
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
Date:   Sat Jan 5 23:03:06 2008 +0100

    Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler

commit 8a8a4f01272fb86898fafbda07129c0cbc03d527
Author: Pino Toscano <pino at kde.org>
Date:   Sat Jan 5 23:02:22 2008 +0100

    Make Document::renderHints return the correct render hints

diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
index 04a1d81..b9431d8 100644
--- a/qt4/src/poppler-document.cc
+++ b/qt4/src/poppler-document.cc
@@ -450,7 +450,7 @@ namespace Poppler {
 
     Document::RenderHints Document::renderHints() const
     {
-        return Document::RenderHints() & m_doc->m_hints;
+        return Document::RenderHints( m_doc->m_hints );
     }
 
     PSConverter *Document::psConverter() const