summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp
index c50d010802c..375062f7f0a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp
@@ -2,7 +2,7 @@
** FontMetrics.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2016 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2017 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 **
@@ -20,19 +20,19 @@
#include <config.h>
#include <fstream>
-#include "FileFinder.h"
-#include "FontMetrics.h"
-#include "JFM.h"
+#include "FileFinder.hpp"
+#include "FontMetrics.hpp"
+#include "JFM.hpp"
using namespace std;
FontMetrics* FontMetrics::read (const char *fontname) {
- const char *path = FileFinder::lookup(string(fontname) + ".tfm");
+ const char *path = FileFinder::instance().lookup(string(fontname) + ".tfm");
ifstream ifs(path, ios::binary);
if (!ifs)
return 0;
- UInt16 id = 256*ifs.get();
+ uint16_t id = 256*ifs.get();
id += ifs.get();
if (id == 9 || id == 11) // Japanese font metric file?
return new JFM(ifs);