diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2017-12-26 17:03:04 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2017-12-26 17:03:04 +0100 |
commit | 9dd187337acce50e168b06571dfa315c41a1b628 (patch) | |
tree | 66579cd45677b358783fd23129c12262c851d2f2 /tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc | |
parent | e199b0f7781e38b97eb6bb5d5bfa147f520da77c (diff) | |
download | tdegraphics-9dd187337acce50e168b06571dfa315c41a1b628.tar.gz tdegraphics-9dd187337acce50e168b06571dfa315c41a1b628.zip |
Add support for Poppler >= 0.60
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc')
-rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc index 081e1035..5998ae24 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc @@ -153,7 +153,11 @@ TQString Document::getInfo( const TQString & type ) const if ( data->locked ) return NULL; +# if defined(HAVE_POPPLER_060) + info = data->doc.getDocInfo(); +# else data->doc.getDocInfo( &info ); +# endif if ( !info.isDict() ) return NULL; @@ -165,7 +169,13 @@ TQString Document::getInfo( const TQString & type ) const int i; Dict *infoDict = info.getDict(); - if ( infoDict->lookup( (char*)type.latin1(), &obj )->isString() ) + if ( +# if defined(HAVE_POPPLER_060) + infoDict->lookup( (char*)type.latin1() ).isString() +# else + infoDict->lookup( (char*)type.latin1(), &obj )->isString() +# endif + ) { s1 = obj.getString(); if ( ( s1->getChar(0) & 0xff ) == 0xfe && ( s1->getChar(1) & 0xff ) == 0xff ) @@ -192,12 +202,16 @@ TQString Document::getInfo( const TQString & type ) const } result += unicodeToTQString( &u, 1 ); } +# if !defined(HAVE_POPPLER_060) obj.free(); info.free(); +# endif return result; } +# if !defined(HAVE_POPPLER_060) obj.free(); info.free(); +# endif return NULL; } @@ -209,9 +223,15 @@ TQDateTime Document::getDate( const TQString & type ) const return TQDateTime(); Object info; +# if defined(HAVE_POPPLER_060) + info = data->doc.getDocInfo(); +# else data->doc.getDocInfo( &info ); +# endif if ( !info.isDict() ) { +# if !defined(HAVE_POPPLER_060) info.free(); +# endif return TQDateTime(); } @@ -221,7 +241,13 @@ TQDateTime Document::getDate( const TQString & type ) const Dict *infoDict = info.getDict(); TQString result; - if ( infoDict->lookup( (char*)type.latin1(), &obj )->isString() ) + if ( +# if defined(HAVE_POPPLER_060) + infoDict->lookup( (char*)type.latin1() ).isString() +# else + infoDict->lookup( (char*)type.latin1(), &obj )->isString() +# endif + ) { TQString s = UnicodeParsedString(obj.getString()); // TODO do something with the timezone information @@ -230,14 +256,18 @@ TQDateTime Document::getDate( const TQString & type ) const TQDate d( year, mon, day ); //CHECK: it was mon-1, Jan->0 (??) TQTime t( hour, min, sec ); if ( d.isValid() && t.isValid() ) { +# if !defined(HAVE_POPPLER_060) obj.free(); info.free(); +# endif return TQDateTime( d, t ); } } } +# if !defined(HAVE_POPPLER_060) obj.free(); info.free(); +# endif return TQDateTime(); } @@ -317,7 +347,7 @@ bool Document::print(const TQString &fileName, TQValueList<int> pageList, double bool Document::print(const TQString &file, TQValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight) { -#if defined(HAVE_POPPLER_030) +#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) std::vector<int> pages; TQValueList<int>::iterator it; for (it = pageList.begin(); it != pageList.end(); ++it ) { |