Commit 85fd84b828d6ed51fc8b5ddb359b38fffaa67877
2013-06-07T17:10:21
[cff] s/cf2_getGlyphWidth/cf2_getGlyphOutline/. * src/cff/cf2font.c, src/cff/cf2font.h, src/cff/cf2ft.c: Do it.
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
diff --git a/ChangeLog b/ChangeLog
index afb0060..8fddfb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-07 Werner Lemberg <wl@gnu.org>
+
+ [cff] s/cf2_getGlyphWidth/cf2_getGlyphOutline/.
+
+ * src/cff/cf2font.c, src/cff/cf2font.h, src/cff/cf2ft.c: Do it.
+
2013-06-06 Dave Arnold <darnold@adobe.com>
[cff] Add early exit feature for width-only calls.
diff --git a/src/cff/cf2font.c b/src/cff/cf2font.c
index 39402c3..8b2331d 100644
--- a/src/cff/cf2font.c
+++ b/src/cff/cf2font.c
@@ -318,10 +318,10 @@
/* equivalent to AdobeGetOutline */
FT_LOCAL_DEF( FT_Error )
- cf2_getGlyphWidth( CF2_Font font,
- CF2_Buffer charstring,
- const CF2_Matrix* transform,
- CF2_F16Dot16* glyphWidth )
+ cf2_getGlyphOutline( CF2_Font font,
+ CF2_Buffer charstring,
+ const CF2_Matrix* transform,
+ CF2_F16Dot16* glyphWidth )
{
FT_Error lastError = FT_Err_Ok;
diff --git a/src/cff/cf2font.h b/src/cff/cf2font.h
index 4e1c337..f9dd1bb 100644
--- a/src/cff/cf2font.h
+++ b/src/cff/cf2font.h
@@ -99,10 +99,10 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_Error )
- cf2_getGlyphWidth( CF2_Font font,
- CF2_Buffer charstring,
- const CF2_Matrix* transform,
- CF2_F16Dot16* glyphWidth );
+ cf2_getGlyphOutline( CF2_Font font,
+ CF2_Buffer charstring,
+ const CF2_Matrix* transform,
+ CF2_F16Dot16* glyphWidth );
FT_END_HEADER
diff --git a/src/cff/cf2ft.c b/src/cff/cf2ft.c
index 965e545..c09a024 100644
--- a/src/cff/cf2ft.c
+++ b/src/cff/cf2ft.c
@@ -352,7 +352,7 @@
if ( error2 )
return error2;
- error2 = cf2_getGlyphWidth( font, &buf, &transform, &glyphWidth );
+ error2 = cf2_getGlyphOutline( font, &buf, &transform, &glyphWidth );
if ( error2 )
return FT_ERR( Invalid_File_Format );