LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove stash artefacts

Browse Source
This commit is contained in:
Labrium
2024-06-22 17:10:52 -06:00
parent b98aced38d
commit c52763d369
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/font/TrueTypeRasterizer.cpp
-1
View File
@@ -46,7 +46,6 @@ StringMap<TrueTypeRasterizer::Hinting, TrueTypeRasterizer::HINTING_MAX_ENUM>::En
{"light", HINTING_LIGHT}, {"light", HINTING_LIGHT},
{"mono", HINTING_MONO}, {"mono", HINTING_MONO},
{"none", HINTING_NONE}, {"none", HINTING_NONE},
{"sdf", HINTING_SDF},
}; };
StringMap<TrueTypeRasterizer::Hinting, TrueTypeRasterizer::HINTING_MAX_ENUM> TrueTypeRasterizer::hintings(TrueTypeRasterizer::hintingEntries, sizeof(TrueTypeRasterizer::hintingEntries)); StringMap<TrueTypeRasterizer::Hinting, TrueTypeRasterizer::HINTING_MAX_ENUM> TrueTypeRasterizer::hintings(TrueTypeRasterizer::hintingEntries, sizeof(TrueTypeRasterizer::hintingEntries));
src/modules/font/TrueTypeRasterizer.h
-1
View File
@@ -42,7 +42,6 @@ public:
HINTING_LIGHT, HINTING_LIGHT,
HINTING_MONO, HINTING_MONO,
HINTING_NONE, HINTING_NONE,
HINTING_SDF,
HINTING_MAX_ENUM HINTING_MAX_ENUM
}; };
src/modules/font/freetype/TrueTypeRasterizer.cpp
+1 -8
View File
@@ -123,14 +123,11 @@ GlyphData *TrueTypeRasterizer::getGlyphDataForIndex(int index) const
FT_Render_Mode rendermode = FT_RENDER_MODE_NORMAL; FT_Render_Mode rendermode = FT_RENDER_MODE_NORMAL;
if (hinting == HINTING_MONO) if (hinting == HINTING_MONO)
rendermode = FT_RENDER_MODE_MONO; rendermode = FT_RENDER_MODE_MONO;
<<<<<<< Updated upstream
else if (hinting == HINTING_SDF)
=======
else if (sdf == true) else if (sdf == true)
>>>>>>> Stashed changes
rendermode = FT_RENDER_MODE_SDF; rendermode = FT_RENDER_MODE_SDF;
err = FT_Glyph_To_Bitmap(&ftglyph, rendermode, 0, 1); err = FT_Glyph_To_Bitmap(&ftglyph, rendermode, 0, 1);
if (err != FT_Err_Ok) if (err != FT_Err_Ok)
{ {
if (rendermode == FT_RENDER_MODE_SDF) 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); 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; FT_BitmapGlyph bitmap_glyph = (FT_BitmapGlyph) ftglyph;
const FT_Bitmap &bitmap = bitmap_glyph->bitmap; //just to make things easier 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; return FT_LOAD_TARGET_LIGHT;
case HINTING_MONO: case HINTING_MONO:
return FT_LOAD_TARGET_MONO; return FT_LOAD_TARGET_MONO;
case HINTING_SDF:
case HINTING_NONE: case HINTING_NONE:
return FT_LOAD_NO_HINTING; return FT_LOAD_NO_HINTING;
} }