diff options
| author | Moazin Khatti <moazinkhatri@gmail.com> | 2019-08-09 12:33:17 +0500 |
|---|---|---|
| committer | Moazin Khatti <moazinkhatri@gmail.com> | 2019-08-26 01:17:14 +0500 |
| commit | fdb7d53ebf32fda7dae9dc32daabfeed0ed95df4 (patch) | |
| tree | 83a9f8f24450a07ac1c52473f5b3c630a3984d24 | |
| parent | 74f80fba492792ab98cd902f11d0139e40ce26ac (diff) | |
| download | freetype2-fdb7d53ebf32fda7dae9dc32daabfeed0ed95df4.tar.gz | |
Fixes code warnings.
| -rw-r--r-- | src/base/ftobjs.c | 5 | ||||
| -rw-r--r-- | src/cff/cffgload.c | 10 | ||||
| -rw-r--r-- | src/svg/ftsvg.c | 11 | ||||
| -rw-r--r-- | src/truetype/ttgload.c | 13 |
4 files changed, 23 insertions, 16 deletions
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 5e5da50c7..880594362 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -379,9 +379,10 @@ { if ( slot->format == FT_GLYPH_FORMAT_SVG ) { - module = FT_Get_Module(slot->library, "ot-svg" ); - SVG_Service svg_service = module->clazz->module_interface; + SVG_Service svg_service; + module = FT_Get_Module(slot->library, "ot-svg" ); + svg_service = (SVG_Service)module->clazz->module_interface; return svg_service->preset_slot( module, slot, FALSE ); } else diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 9911e8abe..1c1fb9353 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -352,15 +352,19 @@ if ( ( load_flags & FT_LOAD_COLOR ) && ( ((TT_Face)glyph->root.face)->svg ) ) { + SFNT_Service sfnt; + FT_Short leftBearing; + FT_Short topBearing; + FT_UShort advanceX; + FT_UShort advanceY; + FT_TRACE3(( "Attemping to load SVG glyph\n" )); - SFNT_Service sfnt = (SFNT_Service)((TT_Face)glyph->root.face)->sfnt; + sfnt = (SFNT_Service)((TT_Face)glyph->root.face)->sfnt; error = sfnt->load_svg_doc( (FT_GlyphSlot)glyph, glyph_index ); if( error == FT_Err_Ok ) { FT_TRACE3(( "Successfully loaded SVG glyph\n" )); glyph->root.format = FT_GLYPH_FORMAT_SVG; - FT_Short leftBearing, topBearing; - FT_UShort advanceX, advanceY; sfnt->get_metrics( face, FALSE, glyph_index, diff --git a/src/svg/ftsvg.c b/src/svg/ftsvg.c index ce778624b..8c6dc3b85 100644 --- a/src/svg/ftsvg.c +++ b/src/svg/ftsvg.c @@ -107,7 +107,7 @@ svg_renderer->loaded = TRUE; } - ft_svg_preset_slot( renderer, slot, TRUE); + ft_svg_preset_slot( (FT_Module)renderer, slot, TRUE); size_image_buffer = slot->bitmap.pitch * slot->bitmap.rows; FT_MEM_ALLOC( slot->bitmap.buffer, size_image_buffer); if ( error ) @@ -191,10 +191,13 @@ #ifdef FT_CONFIG_OPTION_SVG #define PUT_SVG_MODULE( a ) a +#define SVG_GLYPH_FORMAT FT_GLYPH_FORMAT_SVG #else #define PUT_SVG_MODULE( a ) NULL +#define SVG_GLYPH_FORMAT FT_GLYPH_FORMAT_NONE #endif + FT_DEFINE_RENDERER( ft_svg_renderer_class, @@ -208,11 +211,7 @@ (FT_Module_Constructor)PUT_SVG_MODULE( ft_svg_init ), /* module_init */ (FT_Module_Destructor)PUT_SVG_MODULE( ft_svg_done ), /* module_done */ PUT_SVG_MODULE( ft_svg_get_interface ), /* get_interface */ -#ifdef FT_CONFIG_OPTION_SVG - FT_GLYPH_FORMAT_SVG, -#else - FT_GLYPH_FORMAT_NONE, -#endif + SVG_GLYPH_FORMAT, (FT_Renderer_RenderFunc)PUT_SVG_MODULE( ft_svg_render ), NULL, NULL, diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index f92cbd15a..a6ec379ed 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -2911,22 +2911,25 @@ /* check for OT-SVG */ if ( ( load_flags & FT_LOAD_COLOR ) && ( ((TT_Face)glyph->face)->svg ) ) { - FT_TRACE3(( "Attemping to load SVG glyph\n" )); SFNT_Service sfnt; + FT_Short leftBearing; + FT_Short topBearing; + FT_UShort advanceX; + FT_UShort advanceY; + + FT_TRACE3(( "Attemping to load SVG glyph\n" )); sfnt = (SFNT_Service)((TT_Face)glyph->face)->sfnt; error = sfnt->load_svg_doc( glyph, glyph_index ); if( error == FT_Err_Ok ) { FT_TRACE3(( "Successfully loaded SVG glyph\n" )); glyph->format = FT_GLYPH_FORMAT_SVG; - FT_Short leftBearing, topBearing; - FT_UShort advanceX, advanceY; - sfnt->get_metrics( glyph->face, + sfnt->get_metrics( (TT_Face)glyph->face, FALSE, glyph_index, &leftBearing, &advanceX ); - sfnt->get_metrics( glyph->face, + sfnt->get_metrics( (TT_Face)glyph->face, TRUE, glyph_index, &topBearing, |