[poppler] 2 commits - qt4/src

[Albert Astals Cid]

 qt4/src/poppler-document.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 77a980472e76b568346a49057b0217111a14a4cd
Merge: 74d6217... 46fb365...
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Oct 23 00:23:53 2012 +0200

    Merge remote-tracking branch 'origin/poppler-0.20'

commit 46fb3653c7ae44c34d12d799df8f70d649eaa995
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Oct 23 00:22:55 2012 +0200

    Fix the or-ing of flags

diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
index 550e706..e89b51e 100644
--- a/qt4/src/poppler-document.cc
+++ b/qt4/src/poppler-document.cc
@@ -1,7 +1,7 @@
 /* poppler-document.cc: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
  * Copyright (C) 2005, 2008, Brad Hards <bradh at frogmouth.net>
- * Copyright (C) 2005-2010, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005-2010, 2012, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2006-2010, Pino Toscano <pino at kde.org>
  * Copyright (C) 2010, 2011 Hib Eris <hib at hiberis.nl>
  * Copyright (C) 2012 Koji Otani <sho at bbr.jp>
@@ -526,7 +526,7 @@ namespace Poppler {
 
         // the only way to set antialiasing for Splash is on creation
         if ( m_doc->m_backend == Document::SplashBackend &&
-             ( hint & ( Document::Antialiasing || Document::TextAntialiasing || Document::TextHinting ) ) )
+             ( hint & ( Document::Antialiasing | Document::TextAntialiasing | Document::TextHinting ) ) )
         {
             delete m_doc->m_outputDev;
             m_doc->m_outputDev = NULL;