Commit 4880a0ed82c59f8be278bed74d6f8b3b9a454795
2012-01-16T18:51:15
[cff] Remove redundant declarations of cff_cmap_XXX_class_rec. * src/cff/cffpic.c: The declarations of FT_Init_Class_cff_cmap_encoding_class_rec() and FT_Init_Class_cff_cmap_unicode_class_rec() are removed. They can be obtained by the inclusion of cffcmap.h. cffcmap.h invokes FT_DECLARE_CMAP_CLASS() and it declares FT_Init_Class_cff_cmap_encoding_class_rec() etc in PIC mode.
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
diff --git a/ChangeLog b/ChangeLog
index 7e43422..9ac911b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-16 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+ [cff] Remove redundant declarations of cff_cmap_XXX_class_rec.
+
+ * src/cff/cffpic.c: The declarations of
+ FT_Init_Class_cff_cmap_encoding_class_rec() and
+ FT_Init_Class_cff_cmap_unicode_class_rec() are removed.
+ They can be obtained by the inclusion of cffcmap.h.
+ cffcmap.h invokes FT_DECLARE_CMAP_CLASS() and it declares
+ FT_Init_Class_cff_cmap_encoding_class_rec() etc in PIC mode.
+
2012-01-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Fix redundant declaration warning in PIC mode.
diff --git a/src/cff/cffpic.c b/src/cff/cffpic.c
index 84f9a1e..d29cf90 100644
--- a/src/cff/cffpic.c
+++ b/src/cff/cffpic.c
@@ -19,6 +19,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_OBJECTS_H
+#include "cffcmap.h"
#include "cffpic.h"
#include "cfferrs.h"
@@ -37,10 +38,6 @@
FT_Error FT_Create_Class_cff_field_handlers( FT_Library, CFF_Field_Handler**);
void FT_Destroy_Class_cff_field_handlers( FT_Library, CFF_Field_Handler*);
- /* forward declaration of PIC init functions from cffcmap.c */
- void FT_Init_Class_cff_cmap_encoding_class_rec( FT_Library, FT_CMap_ClassRec*);
- void FT_Init_Class_cff_cmap_unicode_class_rec( FT_Library, FT_CMap_ClassRec*);
-
void
cff_driver_class_pic_free( FT_Library library )
{