Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
49eac0da
by Alexei Podtelezhnikov at 2023-03-03T22:10:50-05:00
-
7ae20e55
by Alexei Podtelezhnikov at 2023-03-03T22:41:09-05:00
3 changed files:
Changes:
... | ... | @@ -560,8 +560,7 @@ |
560 | 560 | FT_Byte* limit )
|
561 | 561 | {
|
562 | 562 | FT_Error error = FT_Err_Ok;
|
563 | - FT_GlyphLoader loader = glyph->loader;
|
|
564 | - FT_Memory memory = loader->memory;
|
|
563 | + FT_Memory memory = glyph->loader->memory;
|
|
565 | 564 | PFR_SubGlyph subglyph;
|
566 | 565 | FT_UInt flags, i, count, org_count;
|
567 | 566 | FT_Int x_pos, y_pos;
|
... | ... | @@ -50,14 +50,14 @@ |
50 | 50 | if ( !face )
|
51 | 51 | return;
|
52 | 52 | |
53 | - memory = pfrface->driver->root.memory;
|
|
53 | + memory = pfrface->memory;
|
|
54 | 54 | |
55 | 55 | /* we don't want dangling pointers */
|
56 | 56 | pfrface->family_name = NULL;
|
57 | 57 | pfrface->style_name = NULL;
|
58 | 58 | |
59 | 59 | /* finalize the physical font record */
|
60 | - pfr_phy_font_done( &face->phy_font, FT_FACE_MEMORY( face ) );
|
|
60 | + pfr_phy_font_done( &face->phy_font, memory );
|
|
61 | 61 | |
62 | 62 | /* no need to finalize the logical font or the header */
|
63 | 63 | FT_FREE( pfrface->available_sizes );
|
... | ... | @@ -214,7 +214,7 @@ |
214 | 214 | FT_UInt n, count = phy_font->num_strikes;
|
215 | 215 | FT_Bitmap_Size* size;
|
216 | 216 | PFR_Strike strike;
|
217 | - FT_Memory memory = pfrface->stream->memory;
|
|
217 | + FT_Memory memory = pfrface->memory;
|
|
218 | 218 | |
219 | 219 | |
220 | 220 | if ( FT_QNEW_ARRAY( pfrface->available_sizes, count ) )
|
... | ... | @@ -1221,7 +1221,7 @@ |
1221 | 1221 | |
1222 | 1222 | if ( count > 0 )
|
1223 | 1223 | {
|
1224 | - FT_Memory memory = face->root.stream->memory;
|
|
1224 | + FT_Memory memory = face->root.memory;
|
|
1225 | 1225 | FT_UShort em_size = face->header.Units_Per_EM;
|
1226 | 1226 | FT_Short avgwidth = face->os2.xAvgCharWidth;
|
1227 | 1227 | FT_Size_Metrics metrics;
|