summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-02-27 13:55:44 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-02-27 13:55:44 +0000
commit47ce3271b417e6d0a8fcbbbe94bd9060290e5032 (patch)
treec6da726176d1271ff0fe608db0b51b52fb4870f8 /Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp
parente8c2792ffc88bff8519581351d6349a84d81bebe (diff)
dvisvgm 1.15
git-svn-id: svn://tug.org/texlive/trunk@39886 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp
index 762ab8b65d7..8b125ac5ef9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp
@@ -24,15 +24,16 @@
#include <fstream>
#include <limits>
#include "FileFinder.h"
-#include "Subfont.h"
#include "Message.h"
+#include "Subfont.h"
+
using namespace std;
// helper functions
static int skip_mapping_data (istream &is);
-static bool scan_line (const char *line, int lineno, UInt16 *mapping, const string &fname, int &pos);
+static bool scan_line (const char *line, int lineno, UInt16 *mapping, const string &fname, long &pos);
/** Constructs a new SubfontDefinition object.
@@ -105,7 +106,7 @@ Subfont* SubfontDefinition::subfont (const string &id) const {
int SubfontDefinition::subfonts (vector<Subfont*> &sfs) const {
for (ConstIterator it=_subfonts.begin(); it != _subfonts.end(); ++it)
sfs.push_back(it->second);
- return sfs.size();
+ return int(sfs.size());
}
//////////////////////////////////////////////////////////////////////
@@ -153,7 +154,7 @@ bool Subfont::read () {
// build mapping array
_mapping = new UInt16[256];
memset(_mapping, 0, 256*sizeof(UInt16));
- int pos=0;
+ long pos=0;
char buf[1024];
bool complete=false;
while (!complete) {
@@ -210,7 +211,7 @@ static int skip_mapping_data (istream &is) {
* @param[in] fname name of the mapfile being scanned
* @param[in,out] offset position/index of next mapping value
* @return true if the line is the last one the current mapping sequence, i.e. the line doesn't end with a backslash */
-static bool scan_line (const char *line, int lineno, UInt16 *mapping, const string &fname, int &offset) {
+static bool scan_line (const char *line, int lineno, UInt16 *mapping, const string &fname, long &offset) {
const char *p=line;
char *q;
for (; *p && isspace(*p); p++);
@@ -222,7 +223,7 @@ static bool scan_line (const char *line, int lineno, UInt16 *mapping, const stri
}
else {
long val1 = strtol(p, &q, 0); // first value of range
- long val2; // last value of range
+ long val2 = -1; // last value of range
ostringstream oss; // output stream for exception messages
switch (*q) {
case ':':