Commit 5fa86988 authored by Brad Hards's avatar Brad Hards
Browse files

Remove boolean for unicode table lookup from Font

parent 40469c58
2005-07-06 Brad Hards <bradh@frogmouth.net>
* qt4/tests/poppler-fonts.cpp (main): update to reflect API change,
and also to show "[none]" if the font is nameless.
* qt4/src/poppler-document.cc (Poppler):
* qt4/src/poppler-qt4.h: remove the unicode translation bool,
it is really an internal thing.
2005-07-05 Albert Astals Cid <aacid@kde.org>
* qt4/src/poppler-document.cc (Poppler):
......@@ -7,6 +16,11 @@
2005-07-05 Brad Hards <bradh@frogmouth.net>
* qt4/tests/check_author.cpp:
* qt4/tests/check_permissions.cpp:
* Makefile.am:
* .cvsignore: add a couple more test cases
* qt4/src/poppler-document.cc (Poppler):
* qt4/src/poppler-qt4.h: Add Qt4 bindings for the
additional user permission properties.
......
......@@ -134,14 +134,12 @@ namespace Poppler {
fontList->append(FontInfo(((::FontInfo*)items->get(i))->getName()->getCString(),
((::FontInfo*)items->get(i))->getEmbedded(),
((::FontInfo*)items->get(i))->getSubset(),
((::FontInfo*)items->get(i))->getToUnicode(),
(Poppler::FontInfo::Type)((::FontInfo*)items->get(i))->getType()
));
else
fontList->append(FontInfo(QString::null,
((::FontInfo*)items->get(i))->getEmbedded(),
((::FontInfo*)items->get(i))->getSubset(),
((::FontInfo*)items->get(i))->getToUnicode(),
(Poppler::FontInfo::Type)((::FontInfo*)items->get(i))->getType()
));
}
......
......@@ -57,12 +57,10 @@ namespace Poppler {
Create a new font information container
*/
FontInfo( const QString fontName, const bool isEmbedded,
const bool isSubset, const bool requiresUnicodeConversion,
Type type):
const bool isSubset, Type type):
m_fontName(fontName),
m_isEmbedded(isEmbedded),
m_isSubset(isSubset),
m_requiresUnicodeConversion(requiresUnicodeConversion),
m_type(type)
{};
......@@ -89,15 +87,6 @@ namespace Poppler {
bool isSubset() const
{ return m_isSubset; }
/**
Whether the font requires special (table) lookup
\return true if the codepoints need to be looked up to get
to a Unicode form
*/
bool requiresUnicodeConversion() const
{ return m_requiresUnicodeConversion; }
/**
The type of font encoding
*/
......@@ -109,7 +98,6 @@ namespace Poppler {
QString m_fontName;
bool m_isEmbedded;
bool m_isSubset;
bool m_requiresUnicodeConversion;
Type m_type;
};
......
......@@ -21,13 +21,17 @@ int main( int argc, char **argv )
exit(1);
}
std::cout << "name type emb sub uni";
std::cout << "name type emb sub";
std::cout << std::endl;
std::cout << "------------------------------------ ------------ --- --- ---";
std::cout << "------------------------------------ ------------ --- ---";
std::cout << std::endl;
foreach( Poppler::FontInfo font, doc->fonts() ) {
std::cout << qPrintable( QString("%1").arg(font.name(), -37) );
if (font.name().isNull()) {
std::cout << qPrintable( QString("%1").arg(QString("[none]"), -37) );
} else {
std::cout << qPrintable( QString("%1").arg(font.name(), -37) );
}
switch( font.type() ) {
case Poppler::FontInfo::unknown:
std::cout << "unknown ";
......@@ -65,12 +69,6 @@ int main( int argc, char **argv )
} else {
std::cout << "no ";
}
if ( font.requiresUnicodeConversion() ) {
std::cout << "yes ";
} else {
std::cout << "no ";
}
std::cout << std::endl;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment