Commit 8f1edf742e738b888f4df1a935e4f2c5f66840a0
2004-02-20T01:39:05
* src/base/ftstroke.c (FT_Glyph_StrokeBorder): Fix enum handling. * src/cff/cffdrivr.c (cff_get_cmap_info): Remove compiler warning.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
diff --git a/ChangeLog b/ChangeLog
index b88d486..3b43acd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-19 Werner Lemberg <wl@gnu.org>
+
+ * 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 <wl@gnu.org>
* include/freetype/freetype.h: Document FT_LOAD_TARGET_XXX properly.
diff --git a/src/base/ftstroke.c b/src/base/ftstroke.c
index 942820a..10aad2d 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 077d28e..75c072b 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 )