Browse Source

Fix previous commit, upstream is slightly borked

Signed-off-by: falkTX <falktx@falktx.com>
pull/357/head
falkTX 3 years ago
parent
commit
7f206b99dc
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 4 additions and 6 deletions
  1. +4
    -6
      dgl/src/nanovg/fontstash.h

+ 4
- 6
dgl/src/nanovg/fontstash.h View File

@@ -160,7 +160,10 @@ typedef struct FONSttFontImpl FONSttFontImpl;
#else

#define STB_TRUETYPE_IMPLEMENTATION

static void* fons__tmpalloc(size_t size, void* up);
static void fons__tmpfree(void* ptr, void* up);
#define STBTT_malloc(x,u) fons__tmpalloc(x,u)
#define STBTT_free(x,u) fons__tmpfree(x,u)
#include "stb_truetype.h"

struct FONSttFontImpl {
@@ -405,11 +408,6 @@ int fons__tt_getGlyphKernAdvance(FONSttFontImpl *font, int glyph1, int glyph2)

#else

static void* fons__tmpalloc(size_t size, void* up);
static void fons__tmpfree(void* ptr, void* up);
#define STBTT_malloc(x,u) fons__tmpalloc(x,u)
#define STBTT_free(x,u) fons__tmpfree(x,u)

int fons__tt_init(FONScontext *context)
{
FONS_NOTUSED(context);


Loading…
Cancel
Save