Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix `make multi'.

Browse Source 
* include/freetype/internal/fttrace.h: Remove unused tracing macros.
s/pshalgo2/pshalgo/.
Add `trace_cffdecode'.
* src/pshinter/pshalgo.c (FT_COMPONENT): Updated.

* src/cff/cffload.c: Include FT_INTERNAL_POSTSCRIPT_AUX_H.
* src/cff/cffobjs.c: Include FT_SERVICE_METRICS_VARIATIONS_H and
FT_SERVICE_CFF_TABLE_LOAD_H.

* src/cid/cidriver.c: Include FT_INTERNAL_POSTSCRIPT_AUX_H.

* src/psaux/cffdecode.c: Include FT_FREETYPE_H and
FT_INTERNAL_DEBUG_H.
(FT_COMPONENT): Define.
* src/psaux/cffdecode.h: Include FT_INTERNAL_POSTSCRIPT_AUX_H.
* src/psaux/psauxmod.h: Include FT_INTERNAL_POSTSCRIPT_AUX_H.
Declare `cff_builder_funcs' and `ps_builder_funcs'.
* src/psaux/psft.c: Include `psobjs.h' and `cffdecode.h'.
* src/psaux/psobjs.c : Include `psauxmod.h'.
GSoC-2017-kushal
Werner Lemberg 7 years ago
parent 7ec1345d13
commit 63b91548e0
11 changed files with 55 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      ChangeLog
  2. 6
      include/freetype/internal/fttrace.h
  3. 1
      src/cff/cffload.c
  4. 2
      src/cff/cffobjs.c
  5. 2
      src/cid/cidriver.c
  6. 13
      src/psaux/cffdecode.c
  7. 1
      src/psaux/cffdecode.h
  8. 6
      src/psaux/psauxmod.h
  9. 2
      src/psaux/psft.c
  10. 1
      src/psaux/psobjs.c
  11. 2
      src/pshinter/pshalgo.c

24
ChangeLog
Unescape View File

@ -1,3 +1,27 @@
2017-12-07 Werner Lemberg <wl@gnu.org>
Fix `make multi'.
* include/freetype/internal/fttrace.h: Remove unused tracing macros.
s/pshalgo2/pshalgo/.
Add `trace_cffdecode'.
* src/pshinter/pshalgo.c (FT_COMPONENT): Updated.
* src/cff/cffload.c: Include FT_INTERNAL_POSTSCRIPT_AUX_H.
* src/cff/cffobjs.c: Include FT_SERVICE_METRICS_VARIATIONS_H and
FT_SERVICE_CFF_TABLE_LOAD_H.
* src/cid/cidriver.c: Include FT_INTERNAL_POSTSCRIPT_AUX_H.
* src/psaux/cffdecode.c: Include FT_FREETYPE_H and
FT_INTERNAL_DEBUG_H.
(FT_COMPONENT): Define.
* src/psaux/cffdecode.h: Include FT_INTERNAL_POSTSCRIPT_AUX_H.
* src/psaux/psauxmod.h: Include FT_INTERNAL_POSTSCRIPT_AUX_H.
Declare `cff_builder_funcs' and `ps_builder_funcs'.
* src/psaux/psft.c: Include `psobjs.h' and `cffdecode.h'.
* src/psaux/psobjs.c : Include `psauxmod.h'.
2017-12-07 Werner Lemberg <wl@gnu.org>
* include/freetype/config/ftheader.h: Some clean-up.

6
include/freetype/internal/fttrace.h
Unescape View File

@ -66,20 +66,19 @@ FT_TRACE_DEF( ttgxvar ) /* TrueType GX var handler (ttgxvar.c) */
FT_TRACE_DEF( t1afm )
FT_TRACE_DEF( t1driver )
FT_TRACE_DEF( t1gload )
FT_TRACE_DEF( t1hint )
FT_TRACE_DEF( t1load )
FT_TRACE_DEF( t1objs )
FT_TRACE_DEF( t1parse )
/* PostScript helper module `psaux' */
FT_TRACE_DEF( t1decode )
FT_TRACE_DEF( cffdecode )
FT_TRACE_DEF( psobjs )
FT_TRACE_DEF( psconv )
/* PostScript hinting module `pshinter' */
FT_TRACE_DEF( pshrec )
FT_TRACE_DEF( pshalgo1 )
FT_TRACE_DEF( pshalgo2 )
FT_TRACE_DEF( pshalgo )
/* Type 2 driver components */
FT_TRACE_DEF( cffdriver )
@ -96,7 +95,6 @@ FT_TRACE_DEF( cf2interp )
FT_TRACE_DEF( t42 )
/* CID driver components */
FT_TRACE_DEF( cidafm )
FT_TRACE_DEF( ciddriver )
FT_TRACE_DEF( cidgload )
FT_TRACE_DEF( cidload )

