diff --git a/src/modules/font/Font.cpp b/src/modules/font/Font.cpp index a4419621a..89ffdb084 100644 --- a/src/modules/font/Font.cpp +++ b/src/modules/font/Font.cpp @@ -30,6 +30,19 @@ namespace love namespace font { +// Default TrueType font. +#include "Vera.ttf.h" + +Rasterizer *Font::newTrueTypeRasterizer(int size) +{ + StrongRef data(new filesystem::FileData(sizeof(Vera_ttf), "Vera.ttf")); + data->release(); + + memcpy(data->getData(), Vera_ttf, sizeof(Vera_ttf)); + + return newTrueTypeRasterizer(data.get(), size); +} + Rasterizer *Font::newBMFontRasterizer(love::filesystem::FileData *fontdef, const std::vector &images) { return new BMFontRasterizer(fontdef, images); diff --git a/src/modules/font/Font.h b/src/modules/font/Font.h index 851621bd1..b846a1603 100644 --- a/src/modules/font/Font.h +++ b/src/modules/font/Font.h @@ -46,7 +46,7 @@ public: virtual Rasterizer *newRasterizer(love::filesystem::FileData *data) = 0; - virtual Rasterizer *newTrueTypeRasterizer(int size) = 0; + virtual Rasterizer *newTrueTypeRasterizer(int size); virtual Rasterizer *newTrueTypeRasterizer(love::filesystem::FileData *data, int size) = 0; virtual Rasterizer *newBMFontRasterizer(love::filesystem::FileData *fontdef, const std::vector &images); diff --git a/src/modules/font/freetype/Font.cpp b/src/modules/font/freetype/Font.cpp index 0e9ba1031..3972ef39e 100644 --- a/src/modules/font/freetype/Font.cpp +++ b/src/modules/font/freetype/Font.cpp @@ -32,9 +32,6 @@ namespace font namespace freetype { -// Default TrueType font. -#include "font/Vera.ttf.h" - Font::Font() { if (FT_Init_FreeType(&library)) @@ -56,16 +53,6 @@ Rasterizer *Font::newRasterizer(love::filesystem::FileData *data) throw love::Exception("Invalid font file: %s", data->getFilename().c_str()); } -Rasterizer *Font::newTrueTypeRasterizer(int size) -{ - StrongRef data(new filesystem::FileData(sizeof(Vera_ttf), "Vera.ttf")); - data->release(); - - memcpy(data->getData(), Vera_ttf, sizeof(Vera_ttf)); - - return new TrueTypeRasterizer(library, data.get(), size); -} - Rasterizer *Font::newTrueTypeRasterizer(love::filesystem::FileData *data, int size) { return new TrueTypeRasterizer(library, data, size); diff --git a/src/modules/font/freetype/Font.h b/src/modules/font/freetype/Font.h index 88c7fef89..9acab2f86 100644 --- a/src/modules/font/freetype/Font.h +++ b/src/modules/font/freetype/Font.h @@ -45,8 +45,6 @@ public: // Implements Font Rasterizer *newRasterizer(love::filesystem::FileData *data); - - Rasterizer *newTrueTypeRasterizer(int size); Rasterizer *newTrueTypeRasterizer(love::filesystem::FileData *data, int size); // Implement Module