office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 11:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

cache the font names instead of reinit them every time we want the information about fonts

Browse source 
svn path=/trunk/KDE/kdegraphics/okular/; revision=656936
This commit is contained in:
Pino Toscano 2007-04-22 19:16:38 +00:00
parent c4f3580d28
commit db817781c9
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
generators/poppler/generator_pdf.cpp
View file

@ -538,21 +538,13 @@ const Okular::DocumentFonts * PDFGenerator::generateDocumentFonts()
// initialize fonts dom
docFonts.appendChild( docFonts.createElement( "Fonts" ) );
// initialize the font names DB
initFontNames();
docLock.lock();
QList<Poppler::FontInfo> fonts = pdfdoc->fonts();
docLock.unlock();
const QString fontTypeNames[8] = {
i18n("unknown"),
i18n("Type 1"),
i18n("Type 1C"),
i18n("Type 3"),
i18n("TrueType"),
i18n("CID Type 0"),
i18n("CID Type 0C"),
i18n("CID TrueType")
};
foreach (const Poppler::FontInfo &font, fonts)
{
// 0. add font element
@ -564,7 +556,8 @@ const Okular::DocumentFonts * PDFGenerator::generateDocumentFonts()
fontElem.setAttribute( "Name", name.isNull() ? i18n("[none]") : name );
// 2. set Type
fontElem.setAttribute( "Type", fontTypeNames[ font.type() ] );
QString typestring = font.type() >= 0 && font.type() < fontNames.count() ? fontNames.at(font.type()) : i18nc("not available", "n/a");
fontElem.setAttribute( "Type", typestring );
// 3. set Embedded
fontElem.setAttribute( "Embedded", font.isEmbedded() ? i18n("Yes") : i18n("No") );
@ -1224,6 +1217,26 @@ void PDFGenerator::addFormFields( Poppler::Page * popplerPage, Okular::Page * pa
#endif
}
void PDFGenerator::initFontNames()
{
// fonts names DB already initialized
if (!fontNames.isEmpty())
return;
// THESE VALUES HAVE TO BE IN SYNC with the poppler font type enyum
int i = 0;
fontNames.resize(8);
fontNames[i++] = i18n("unknown");
fontNames[i++] = i18n("Type 1");
fontNames[i++] = i18n("Type 1C");
fontNames[i++] = i18n("Type 3");
fontNames[i++] = i18n("TrueType");
fontNames[i++] = i18n("CID Type 0");
fontNames[i++] = i18n("CID Type 0C");
fontNames[i++] = i18n("CID TrueType");
}
struct pdfsyncpoint
{
QString file;

3
generators/poppler/generator_pdf.h
View file

@ -110,6 +110,8 @@ class PDFGenerator : public Okular::Generator, public Okular::ConfigInterface
Okular::TextPage * abstractTextPage(const QList<Poppler::TextBox*> &text, double height, double width, int rot);
void initFontNames();
// poppler dependant stuff
mutable QMutex docLock;
Poppler::Document *pdfdoc;
@ -130,6 +132,7 @@ class PDFGenerator : public Okular::Generator, public Okular::ConfigInterface
mutable QList<Okular::EmbeddedFile*> docEmbeddedFiles;
QVector<bool> rectsGenerated;
QVector<QString> fontNames;
};