summaryrefslogtreecommitdiff
path: root/dviware/dvisvgm/src/ttf
diff options
context:
space:
mode:
Diffstat (limited to 'dviware/dvisvgm/src/ttf')
-rw-r--r--dviware/dvisvgm/src/ttf/HmtxTable.cpp2
-rw-r--r--dviware/dvisvgm/src/ttf/TTFWriter.cpp10
-rw-r--r--dviware/dvisvgm/src/ttf/VmtxTable.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/dviware/dvisvgm/src/ttf/HmtxTable.cpp b/dviware/dvisvgm/src/ttf/HmtxTable.cpp
index 6e849768fd..e5dc63c7e8 100644
--- a/dviware/dvisvgm/src/ttf/HmtxTable.cpp
+++ b/dviware/dvisvgm/src/ttf/HmtxTable.cpp
@@ -57,6 +57,6 @@ void HmtxTable::updateWidthData (uint32_t c, int16_t xmin, int16_t xmax) {
_runLengthOfAdvWidth++;
else
_runLengthOfAdvWidth = 1;
- _widthInfos.emplace_back(CharWidthInfo(xmin, w));
+ _widthInfos.emplace_back(xmin, w);
ttfWriter()->updateGlobalAdvanceWidth(w, _widthInfos.size()-_runLengthOfAdvWidth+1);
} \ No newline at end of file
diff --git a/dviware/dvisvgm/src/ttf/TTFWriter.cpp b/dviware/dvisvgm/src/ttf/TTFWriter.cpp
index 2dacdfc567..a64f1ff641 100644
--- a/dviware/dvisvgm/src/ttf/TTFWriter.cpp
+++ b/dviware/dvisvgm/src/ttf/TTFWriter.cpp
@@ -368,14 +368,14 @@ bool TTFWriter::convertTTFToWOFF (istream &is, ostream &os) {
// read and process TTF header
vector<char> bufvec(12, 0);
is.read(&bufvec[0], 12);
- buffers.emplace_back(TableBuffer(0, std::move(bufvec)));
+ buffers.emplace_back(0, std::move(bufvec));
int numTables = buffers.back().getUInt16(4);
// read and process table records
bufvec.clear();
bufvec.resize(4 * 4 * numTables);
is.read(&bufvec[0], 4 * 4 * numTables);
- buffers.emplace_back(TableBuffer(0, std::move(bufvec)));
+ buffers.emplace_back(0, std::move(bufvec));
struct TableRecord {
TableRecord (const TableBuffer &buf, size_t ofs)
@@ -389,7 +389,7 @@ bool TTFWriter::convertTTFToWOFF (istream &is, ostream &os) {
tableRecords.reserve(numTables);
const TableBuffer &recbuf = buffers.back();
for (int i=0; i < numTables; i++)
- tableRecords.emplace_back(TableRecord(recbuf, 16*i));
+ tableRecords.emplace_back(recbuf, 16*i);
// read and process tables
for (const TableRecord &record : tableRecords) {
@@ -398,9 +398,9 @@ bool TTFWriter::convertTTFToWOFF (istream &is, ostream &os) {
is.seekg(record.offset);
is.read(&bufvec[0], record.length);
if (record.tag == TTFTable::name2id("head"))
- buffers.emplace_back(TableBuffer(record.tag, std::move(bufvec), HeadTable::offsetToChecksum()));
+ buffers.emplace_back(record.tag, std::move(bufvec), HeadTable::offsetToChecksum());
else
- buffers.emplace_back(TableBuffer(record.tag, std::move(bufvec)));
+ buffers.emplace_back(record.tag, std::move(bufvec));
}
return ttf_to_woff(std::move(buffers), os);
}
diff --git a/dviware/dvisvgm/src/ttf/VmtxTable.cpp b/dviware/dvisvgm/src/ttf/VmtxTable.cpp
index 6873bac9d2..ad695763d1 100644
--- a/dviware/dvisvgm/src/ttf/VmtxTable.cpp
+++ b/dviware/dvisvgm/src/ttf/VmtxTable.cpp
@@ -52,6 +52,6 @@ void VmtxTable::updateHeightData (uint32_t c, int16_t ymin, int16_t ymax) {
_runLengthOfAdvHeight++;
else
_runLengthOfAdvHeight = 1;
- _heightInfos.emplace_back(CharHeightInfo(ymin, h));
+ _heightInfos.emplace_back(ymin, h);
ttfWriter()->updateGlobalAdvanceHeight(h, _heightInfos.size()-_runLengthOfAdvHeight+1);
} \ No newline at end of file