* src/base/ftstroke.c (FT_Glyph_StrokeBorder): Fix enum handling.

21 years ago · 146718161f
parent 55b639b888
commit 146718161f
3 changed files with 14 additions and 3 deletions
--- a/5
+++ b/5
@ -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.
--- 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 )
--- 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 )