diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-31 18:37:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-31 18:37:40 +0000 |
commit | 4c245316c293169ee655c8e2f922b4bee454f9bc (patch) | |
tree | 2d3b72165f3e7e1298df8dad8b52f119a42228dc /Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp | |
parent | 54a2f67f996dceca3c89276dea798f746b3cacaf (diff) |
import original dvisvgm-2.1
git-svn-id: svn://tug.org/texlive/trunk@43102 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/src/FontMetrics.cpp | 12 |
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); |