rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[autofit] Fix `make multi'. 

* include/freetype/config/ftconfig.h (FT_LOCAL_ARRAY,
FT_LOCAL_ARRAY_DEF): New macros.

* src/autofit/afglobal.c (af_writing_system_classes,
af_script_classes): Use FT_LOCAL_ARRAY_DEF.
* src/autofit/afglobal.h: Declare `af_writing_system_classes' and
`af_script_classes'.
* src/autofit/afloader.c: Include `afpic.h'.
This commit is contained in:
Werner Lemberg 2013-08-02 14:50:23 +02:00
parent e8ed2d621e
commit 89a529f317
5 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2013-08-02 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Werner Lemberg <wl@gnu.org>
[autofit] Fix `make multi'.
* include/freetype/config/ftconfig.h (FT_LOCAL_ARRAY,
FT_LOCAL_ARRAY_DEF): New macros.
* src/autofit/afglobal.c (af_writing_system_classes,
af_script_classes): Use FT_LOCAL_ARRAY_DEF.
* src/autofit/afglobal.h: Declare `af_writing_system_classes' and
`af_script_classes'.
* src/autofit/afloader.c: Include `afpic.h'.
2013-08-01 Werner Lemberg <wl@gnu.org>
Another round of cppcheck nitpicks.

3
include/freetype/config/ftconfig.h
View File

@ -555,6 +555,9 @@ FT_BEGIN_HEADER
#endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
#define FT_LOCAL_ARRAY( x ) extern const x
#define FT_LOCAL_ARRAY_DEF( x ) const x
#ifndef FT_BASE

6
src/autofit/afglobal.c
View File

@ -35,7 +35,8 @@
/* AF_WRITING_SYSTEM_CLASSES_COUNT and autofit_module_class_pic_init */
/* populate this list when you add new writing systems */
static AF_WritingSystemClass const af_writing_system_classes[] =
FT_LOCAL_ARRAY_DEF( AF_WritingSystemClass )
af_writing_system_classes[] =
{
&af_dummy_writing_system_class,
&af_latin_writing_system_class,
@ -52,7 +53,8 @@
/* AF_SCRIPT_CLASSES_COUNT and autofit_module_class_pic_init */
/* populate this list when you add new scripts */
static AF_ScriptClass const af_script_classes[] =
FT_LOCAL_ARRAY_DEF( AF_ScriptClass )
af_script_classes[] =
{
&af_dflt_script_class, /* XXX */
&af_latn_script_class,

7
src/autofit/afglobal.h
View File

@ -28,6 +28,13 @@
FT_BEGIN_HEADER
FT_LOCAL_ARRAY( AF_WritingSystemClass )
af_writing_system_classes[];
FT_LOCAL_ARRAY( AF_ScriptClass )
af_script_classes[];
/*
* Default values and flags for both autofitter globals (found in
* AF_ModuleRec) and face globals (in AF_FaceGlobalsRec).

1
src/autofit/afloader.c
View File

@ -21,6 +21,7 @@
#include "afhints.h"
#include "aferrors.h"
#include "afmodule.h"
#include "afpic.h"
/* Initialize glyph loader. */