← Back to team overview

spv-dev team mailing list archive

[Branch ~spv-dev/slidepresenterview/pypoppler-qt4] Rev 15: Backport from official trunk

 

------------------------------------------------------------
revno: 15
committer: F.-A. Bourbonnais <bouf10pub@xxxxxxxxxxx>
branch nick: pypoppler-qt4
timestamp: Sat 2011-01-08 12:29:53 -0500
message:
  Backport from official trunk
modified:
  poppler-qt4.sip


--
lp:~spv-dev/slidepresenterview/pypoppler-qt4
https://code.launchpad.net/~spv-dev/slidepresenterview/pypoppler-qt4

Your team SlidePresenterView Development Team is subscribed to branch lp:~spv-dev/slidepresenterview/pypoppler-qt4.
To unsubscribe from this branch go to https://code.launchpad.net/~spv-dev/slidepresenterview/pypoppler-qt4/+edit-subscription
=== modified file 'poppler-qt4.sip'
--- poppler-qt4.sip	2009-06-07 19:29:21 +0000
+++ poppler-qt4.sip	2011-01-08 17:29:53 +0000
@@ -176,6 +176,10 @@
                   const QByteArray &ownerPassword=QByteArray(),
                   const QByteArray &userPassword=QByteArray());
 
+    static Poppler::Document *loadFromData(const QByteArray & fileContents,
+                    const QByteArray &ownerPassword=QByteArray(),
+                    const QByteArray &userPassword=QByteArray());
+
 
     Poppler::Page *page(int index) const;