feat(src/renderer): stream fonts with SDL_RWops on all platforms (#1555)
* feat(src/renderer): stream fonts with SDL_RWops on all platforms This fixes #1529 where the font itself carries the font file, which gets copied around. This commit streams the file, so the file is not entirely in memory. * style(src/renderer): use standard C types * refactor(src/renderer): implement FT_Stream.close * fix(src/renderer): fix SDL_RWops double free
This commit is contained in:
parent
523e62bdce
commit
60e71160b6
109
src/renderer.c
109
src/renderer.c
|
@ -7,6 +7,7 @@
|
||||||
#include FT_FREETYPE_H
|
#include FT_FREETYPE_H
|
||||||
#include FT_LCD_FILTER_H
|
#include FT_LCD_FILTER_H
|
||||||
#include FT_OUTLINE_H
|
#include FT_OUTLINE_H
|
||||||
|
#include FT_SYSTEM_H
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
@ -50,6 +51,7 @@ typedef struct {
|
||||||
|
|
||||||
typedef struct RenFont {
|
typedef struct RenFont {
|
||||||
FT_Face face;
|
FT_Face face;
|
||||||
|
FT_StreamRec stream;
|
||||||
GlyphSet* sets[SUBPIXEL_BITMAPS_CACHED][MAX_LOADABLE_GLYPHSETS];
|
GlyphSet* sets[SUBPIXEL_BITMAPS_CACHED][MAX_LOADABLE_GLYPHSETS];
|
||||||
float size, space_advance, tab_advance;
|
float size, space_advance, tab_advance;
|
||||||
unsigned short max_height, baseline, height;
|
unsigned short max_height, baseline, height;
|
||||||
|
@ -57,10 +59,6 @@ typedef struct RenFont {
|
||||||
ERenFontHinting hinting;
|
ERenFontHinting hinting;
|
||||||
unsigned char style;
|
unsigned char style;
|
||||||
unsigned short underline_thickness;
|
unsigned short underline_thickness;
|
||||||
#ifdef _WIN32
|
|
||||||
unsigned char *file;
|
|
||||||
HANDLE file_handle;
|
|
||||||
#endif
|
|
||||||
char path[];
|
char path[];
|
||||||
} RenFont;
|
} RenFont;
|
||||||
|
|
||||||
|
@ -215,54 +213,49 @@ static void font_clear_glyph_cache(RenFont* font) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// based on https://github.com/libsdl-org/SDL_ttf/blob/2a094959055fba09f7deed6e1ffeb986188982ae/SDL_ttf.c#L1735
|
||||||
|
static unsigned long font_file_read(FT_Stream stream, unsigned long offset, unsigned char *buffer, unsigned long count) {
|
||||||
|
uint64_t amount;
|
||||||
|
SDL_RWops *file = (SDL_RWops *) stream->descriptor.pointer;
|
||||||
|
SDL_RWseek(file, (int) offset, RW_SEEK_SET);
|
||||||
|
if (count == 0)
|
||||||
|
return 0;
|
||||||
|
amount = SDL_RWread(file, buffer, sizeof(char), count);
|
||||||
|
if (amount <= 0)
|
||||||
|
return 0;
|
||||||
|
return (unsigned long) amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void font_file_close(FT_Stream stream) {
|
||||||
|
if (stream && stream->descriptor.pointer) {
|
||||||
|
SDL_RWclose((SDL_RWops *) stream->descriptor.pointer);
|
||||||
|
stream->descriptor.pointer = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
RenFont* ren_font_load(RenWindow *window_renderer, const char* path, float size, ERenFontAntialiasing antialiasing, ERenFontHinting hinting, unsigned char style) {
|
RenFont* ren_font_load(RenWindow *window_renderer, const char* path, float size, ERenFontAntialiasing antialiasing, ERenFontHinting hinting, unsigned char style) {
|
||||||
|
RenFont *font = NULL;
|
||||||
FT_Face face = NULL;
|
FT_Face face = NULL;
|
||||||
|
|
||||||
#ifdef _WIN32
|
SDL_RWops *file = SDL_RWFromFile(path, "rb");
|
||||||
|
if (!file)
|
||||||
|
goto rwops_failure;
|
||||||
|
|
||||||
HANDLE file = INVALID_HANDLE_VALUE;
|
int len = strlen(path);
|
||||||
DWORD read;
|
font = check_alloc(calloc(1, sizeof(RenFont) + len + 1));
|
||||||
int font_file_len = 0;
|
font->stream.read = font_file_read;
|
||||||
unsigned char *font_file = NULL;
|
font->stream.close = font_file_close;
|
||||||
wchar_t *wpath = NULL;
|
font->stream.descriptor.pointer = file;
|
||||||
|
font->stream.pos = 0;
|
||||||
|
font->stream.size = (unsigned long) SDL_RWsize(file);
|
||||||
|
|
||||||
if ((wpath = utfconv_utf8towc(path)) == NULL)
|
if (FT_Open_Face(library, &(FT_Open_Args){ .flags = FT_OPEN_STREAM, .stream = &font->stream }, 0, &face))
|
||||||
return NULL;
|
|
||||||
|
|
||||||
if ((file = CreateFileW(wpath,
|
|
||||||
GENERIC_READ,
|
|
||||||
FILE_SHARE_READ, // or else we can't copy fonts
|
|
||||||
NULL,
|
|
||||||
OPEN_EXISTING,
|
|
||||||
FILE_ATTRIBUTE_NORMAL,
|
|
||||||
NULL)) == INVALID_HANDLE_VALUE)
|
|
||||||
goto failure;
|
goto failure;
|
||||||
|
|
||||||
if ((font_file_len = GetFileSize(file, NULL)) == INVALID_FILE_SIZE)
|
|
||||||
goto failure;
|
|
||||||
|
|
||||||
font_file = check_alloc(malloc(font_file_len * sizeof(unsigned char)));
|
|
||||||
if (!ReadFile(file, font_file, font_file_len, &read, NULL) || read != font_file_len)
|
|
||||||
goto failure;
|
|
||||||
|
|
||||||
free(wpath);
|
|
||||||
wpath = NULL;
|
|
||||||
|
|
||||||
if (FT_New_Memory_Face(library, font_file, read, 0, &face))
|
|
||||||
goto failure;
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
if (FT_New_Face(library, path, 0, &face))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const int surface_scale = renwin_get_surface(window_renderer).scale;
|
const int surface_scale = renwin_get_surface(window_renderer).scale;
|
||||||
if (FT_Set_Pixel_Sizes(face, 0, (int)(size*surface_scale)))
|
if (FT_Set_Pixel_Sizes(face, 0, (int)(size*surface_scale)))
|
||||||
goto failure;
|
goto failure;
|
||||||
int len = strlen(path);
|
|
||||||
RenFont* font = check_alloc(calloc(1, sizeof(RenFont) + len + 1));
|
|
||||||
strcpy(font->path, path);
|
strcpy(font->path, path);
|
||||||
font->face = face;
|
font->face = face;
|
||||||
font->size = size;
|
font->size = size;
|
||||||
|
@ -272,32 +265,28 @@ RenFont* ren_font_load(RenWindow *window_renderer, const char* path, float size,
|
||||||
font->hinting = hinting;
|
font->hinting = hinting;
|
||||||
font->style = style;
|
font->style = style;
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
// we need to keep this for freetype
|
|
||||||
font->file = font_file;
|
|
||||||
font->file_handle = file;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if(FT_IS_SCALABLE(face))
|
if(FT_IS_SCALABLE(face))
|
||||||
font->underline_thickness = (unsigned short)((face->underline_thickness / (float)face->units_per_EM) * font->size);
|
font->underline_thickness = (unsigned short)((face->underline_thickness / (float)face->units_per_EM) * font->size);
|
||||||
if(!font->underline_thickness) font->underline_thickness = ceil((double) font->height / 14.0);
|
if(!font->underline_thickness)
|
||||||
|
font->underline_thickness = ceil((double) font->height / 14.0);
|
||||||
|
|
||||||
if (FT_Load_Char(face, ' ', font_set_load_options(font))) {
|
if (FT_Load_Char(face, ' ', font_set_load_options(font)))
|
||||||
free(font);
|
|
||||||
goto failure;
|
goto failure;
|
||||||
}
|
|
||||||
font->space_advance = face->glyph->advance.x / 64.0f;
|
font->space_advance = face->glyph->advance.x / 64.0f;
|
||||||
font->tab_advance = font->space_advance * 2;
|
font->tab_advance = font->space_advance * 2;
|
||||||
return font;
|
return font;
|
||||||
|
|
||||||
failure:
|
failure:
|
||||||
#ifdef _WIN32
|
if (face)
|
||||||
free(wpath);
|
|
||||||
free(font_file);
|
|
||||||
if (file != INVALID_HANDLE_VALUE) CloseHandle(file);
|
|
||||||
#endif
|
|
||||||
if (face != NULL)
|
|
||||||
FT_Done_Face(face);
|
FT_Done_Face(face);
|
||||||
|
if (font)
|
||||||
|
free(font);
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
rwops_failure:
|
||||||
|
if (file)
|
||||||
|
SDL_RWclose(file);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -316,10 +305,6 @@ const char* ren_font_get_path(RenFont *font) {
|
||||||
void ren_font_free(RenFont* font) {
|
void ren_font_free(RenFont* font) {
|
||||||
font_clear_glyph_cache(font);
|
font_clear_glyph_cache(font);
|
||||||
FT_Done_Face(font->face);
|
FT_Done_Face(font->face);
|
||||||
#ifdef _WIN32
|
|
||||||
free(font->file);
|
|
||||||
CloseHandle(font->file_handle);
|
|
||||||
#endif
|
|
||||||
free(font);
|
free(font);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue