shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[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.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,14 @@

+2012-01-16  suzuki toshiya  <[email protected]>

+

+	[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  <[email protected]>

 	Fix redundant declaration warning in PIC mode.

--- 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"

@@ -36,10 +37,6 @@

   /* forward declaration of PIC init functions from cffparse.c */

   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 )