summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-17 22:50:15 +0000
committerKarl Berry <karl@freefriends.org>2018-01-17 22:50:15 +0000
commite7dfe5ab98e759081fc73990ed6c1ac6910a105d (patch)
tree1635f79c86856a6aa57a45b8b952b651ef9fcba9 /Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp
parentae542350b1e3add10d4ee3d7b68f610132f31a50 (diff)
dvisvgm 2.3.1 (patched)
git-svn-id: svn://tug.org/texlive/trunk@46352 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp
index ae58c1b8bf6..ddb306d612e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp
@@ -2,7 +2,7 @@
** GFReader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2017 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2018 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -28,8 +28,7 @@
using namespace std;
-struct GFCommand
-{
+struct GFCommand {
void (GFReader::*method)(int);
int numBytes;
};
@@ -340,21 +339,21 @@ void GFReader::cmdNop (int) {
/** Reads character locator (part of postamble) */
void GFReader::cmdCharLoc0 (int) {
uint8_t c = readUnsigned(1); // character code mod 256
- uint8_t dm = readUnsigned(1); //
+ uint8_t dm = readUnsigned(1); // = dx/65536
int32_t w = readSigned(4); // (1<<24)*characterWidth/designSize
- int32_t p = readSigned(4); // pointer to begin of (last) character data
- int32_t dx = 65536*dm;
- int32_t dy = 0;
- _charInfoMap[c] = CharInfo(dx, dy, w, p);
+ int32_t p = readSigned(4); // pointer to begin of (last) character data
+ int32_t dx = 65536*dm; // horizontal escapement
+ int32_t dy = 0; // vertical escapement
+ _charInfoMap.emplace(c, CharInfo(dx, dy, w, p));
}
/** Reads character locator (part of postamble) */
void GFReader::cmdCharLoc (int) {
- uint32_t c = readUnsigned(1); // character code mod 256
+ uint8_t c = readUnsigned(1); // character code mod 256
int32_t dx = readSigned(4); // horizontal escapement (scaled pixel units)
int32_t dy = readSigned(4); // vertical escapement (scaled pixel units)
int32_t w = readSigned(4); // (1<<24)*characterWidth/designSize
int32_t p = readSigned(4); // pointer to begin of (last) character data
- _charInfoMap[c] = CharInfo(dx, dy, w, p);
+ _charInfoMap.emplace(c, CharInfo(dx, dy, w, p));
}