[poppler] 3 commits - qt4/src qt5/src

[Pino Toscano]

 qt4/src/poppler-optcontent.cc |    3 +--
 qt5/src/poppler-optcontent.cc |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 07621ebbda8ab85cf4cd76a6092efc67aa14454d
Merge: 8d3a2c9 9fcd46a
Author: Pino Toscano <pino at kde.org>
Date:   Sat Apr 5 15:49:31 2014 +0200

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

commit 9fcd46ac4a94f138981ec5afaab3875918c6a175
Author: Pino Toscano <pino at kde.org>
Date:   Sat Apr 5 15:48:27 2014 +0200

    qt4/qt5: remove extra qDebug

diff --git a/qt4/src/poppler-optcontent.cc b/qt4/src/poppler-optcontent.cc
index b9ceb7e..822e0bd 100644
--- a/qt4/src/poppler-optcontent.cc
+++ b/qt4/src/poppler-optcontent.cc
@@ -171,7 +171,6 @@ namespace Poppler
       QMapIterator<QString, OptContentItem*> i(m_optContentItems);
       while ( i.hasNext() ) {
 	i.next();
-	qDebug() << "iterator" << i.key() << ":" << i.value();
 	addChild( m_rootNode, i.value() );
       }
     } else {
diff --git a/qt5/src/poppler-optcontent.cc b/qt5/src/poppler-optcontent.cc
index 94df59e..0ead461 100644
--- a/qt5/src/poppler-optcontent.cc
+++ b/qt5/src/poppler-optcontent.cc
@@ -171,7 +171,6 @@ namespace Poppler
       QMapIterator<QString, OptContentItem*> i(m_optContentItems);
       while ( i.hasNext() ) {
 	i.next();
-	qDebug() << "iterator" << i.key() << ":" << i.value();
 	addChild( m_rootNode, i.value() );
       }
     } else {
commit 37286ee2923de060ae463ac6b178ffd0e6096b90
Author: Pino Toscano <pino at kde.org>
Date:   Sat Apr 5 15:46:44 2014 +0200

    qt4/qt5: fix some kinds of OCG models
    
    properly pass parent and child when building the tree

diff --git a/qt4/src/poppler-optcontent.cc b/qt4/src/poppler-optcontent.cc
index 6a5ffe7..b9ceb7e 100644
--- a/qt4/src/poppler-optcontent.cc
+++ b/qt4/src/poppler-optcontent.cc
@@ -172,7 +172,7 @@ namespace Poppler
       while ( i.hasNext() ) {
 	i.next();
 	qDebug() << "iterator" << i.key() << ":" << i.value();
-	addChild( i.value(), m_rootNode );
+	addChild( m_rootNode, i.value() );
       }
     } else {
       parseOrderArray( m_rootNode, optContent->getOrderArray() );
diff --git a/qt5/src/poppler-optcontent.cc b/qt5/src/poppler-optcontent.cc
index 5af37c8..94df59e 100644
--- a/qt5/src/poppler-optcontent.cc
+++ b/qt5/src/poppler-optcontent.cc
@@ -172,7 +172,7 @@ namespace Poppler
       while ( i.hasNext() ) {
 	i.next();
 	qDebug() << "iterator" << i.key() << ":" << i.value();
-	addChild( i.value(), m_rootNode );
+	addChild( m_rootNode, i.value() );
       }
     } else {
       parseOrderArray( m_rootNode, optContent->getOrderArray() );