Commit 0bf381f7ab9d980da0e53d9211c63dc21ae6cb82
2000-10-15T21:59:58
Make ftsynth.c work again. Renamed FT_*_Outline to FT_Outline_*
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 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h
index 9e7f95d..af7a62e 100644
--- a/include/freetype/ftsynth.h
+++ b/include/freetype/ftsynth.h
@@ -48,13 +48,13 @@
/* This code is completely experimental -- use with care! */
/* It will probably be completely rewritten in the future */
/* or even integrated into the library. */
- FT_EXPORT_DEF( FT_Error ) FT_Embolden_Outline( FT_Face original,
- FT_Outline* outline,
- FT_Pos* advance );
+ FT_EXPORT_DEF( FT_Error ) FT_Outline_Embolden( FT_GlyphSlot original,
+ FT_Outline* outline,
+ FT_Pos* advance );
- FT_EXPORT_DEF( FT_Error ) FT_Oblique_Outline( FT_Face original,
- FT_Outline* outline,
- FT_Pos* advance );
+ FT_EXPORT_DEF( FT_Error ) FT_Outline_Oblique( FT_GlyphSlot original,
+ FT_Outline* outline,
+ FT_Pos* advance );
#ifdef __cplusplus
diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
index 1162671..6f7f860 100644
--- a/src/base/ftsynth.c
+++ b/src/base/ftsynth.c
@@ -16,6 +16,8 @@
/***************************************************************************/
+#include <freetype/internal/ftobjs.h>
+#include <freetype/ftoutln.h>
#include <freetype/ftsynth.h>
@@ -30,7 +32,7 @@
/*************************************************************************/
/*************************************************************************/
- FT_EXPORT_DEF( FT_Error ) FT_Oblique_Outline( FT_GlyphSlot original,
+ FT_EXPORT_DEF( FT_Error ) FT_Outline_Oblique( FT_GlyphSlot original,
FT_Outline* outline,
FT_Pos* advance )
{
@@ -38,20 +40,20 @@
FT_UNUSED( original );
/* we don't touch the advance width */
- FT_UNUSED(advance);
+ FT_UNUSED( advance );
/* For italic, simply apply a shear transform, with an angle */
/* of about 12 degrees. */
- transform.xx = 0x10000;
- transform.yx = 0x00000;
+ transform.xx = 0x10000L;
+ transform.yx = 0x00000L;
- transform.xy = 0x06000;
- transform.yy = 0x10000;
+ transform.xy = 0x06000L;
+ transform.yy = 0x10000L;
- FT_Transform_Outline( outline, &transform );
+ FT_Outline_Transform( outline, &transform );
return 0;
}
@@ -288,7 +290,7 @@
}
- FT_EXPORT_FUNC(FT_Error) FT_Embolden_Outline( FT_GlyphSlot original,
+ FT_EXPORT_FUNC(FT_Error) FT_Outline_Embolden( FT_GlyphSlot original,
FT_Outline* outline,
FT_Pos* advance )
{