diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:35 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:35 +1000 |
| commit | 0771c148171b8cb6235086402275a4e82d3ea342 (patch) | |
| tree | 74313a4d468a92f5510d23a6c35a3c95bfce8e86 /tools | |
| parent | 94f1cc2f0a4db0c6f1483e6d648068e031bcc094 (diff) | |
| parent | bee02d5bb58800104a6dd7490ec2424dacecf625 (diff) | |
| download | uGFX-0771c148171b8cb6235086402275a4e82d3ea342.tar.gz uGFX-0771c148171b8cb6235086402275a4e82d3ea342.tar.bz2 uGFX-0771c148171b8cb6235086402275a4e82d3ea342.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mcufontencoder/src/datafile.hh | 2 | ||||
| -rw-r--r-- | tools/mcufontencoder/src/main.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/mcufontencoder/src/datafile.hh b/tools/mcufontencoder/src/datafile.hh index 460e6039..b5e1d538 100644 --- a/tools/mcufontencoder/src/datafile.hh +++ b/tools/mcufontencoder/src/datafile.hh @@ -51,6 +51,8 @@ public: DataFile(const std::vector<dictentry_t> &dictionary, const std::vector<glyphentry_t> &glyphs, const fontinfo_t &fontinfo); + + inline DataFile * clone() const { return new DataFile(GetDictionary(), GetGlyphTable(), GetFontInfo()); } // Save to a file (custom format) void Save(std::ostream &file) const; diff --git a/tools/mcufontencoder/src/main.cc b/tools/mcufontencoder/src/main.cc index 70cd9132..a51b7451 100644 --- a/tools/mcufontencoder/src/main.cc +++ b/tools/mcufontencoder/src/main.cc @@ -443,7 +443,7 @@ static const char *usage_msg = " rlefont_show_encoded <datfile> Show the encoded data for debugging.\n" "\n" "Commands specific to bwfont format:\n" - " bwfont_export <datfile> [outfile Export to .c source code.\n" + " bwfont_export <datfile> [outfile] Export to .c source code.\n" ""; typedef status_t (*cmd_t)(const std::vector<std::string> &args); |