Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-24 02:42:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

okular: check only the major poppler version in poppler generator

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-17 04:17:55 +02:00
parent cbb8a7817a
commit 45b68de2df
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
okular/generators/poppler/generator_pdf.cpp
View file

@ -28,7 +28,7 @@
#include <poppler/cpp/poppler-version.h> #include <poppler/cpp/poppler-version.h>
#include <sys/types.h> #include <sys/types.h>
#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 #if POPPLER_VERSION_MAJOR
typedef time_t popplertimetype; typedef time_t popplertimetype;
#else #else
typedef poppler::time_type popplertimetype; typedef poppler::time_type popplertimetype;
@ -304,7 +304,7 @@ Okular::Document::OpenResult PDFGenerator::loadDocumentWithPassword(const QStrin
const poppler::page_transition *popplerpagetransition = popplerpage->transition(); const poppler::page_transition *popplerpagetransition = popplerpage->transition();
if (popplerpagetransition) { if (popplerpagetransition) {
Okular::PageTransition* okulartransition = new Okular::PageTransition(); Okular::PageTransition* okulartransition = new Okular::PageTransition();
#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 #if POPPLER_VERSION_MAJOR >= 23
okulartransition->setDuration(qRound(popplerpagetransition->durationReal())); okulartransition->setDuration(qRound(popplerpagetransition->durationReal()));
#else #else
okulartransition->setDuration(popplerpagetransition->duration()); okulartransition->setDuration(popplerpagetransition->duration());
@ -418,7 +418,7 @@ const Okular::DocumentInfo* PDFGenerator::generateDocumentInfo()
m_documentinfo->set(Okular::DocumentInfo::Creator, okularString(m_popplerdocument->get_creator())); m_documentinfo->set(Okular::DocumentInfo::Creator, okularString(m_popplerdocument->get_creator()));
m_documentinfo->set(Okular::DocumentInfo::Producer, okularString(m_popplerdocument->get_producer())); m_documentinfo->set(Okular::DocumentInfo::Producer, okularString(m_popplerdocument->get_producer()));
m_documentinfo->set(Okular::DocumentInfo::Keywords, okularString(m_popplerdocument->get_keywords())); m_documentinfo->set(Okular::DocumentInfo::Keywords, okularString(m_popplerdocument->get_keywords()));
#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 #if POPPLER_VERSION_MAJOR >= 23
m_documentinfo->set(Okular::DocumentInfo::CreationDate, okularTime(m_popplerdocument->get_creation_date_t())); m_documentinfo->set(Okular::DocumentInfo::CreationDate, okularTime(m_popplerdocument->get_creation_date_t()));
m_documentinfo->set(Okular::DocumentInfo::ModificationDate, okularTime(m_popplerdocument->get_modification_date_t())); m_documentinfo->set(Okular::DocumentInfo::ModificationDate, okularTime(m_popplerdocument->get_modification_date_t()));
#else #else
@ -490,7 +490,7 @@ const QList<Okular::EmbeddedFile*>* PDFGenerator::embeddedFiles() const
pdfembeddedfile->m_description = okularString(popplerembeddedfile->description()); pdfembeddedfile->m_description = okularString(popplerembeddedfile->description());
pdfembeddedfile->m_data = okularBytes(popplerembeddedfile->data()); pdfembeddedfile->m_data = okularBytes(popplerembeddedfile->data());
pdfembeddedfile->m_size = popplerembeddedfile->size(); pdfembeddedfile->m_size = popplerembeddedfile->size();
#if POPPLER_VERSION_MAJOR >= 22 && POPPLER_VERSION_MINOR >= 5 #if POPPLER_VERSION_MAJOR >= 23
pdfembeddedfile->m_modificationdate = okularDateTime(popplerembeddedfile->modification_date_t()); pdfembeddedfile->m_modificationdate = okularDateTime(popplerembeddedfile->modification_date_t());
pdfembeddedfile->m_creationdate = okularDateTime(popplerembeddedfile->creation_date_t()); pdfembeddedfile->m_creationdate = okularDateTime(popplerembeddedfile->creation_date_t());
#else #else