diff --git a/src/Draw.cpp b/src/Draw.cpp index 373287b2..f434e606 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -706,7 +706,7 @@ void InitTextObject(const char *name) #endif } - font = LoadFont(path.c_str(), width, height); + font = LoadFreeTypeFont(path.c_str(), width, height); #else std::string bitmap_path; std::string metadata_path; diff --git a/src/Font.cpp b/src/Font.cpp index 21946ef0..b38336b3 100644 --- a/src/Font.cpp +++ b/src/Font.cpp @@ -1094,7 +1094,7 @@ static Glyph* GetGlyph(Font *font, unsigned long unicode_value) } #ifdef FREETYPE_FONTS -Font* LoadFontFromData(const unsigned char *data, size_t data_size, size_t cell_width, size_t cell_height) +Font* LoadFreeTypeFontFromData(const unsigned char *data, size_t data_size, size_t cell_width, size_t cell_height) { Font *font = (Font*)malloc(sizeof(Font)); @@ -1155,7 +1155,7 @@ Font* LoadFontFromData(const unsigned char *data, size_t data_size, size_t cell_ return NULL; } -Font* LoadFont(const char *font_filename, size_t cell_width, size_t cell_height) +Font* LoadFreeTypeFont(const char *font_filename, size_t cell_width, size_t cell_height) { Font *font = NULL; @@ -1164,7 +1164,7 @@ Font* LoadFont(const char *font_filename, size_t cell_width, size_t cell_height) if (file_buffer != NULL) { - font = LoadFontFromData(file_buffer, file_size, cell_width, cell_height); + font = LoadFreeTypeFontFromData(file_buffer, file_size, cell_width, cell_height); free(file_buffer); } diff --git a/src/Font.h b/src/Font.h index fb895ffd..32412d16 100644 --- a/src/Font.h +++ b/src/Font.h @@ -7,8 +7,8 @@ typedef struct Font Font; #ifdef FREETYPE_FONTS -Font* LoadFontFromData(const unsigned char *data, size_t data_size, size_t cell_width, size_t cell_height); -Font* LoadFont(const char *font_filename, size_t cell_width, size_t cell_height); +Font* LoadFreeTypeFontFromData(const unsigned char *data, size_t data_size, size_t cell_width, size_t cell_height); +Font* LoadFreeTypeFont(const char *font_filename, size_t cell_width, size_t cell_height); #else Font* LoadBitmapFont(const char *bitmap_path, const char *metadata_path); #endif