Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 6306 → Rev 6307

/branches/Version13x/Scribus/scribus/fonts/scface_ttf.cpp
55,7 → 55,7
} //namespace
 
 
void ScFace_ttf::RawData(QByteArray & bb) {
void ScFace_ttf::RawData(QByteArray & bb) const {
if (formatCode == ScFace::TTCF) {
QByteArray coll;
FtFace::RawData(coll);
111,7 → 111,7
}
}
 
bool ScFace_ttf::EmbedFont(QString &str)
bool ScFace_ttf::EmbedFont(QString &str) const
{
if (formatCode == ScFace::TYPE42) {
//easy:
/branches/Version13x/Scribus/scribus/fonts/scface_ttf.h
24,8 → 24,8
{
formatCode = ScFace::SFNT;
}
bool EmbedFont(QString &str);
void RawData(QByteArray & bb);
bool EmbedFont(QString &str) const;
void RawData(QByteArray & bb) const;
};
 
#endif
/branches/Version13x/Scribus/scribus/fonts/ftface.cpp
292,13 → 292,13
bb.resize(0);
status = QMAX(status, ScFace::BROKENGLYPHS);
}
/*
if (showFontInformation)
/*
// if (showFontInformation)
{
QFile f(fontFile);
qDebug(QObject::tr("RawData for Font %1(%2): size=%3 filesize=%4").arg(fontFile).arg(faceIndex_).arg(bb.size()).arg(f.size()));
qDebug(QObject::tr("RawData for Font %1(%2): size=%3 filesize=%4").arg(fontFile).arg(faceIndex).arg(bb.size()).arg(f.size()));
}
*/
*/
}
 
 
/branches/Version13x/Scribus/scribus/fonts/scface_ps.h
40,14 → 40,14
typeCode = ScFace::TYPE1;
}
 
virtual void load() // routine by Franz Schmid - modified by Alastair M. Robinson
virtual void load() const // routine by Franz Schmid - modified by Alastair M. Robinson
{
ScFaceData::load();
FtFace::load();
bool error;
FT_Face face = ftFace();
if (!face)
{
usable = false;
const_cast<ScFace_postscript*>(this)->usable = false;
qDebug(QObject::tr("Font %1 is broken (no Face), discarding it").arg(fontFile));
return;
}
131,7 → 131,7
formatCode = ScFace::PFB;
}
 
virtual bool EmbedFont(QString &str)
virtual bool EmbedFont(QString &str) const
{
QByteArray bb;
RawData(bb);
217,7 → 217,7
{
formatCode = ScFace::PFA;
}
virtual bool EmbedFont(QString &str)
virtual bool EmbedFont(QString &str) const
{
QByteArray bb;
RawData(bb);
227,6 → 227,7
str.append(bb);
return true;
}
qDebug(QObject::tr("Font %1 cannot be read, no embedding").arg(fontFile));
return false;
}
};