From 08033e601ee4d7f7dce0225615de544727291251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mal=C3=BD?= Date: Wed, 28 Feb 2018 09:48:16 +0100 Subject: [PATCH] loadGlyphGlyph -> loadGlyphSlot --- ext/import-font.cpp | 4 ++-- ext/import-font.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/import-font.cpp b/ext/import-font.cpp index 723e997..17d3e3f 100644 --- a/ext/import-font.cpp +++ b/ext/import-font.cpp @@ -130,10 +130,10 @@ bool loadGlyph(Shape &output, FontHandle *font, int unicode, double *advance) { if (error) return false; - return loadGlyphGlyph(output, font->face->glyph, advance); + return loadGlyphSlot(output, font->face->glyph, advance); } -bool loadGlyphGlyph(Shape &output, FT_GlyphSlot glyph, double *advance) { +bool loadGlyphSlot(Shape &output, FT_GlyphSlot glyph, double *advance) { if (!glyph) return false; output.contours.clear(); diff --git a/ext/import-font.h b/ext/import-font.h index 5ee5389..969ecc0 100644 --- a/ext/import-font.h +++ b/ext/import-font.h @@ -25,8 +25,8 @@ bool getFontScale(double &output, FontHandle *font); bool getFontWhitespaceWidth(double &spaceAdvance, double &tabAdvance, FontHandle *font); /// Loads the shape prototype of a glyph from font file bool loadGlyph(Shape &output, FontHandle *font, int unicode, double *advance = NULL); -/// Loads the spahe prototype of a glyph directly from FT glyph slot -bool loadGlyphGlyph(Shape &output, FT_GlyphSlot glyph, double *advance = NULL); +/// Loads the shape prototype of a glyph directly from FT glyph slot +bool loadGlyphSlot(Shape &output, FT_GlyphSlot glyph, double *advance = NULL); /// Returns the kerning distance adjustment between two specific glyphs. bool getKerning(double &output, FontHandle *font, int unicode1, int unicode2);