From 8f1edf742e738b888f4df1a935e4f2c5f66840a0 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 20 Feb 2004 01:39:05 +0000 Subject: [PATCH] * src/base/ftstroke.c (FT_Glyph_StrokeBorder): Fix enum handling. * src/cff/cffdrivr.c (cff_get_cmap_info): Remove compiler warning. --- ChangeLog | 5 +++++ src/base/ftstroke.c | 7 ++++++- src/cff/cffdrivr.c | 5 +++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b88d4865b..3b43acd3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-19 Werner Lemberg + + * src/base/ftstroke.c (FT_Glyph_StrokeBorder): Fix enum handling. + * src/cff/cffdrivr.c (cff_get_cmap_info): Remove compiler warning. + 2004-02-18 Werner Lemberg * include/freetype/freetype.h: Document FT_LOAD_TARGET_XXX properly. diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c index 942820ad9..10aad2db8 100644 --- a/src/base/ftstroke.c +++ b/src/base/ftstroke.c @@ -1856,7 +1856,12 @@ border = FT_Outline_GetOutsideBorder( outline ); if ( inside ) - border = 1 - border; + { + if ( border == FT_STROKER_BORDER_LEFT ) + border = FT_STROKER_BORDER_RIGHT; + else + border = FT_STROKER_BORDER_LEFT; + } error = FT_Stroker_ParseOutline( stroker, outline, 0 ); if ( error ) diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 077d28ec7..75c072bcc 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -366,8 +366,9 @@ FT_Face face = FT_CMAP_FACE( cmap ); FT_Library library = FT_FACE_LIBRARY( face ); FT_Module sfnt = FT_Get_Module( library, "sfnt" ); - FT_Service_TTCMaps service = ft_module_get_service ( - sfnt, FT_SERVICE_ID_TT_CMAP ); + FT_Service_TTCMaps service = + (FT_Service_TTCMaps)ft_module_get_service( sfnt, + FT_SERVICE_ID_TT_CMAP ); if ( service && service->get_cmap_info )