1
src/cff/cffload.c
Unescape View File

@ -22,6 +22,7 @@
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
#include FT_TYPE1_TABLES_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
#include FT_MULTIPLE_MASTERS_H

2
src/cff/cffobjs.c
Unescape View File

@ -30,6 +30,7 @@
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
#include FT_MULTIPLE_MASTERS_H
#include FT_SERVICE_MULTIPLE_MASTERS_H
#include FT_SERVICE_METRICS_VARIATIONS_H
#endif
#include FT_INTERNAL_CFF_OBJECTS_TYPES_H
@ -41,6 +42,7 @@
#include "cfferrs.h"
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_SERVICE_CFF_TABLE_LOAD_H
/*************************************************************************/

2
src/cid/cidriver.c
Unescape View File

@ -30,6 +30,8 @@
#include FT_SERVICE_PROPERTIES_H
#include FT_TYPE1_DRIVER_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
/*************************************************************************/
/* */

13
src/psaux/cffdecode.c
Unescape View File

@ -17,6 +17,8 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_SERVICE_H
#include FT_SERVICE_CFF_TABLE_LOAD_H
@ -25,6 +27,17 @@
#include "psauxerr.h"
/*************************************************************************/
/* */
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
/* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
/* messages during execution. */
/* */
#undef FT_COMPONENT
#define FT_COMPONENT trace_cffdecode
#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
typedef enum CFF_Operator_

1
src/psaux/cffdecode.h
Unescape View File

@ -21,6 +21,7 @@
#include <ft2build.h>
#include FT_INTERNAL_POSTSCRIPT_AUX_H
FT_BEGIN_HEADER

6
src/psaux/psauxmod.h
Unescape View File

@ -23,6 +23,8 @@
#include <ft2build.h>
#include FT_MODULE_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
FT_BEGIN_HEADER
@ -31,6 +33,10 @@ FT_BEGIN_HEADER
#endif
const CFF_Builder_FuncsRec cff_builder_funcs;
const PS_Builder_FuncsRec ps_builder_funcs;
FT_EXPORT_VAR( const FT_Module_Class ) psaux_driver_class;

2
src/psaux/psft.c
Unescape View File

@ -41,6 +41,8 @@
#include "psfont.h"
#include "pserror.h"
#include "psobjs.h"
#include "cffdecode.h"
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
#include FT_MULTIPLE_MASTERS_H

1
src/psaux/psobjs.c
Unescape View File

@ -27,6 +27,7 @@
#include "psconv.h"
#include "psauxerr.h"
#include "psauxmod.h"
/*************************************************************************/

2
src/pshinter/pshalgo.c
Unescape View File

@ -26,7 +26,7 @@
#undef FT_COMPONENT
#define FT_COMPONENT trace_pshalgo2
#define FT_COMPONENT trace_pshalgo
#ifdef DEBUG_HINTER

Write Preview
Loading…
Cancel
Save