From c52763d369fde06dd5d55b3c7450c28fa80cac82 Mon Sep 17 00:00:00 2001 From: Labrium <76017200+Labrium@users.noreply.github.com> Date: Sat, 22 Jun 2024 17:10:52 -0600 Subject: [PATCH] Remove stash artefacts --- src/modules/font/TrueTypeRasterizer.cpp | 1 - src/modules/font/TrueTypeRasterizer.h | 1 - src/modules/font/freetype/TrueTypeRasterizer.cpp | 9 +-------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/modules/font/TrueTypeRasterizer.cpp b/src/modules/font/TrueTypeRasterizer.cpp index 6404fd4fd..e91523281 100644 --- a/src/modules/font/TrueTypeRasterizer.cpp +++ b/src/modules/font/TrueTypeRasterizer.cpp @@ -46,7 +46,6 @@ StringMap::En {"light", HINTING_LIGHT}, {"mono", HINTING_MONO}, {"none", HINTING_NONE}, - {"sdf", HINTING_SDF}, }; StringMap TrueTypeRasterizer::hintings(TrueTypeRasterizer::hintingEntries, sizeof(TrueTypeRasterizer::hintingEntries)); diff --git a/src/modules/font/TrueTypeRasterizer.h b/src/modules/font/TrueTypeRasterizer.h index c627b6e30..84da5112d 100644 --- a/src/modules/font/TrueTypeRasterizer.h +++ b/src/modules/font/TrueTypeRasterizer.h @@ -42,7 +42,6 @@ public: HINTING_LIGHT, HINTING_MONO, HINTING_NONE, - HINTING_SDF, HINTING_MAX_ENUM }; diff --git a/src/modules/font/freetype/TrueTypeRasterizer.cpp b/src/modules/font/freetype/TrueTypeRasterizer.cpp index e96863ac5..071393d1c 100644 --- a/src/modules/font/freetype/TrueTypeRasterizer.cpp +++ b/src/modules/font/freetype/TrueTypeRasterizer.cpp @@ -123,14 +123,11 @@ GlyphData *TrueTypeRasterizer::getGlyphDataForIndex(int index) const FT_Render_Mode rendermode = FT_RENDER_MODE_NORMAL; if (hinting == HINTING_MONO) rendermode = FT_RENDER_MODE_MONO; -<<<<<<< Updated upstream - else if (hinting == HINTING_SDF) -======= else if (sdf == true) ->>>>>>> Stashed changes rendermode = FT_RENDER_MODE_SDF; err = FT_Glyph_To_Bitmap(&ftglyph, rendermode, 0, 1); + if (err != FT_Err_Ok) { if (rendermode == FT_RENDER_MODE_SDF) @@ -144,10 +141,7 @@ GlyphData *TrueTypeRasterizer::getGlyphDataForIndex(int index) const throw love::Exception("TrueType Font glyph error: FT_Glyph_To_Bitmap failed (0x%x)", err); } } -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes FT_BitmapGlyph bitmap_glyph = (FT_BitmapGlyph) ftglyph; const FT_Bitmap &bitmap = bitmap_glyph->bitmap; //just to make things easier @@ -257,7 +251,6 @@ FT_UInt TrueTypeRasterizer::hintingToLoadOption(Hinting hint) return FT_LOAD_TARGET_LIGHT; case HINTING_MONO: return FT_LOAD_TARGET_MONO; - case HINTING_SDF: case HINTING_NONE: return FT_LOAD_NO_HINTING; }