lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-23 10:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update source to v6.14.19098.19271

Browse Source
This commit is contained in:
Will Pearson
2019-04-09 10:17:14 -07:00
parent 98797aac6e
commit f2dc7fba67
97 changed files with 10406 additions and 7766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
opennurbs_freetype.cpp
View File

@@ -2032,11 +2032,23 @@ unsigned int ON_FreeTypeGetGlyphMetrics(
return glyph_index;
}
bool ON_FreeTypeGetGlyphOutline(
const ON_FontGlyph* glyph,
ON_OutlineFigure::Type figure_type,
class ON_Outline& outline
)
{
const unsigned int glyph_index = 0;
return ON_FreeTypeGetGlyphOutline(glyph, glyph_index, figure_type, outline);
}
bool ON_FreeTypeGetGlyphOutline(
const ON_FontGlyph* glyph,
unsigned int glyph_index,
ON_OutlineFigure::Type figure_type,
class ON_Outline& outline
)
{
outline = ON_Outline::Unset;
@@ -2061,9 +2073,12 @@ bool ON_FreeTypeGetGlyphOutline(
}
}
const unsigned int glyph_index = glyph->FontGlyphIndex();
if (glyph_index <= 0)
return false;
if (0 == glyph_index)
{
glyph_index = glyph->FontGlyphIndex();
if (glyph_index <= 0)
return false;
}
FT_Face ft_face = (FT_Face)(ON_Font::FreeTypeFace(font));
if (nullptr == ft_face)