r24461 by jghali - Remove useless blank lines
scribus-commit
scribus-commit at lists.scribus.net
Mon Feb 8 22:32:50 UTC 2021
Author: jghali
Date: Mon Feb 8 22:32:50 2021
New Revision: 24461
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24461
Log:
Remove useless blank lines
Modified:
trunk/Scribus/scribus/fonts/sfnt.cpp
trunk/Scribus/scribus/scimagecachemanager.cpp
Modified: trunk/Scribus/scribus/fonts/sfnt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24461&path=/trunk/Scribus/scribus/fonts/sfnt.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/sfnt.cpp (original)
+++ trunk/Scribus/scribus/fonts/sfnt.cpp Mon Feb 8 22:32:50 2021
@@ -22,6 +22,7 @@
const unsigned char * pp = reinterpret_cast<const unsigned char*>(bb.data()) + pos;
return pp[0];
}
+
quint32 word(const QByteArray & bb, uint pos)
{
const unsigned char * pp = reinterpret_cast<const unsigned char*>(bb.data()) + pos;
@@ -95,13 +96,7 @@
return true;
}
-
-
-
-
-
const uint post_format10_names_count = 258;
-
static const char* post_format10_names[] = {
".notdef",
@@ -305,8 +300,6 @@
"dcroat"
};
-
-
bool PostTable::usable() const
{
return m_usable;
@@ -342,7 +335,6 @@
return post_format10_names[glyph];
return ".notdef";
}
-
void PostTable::readFrom(FT_Face face)
{
@@ -425,8 +417,6 @@
m_usable = true;
}
-
-
int copyTable(QByteArray& ttf, uint destDirEntry, uint pos, const QByteArray& source, uint dirEntry)
{
FT_ULong tag = word(source, dirEntry + ttf_TableRecord_tag);
@@ -444,7 +434,6 @@
return tableSize;
}
-
QByteArray extractFace(const QByteArray& coll, int faceIndex)
{
@@ -561,7 +550,6 @@
return result;
}
-
quint32 calcTableChecksum(QByteArray& table)
{
quint32 Sum = 0L;
@@ -569,7 +557,6 @@
Sum += word(table, pos);
return Sum;
}
-
void writeTable(QByteArray& ttf, const QByteArray& tag, QByteArray& table)
{
@@ -586,7 +573,6 @@
ttf.append(table);
}
-
bool hasLongLocaFormat(const QByteArray& ttf)
{
const QByteArray head = getTable(ttf, "head");
@@ -595,7 +581,6 @@
return idxToLocFormat == 1;
}
-
QList<quint32> readLoca(const QByteArray& ttf)
{
QList<quint32> result;
@@ -629,7 +614,6 @@
}
return result;
}
-
QList<std::pair<qint16,quint16> > readHmtx(const QByteArray& ttf)
{
@@ -658,7 +642,6 @@
return result;
}
-
QByteArray writeHmtx(const QList<std::pair<qint16,quint16> >& longHorMetrics)
{
QByteArray result;
@@ -672,7 +655,6 @@
}
return result;
}
-
QMap<uint, uint> readCMap(const QByteArray& ttf)
{
@@ -801,8 +783,6 @@
return result;
}
-
-
QByteArray writeCMap(const QMap<uint, uint>& cmap)
{
// we always write only one table: platform=3(MS), encoding=1(Unicode 16bit)
@@ -944,7 +924,6 @@
return result;
}
-
QList<uint> copyGlyphComponents(QByteArray& destGlyf, const QByteArray& srcGlyf, uint srcOffset,
QMap<uint,uint>& newForOldGid, uint& nextFreeGid)
{
@@ -1060,14 +1039,11 @@
return compositeElements;
}
-
QByteArray subsetFace(const QByteArray& ttf, QList<uint>& glyphs)
{
QMap<QByteArray,QByteArray> tables;
-
// qDebug() << "loca table:" << (void*) oldLoca[0] << (void*) oldLoca[1] << (void*) oldLoca[2] << (void*) oldLoca[3] << (void*) oldLoca[4] << (void*) oldLoca[5] << (void*) oldLoca[6] << (void*) oldLoca[7];
-
QMap<uint,uint> newForOldGid;
if (glyphs.length() == 0)
@@ -1201,12 +1177,10 @@
QByteArray fpgm = getTable(ttf, "fpgm");
if (fpgm.length() > 0)
tables["fpgm"] = fpgm;
-
QByteArray head = getTable(ttf, "head");
putWord(head, ttf_head_checkSumAdjustment, 0);
tables["head"] = head;
-
QByteArray font = createTableDir(tables.keys());
QMap<QByteArray,QByteArray>::iterator tableP;
Modified: trunk/Scribus/scribus/scimagecachemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24461&path=/trunk/Scribus/scribus/scimagecachemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachemanager.cpp (original)
+++ trunk/Scribus/scribus/scimagecachemanager.cpp Mon Feb 8 22:32:50 2021
@@ -339,8 +339,6 @@
{
return m_fa.isEmpty() ? 0 : m_fa.front();
}
-
-
ScImageCacheManager & ScImageCacheManager::instance()
{
More information about the scribus-commit
mailing list