Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
444e39e9
by Werner Lemberg at 2022-02-01T16:04:37+01:00
1 changed file:
Changes:
... | ... | @@ -82,7 +82,7 @@ |
82 | 82 |
#define BUFSIZE 256
|
83 | 83 |
|
84 | 84 |
#define DO_BITMAP 1
|
85 |
-#define DO_GRAY_BITMAP 2
|
|
85 |
+#define DO_GRAY_BITMAP 2 /* needs DO_BITMAP */
|
|
86 | 86 |
#define DO_OUTLINE 4
|
87 | 87 |
#define DO_DOTS 8
|
88 | 88 |
#define DO_DOTNUMBERS 16
|
... | ... | @@ -515,6 +515,7 @@ |
515 | 515 |
FT_Size size;
|
516 | 516 |
FT_GlyphSlot slot;
|
517 | 517 |
FT_UInt glyph_idx;
|
518 |
+ FT_Int32 load_flags;
|
|
518 | 519 |
int scale = (int)st->scale;
|
519 | 520 |
int ox = st->x_origin;
|
520 | 521 |
int oy = st->y_origin;
|
... | ... | @@ -532,8 +533,11 @@ |
532 | 533 |
_af_debug_disable_blue_hints = !st->do_blue_hints;
|
533 | 534 |
#endif
|
534 | 535 |
|
535 |
- if ( FT_Load_Glyph( size->face, glyph_idx,
|
|
536 |
- handle->load_flags | FT_LOAD_NO_BITMAP ) )
|
|
536 |
+ load_flags = handle->load_flags;
|
|
537 |
+ if ( !( st->work & DO_BITMAP ) )
|
|
538 |
+ load_flags |= FT_LOAD_NO_BITMAP;
|
|
539 |
+ |
|
540 |
+ if ( FT_Load_Glyph( size->face, glyph_idx, load_flags ) )
|
|
537 | 541 |
return;
|
538 | 542 |
|
539 | 543 |
slot = size->face->glyph;
|