summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/autofit/afmodule.c2
-rw-r--r--src/base/ftobjs.c6
-rw-r--r--src/cff/cffdrivr.c10
-rw-r--r--src/cff/cffgload.c4
-rw-r--r--src/cff/cffobjs.c6
-rw-r--r--src/cid/cidgload.c4
-rw-r--r--src/cid/cidobjs.c6
-rw-r--r--src/cid/cidriver.c10
-rw-r--r--src/pcf/pcfdrivr.c2
-rw-r--r--src/psaux/psobjs.c9
-rw-r--r--src/tools/ftfuzzer/ftfuzzer.cc5
-rw-r--r--src/truetype/ttdriver.c2
-rw-r--r--src/truetype/ttgload.c2
-rw-r--r--src/truetype/ttinterp.c2
-rw-r--r--src/truetype/ttobjs.c2
-rw-r--r--src/truetype/ttsubpix.c2
-rw-r--r--src/type1/t1driver.c10
-rw-r--r--src/type1/t1gload.c6
-rw-r--r--src/type1/t1objs.c6
19 files changed, 46 insertions, 50 deletions
diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c
index 9d7ba224d..666146750 100644
--- a/src/autofit/afmodule.c
+++ b/src/autofit/afmodule.c
@@ -56,7 +56,7 @@
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DEBUG_H
-#include FT_AUTOHINTER_H
+#include FT_DRIVER_H
#include FT_SERVICE_PROPERTIES_H
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index ccf526f23..1d36860e7 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -41,9 +41,7 @@
#include FT_SERVICE_KERNING_H
#include FT_SERVICE_TRUETYPE_ENGINE_H
-#include FT_AUTOHINTER_H
-#include FT_CFF_DRIVER_H
-#include FT_TYPE1_DRIVER_H
+#include FT_DRIVER_H
#ifdef FT_CONFIG_OPTION_MAC_FONTS
#include "ftbase.h"
@@ -849,7 +847,7 @@
/* we use `strstr' to catch both `Type 1' and `CID Type 1' */
is_light_type1 =
ft_strstr( FT_Get_Font_Format( face ), "Type 1" ) != NULL &&
- ((PS_Driver)driver)->hinting_engine == FT_T1_HINTING_ADOBE;
+ ((PS_Driver)driver)->hinting_engine == FT_HINTING_ADOBE;
/* the check for `num_locations' assures that we actually */
/* test for instructions in a TTF and not in a CFF-based OTF */
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index d0856919d..cc661a48e 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -46,7 +46,7 @@
#include FT_SERVICE_FONT_FORMAT_H
#include FT_SERVICE_GLYPH_DICT_H
#include FT_SERVICE_PROPERTIES_H
-#include FT_CFF_DRIVER_H
+#include FT_DRIVER_H
/*************************************************************************/
@@ -905,10 +905,10 @@
if ( !ft_strcmp( s, "adobe" ) )
- driver->hinting_engine = FT_CFF_HINTING_ADOBE;
+ driver->hinting_engine = FT_HINTING_ADOBE;
#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
else if ( !ft_strcmp( s, "freetype" ) )
- driver->hinting_engine = FT_CFF_HINTING_FREETYPE;
+ driver->hinting_engine = FT_HINTING_FREETYPE;
#endif
else
return FT_THROW( Invalid_Argument );
@@ -919,9 +919,9 @@
FT_UInt* hinting_engine = (FT_UInt*)value;
- if ( *hinting_engine == FT_CFF_HINTING_ADOBE
+ if ( *hinting_engine == FT_HINTING_ADOBE
#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
- || *hinting_engine == FT_CFF_HINTING_FREETYPE
+ || *hinting_engine == FT_HINTING_FREETYPE
#endif
)
driver->hinting_engine = *hinting_engine;
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 5429460cc..64179af2e 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -23,7 +23,7 @@
#include FT_INTERNAL_CALC_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_OUTLINE_H
-#include FT_CFF_DRIVER_H
+#include FT_DRIVER_H
#include "cffload.h"
#include "cffgload.h"
@@ -428,7 +428,7 @@
#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
/* choose which CFF renderer to use */
- if ( driver->hinting_engine == FT_CFF_HINTING_FREETYPE )
+ if ( driver->hinting_engine == FT_HINTING_FREETYPE )
error = decoder_funcs->parse_charstrings_old( &decoder,
charstring,
charstring_len,
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 8f26278a8..d4b6e5941 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -25,7 +25,7 @@
#include FT_TRUETYPE_IDS_H
#include FT_TRUETYPE_TAGS_H
#include FT_INTERNAL_SFNT_H
-#include FT_CFF_DRIVER_H
+#include FT_DRIVER_H
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
#include FT_MULTIPLE_MASTERS_H
@@ -1164,9 +1164,9 @@
/* set default property values, cf. `ftcffdrv.h' */
#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
- driver->hinting_engine = FT_CFF_HINTING_FREETYPE;
+ driver->hinting_engine = FT_HINTING_FREETYPE;
#else
- driver->hinting_engine = FT_CFF_HINTING_ADOBE;
+ driver->hinting_engine = FT_HINTING_ADOBE;
#endif
driver->no_stem_darkening = TRUE;
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index 086e88997..76aa09556 100644
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -26,7 +26,7 @@
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_INTERNAL_CFF_TYPES_H
-#include FT_TYPE1_DRIVER_H
+#include FT_DRIVER_H
#include "ciderrs.h"
@@ -178,7 +178,7 @@
/* choose which renderer to use */
#ifdef T1_CONFIG_OPTION_OLD_ENGINE
if ( ( (PS_Driver)FT_FACE_DRIVER( face ) )->hinting_engine ==
- FT_T1_HINTING_FREETYPE ||
+ FT_HINTING_FREETYPE ||
decoder->builder.metrics_only )
error = psaux->t1_decoder_funcs->parse_charstrings_old(
decoder,
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 4f4cf4697..ed1dca265 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -26,7 +26,7 @@
#include FT_SERVICE_POSTSCRIPT_CMAPS_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_INTERNAL_POSTSCRIPT_HINTS_H
-#include FT_TYPE1_DRIVER_H
+#include FT_DRIVER_H
#include "ciderrs.h"
@@ -473,9 +473,9 @@
/* set default property values, cf. `ftt1drv.h' */
#ifdef T1_CONFIG_OPTION_OLD_ENGINE
- driver->hinting_engine = FT_T1_HINTING_FREETYPE;
+ driver->hinting_engine = FT_HINTING_FREETYPE;
#else
- driver->hinting_engine = FT_T1_HINTING_ADOBE;
+ driver->hinting_engine = FT_HINTING_ADOBE;
#endif
driver->no_stem_darkening = TRUE;
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 94bf858d3..485e1247c 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -28,7 +28,7 @@
#include FT_SERVICE_POSTSCRIPT_INFO_H
#include FT_SERVICE_CID_H
#include FT_SERVICE_PROPERTIES_H
-#include FT_TYPE1_DRIVER_H
+#include FT_DRIVER_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
@@ -260,10 +260,10 @@
if ( !ft_strcmp( s, "adobe" ) )
- driver->hinting_engine = FT_T1_HINTING_ADOBE;
+ driver->hinting_engine = FT_HINTING_ADOBE;
#ifdef T1_CONFIG_OPTION_OLD_ENGINE
else if ( !ft_strcmp( s, "freetype" ) )
- driver->hinting_engine = FT_T1_HINTING_FREETYPE;
+ driver->hinting_engine = FT_HINTING_FREETYPE;
#endif
else
return FT_THROW( Invalid_Argument );
@@ -274,9 +274,9 @@
FT_UInt* hinting_engine = (FT_UInt*)value;
- if ( *hinting_engine == FT_T1_HINTING_ADOBE
+ if ( *hinting_engine == FT_HINTING_ADOBE
#ifdef T1_CONFIG_OPTION_OLD_ENGINE
- || *hinting_engine == FT_T1_HINTING_FREETYPE
+ || *hinting_engine == FT_HINTING_FREETYPE
#endif
)
driver->hinting_engine = *hinting_engine;
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index 169f75e95..0119d9485 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -50,7 +50,7 @@ THE SOFTWARE.
#include FT_SERVICE_BDF_H
#include FT_SERVICE_FONT_FORMAT_H
#include FT_SERVICE_PROPERTIES_H
-#include FT_PCF_DRIVER_H
+#include FT_DRIVER_H
/*************************************************************************/
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 2b70a2eb6..e871cb8be 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -20,8 +20,7 @@
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_CALC_H
-#include FT_CFF_DRIVER_H
-#include FT_TYPE1_DRIVER_H
+#include FT_DRIVER_H
#include "psobjs.h"
#include "psconv.h"
@@ -1894,7 +1893,7 @@
PS_Driver driver = (PS_Driver)FT_FACE_DRIVER( builder->face );
- if ( driver->hinting_engine == FT_CFF_HINTING_FREETYPE )
+ if ( driver->hinting_engine == FT_HINTING_FREETYPE )
{
point->x = x >> 16;
point->y = y >> 16;
@@ -2170,7 +2169,7 @@
if ( !builder->is_t1 &&
- driver->hinting_engine == FT_CFF_HINTING_FREETYPE )
+ driver->hinting_engine == FT_HINTING_FREETYPE )
{
point->x = x >> 16;
point->y = y >> 16;
@@ -2182,7 +2181,7 @@
PS_Driver driver = (PS_Driver)FT_FACE_DRIVER( builder->face );
#endif
if ( builder->is_t1 &&
- driver->hinting_engine == FT_T1_HINTING_FREETYPE )
+ driver->hinting_engine == FT_HINTING_FREETYPE )
{
point->x = FIXED_TO_INT( x );
point->y = FIXED_TO_INT( y );
diff --git a/src/tools/ftfuzzer/ftfuzzer.cc b/src/tools/ftfuzzer/ftfuzzer.cc
index 4da0c2bf2..1382adaf9 100644
--- a/src/tools/ftfuzzer/ftfuzzer.cc
+++ b/src/tools/ftfuzzer/ftfuzzer.cc
@@ -43,8 +43,7 @@
#include FT_OUTLINE_H
#include FT_BBOX_H
#include FT_MODULE_H
-#include FT_CFF_DRIVER_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
#include FT_MULTIPLE_MASTERS_H
@@ -61,7 +60,7 @@
return;
// try to activate Adobe's CFF engine; it might not be the default
- unsigned int cff_hinting_engine = FT_CFF_HINTING_ADOBE;
+ unsigned int cff_hinting_engine = FT_HINTING_ADOBE;
FT_Property_Set( library,
"cff",
"hinting-engine", &cff_hinting_engine );
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index ba05cefb3..a1d1cfdfe 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -31,7 +31,7 @@
#include FT_SERVICE_TRUETYPE_ENGINE_H
#include FT_SERVICE_TRUETYPE_GLYF_H
#include FT_SERVICE_PROPERTIES_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
#include "ttdriver.h"
#include "ttgload.h"
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index dfdeb9eb6..917aa62aa 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -24,7 +24,7 @@
#include FT_INTERNAL_SFNT_H
#include FT_TRUETYPE_TAGS_H
#include FT_OUTLINE_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
#include FT_LIST_H
#include "ttgload.h"
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index bb45655e4..db5aaa32c 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -25,7 +25,7 @@
#include FT_INTERNAL_CALC_H
#include FT_TRIGONOMETRY_H
#include FT_SYSTEM_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
#include FT_MULTIPLE_MASTERS_H
#include "ttinterp.h"
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 1726b0eb8..f2334f313 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -21,7 +21,7 @@
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
#include FT_INTERNAL_SFNT_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
#include "ttgload.h"
#include "ttpload.h"
diff --git a/src/truetype/ttsubpix.c b/src/truetype/ttsubpix.c
index 1c8cf0110..02058751a 100644
--- a/src/truetype/ttsubpix.c
+++ b/src/truetype/ttsubpix.c
@@ -22,7 +22,7 @@
#include FT_INTERNAL_SFNT_H
#include FT_TRUETYPE_TAGS_H
#include FT_OUTLINE_H
-#include FT_TRUETYPE_DRIVER_H
+#include FT_DRIVER_H
#include "ttsubpix.h"
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index c9559329b..63df1c49b 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -30,7 +30,7 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_HASH_H
-#include FT_TYPE1_DRIVER_H
+#include FT_DRIVER_H
#include FT_SERVICE_MULTIPLE_MASTERS_H
#include FT_SERVICE_GLYPH_DICT_H
@@ -705,10 +705,10 @@
if ( !ft_strcmp( s, "adobe" ) )
- driver->hinting_engine = FT_T1_HINTING_ADOBE;
+ driver->hinting_engine = FT_HINTING_ADOBE;
#ifdef T1_CONFIG_OPTION_OLD_ENGINE
else if ( !ft_strcmp( s, "freetype" ) )
- driver->hinting_engine = FT_T1_HINTING_FREETYPE;
+ driver->hinting_engine = FT_HINTING_FREETYPE;
#endif
else
return FT_THROW( Invalid_Argument );
@@ -719,9 +719,9 @@
FT_UInt* hinting_engine = (FT_UInt*)value;
- if ( *hinting_engine == FT_T1_HINTING_ADOBE
+ if ( *hinting_engine == FT_HINTING_ADOBE
#ifdef T1_CONFIG_OPTION_OLD_ENGINE
- || *hinting_engine == FT_T1_HINTING_FREETYPE
+ || *hinting_engine == FT_HINTING_FREETYPE
#endif
)
driver->hinting_engine = *hinting_engine;
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index e50d7a5f6..5bda3a537 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -24,7 +24,7 @@
#include FT_OUTLINE_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_INTERNAL_CFF_TYPES_H
-#include FT_TYPE1_DRIVER_H
+#include FT_DRIVER_H
#include "t1errors.h"
@@ -86,8 +86,8 @@
{
/* choose which renderer to use */
#ifdef T1_CONFIG_OPTION_OLD_ENGINE
- if ( driver->hinting_engine == FT_T1_HINTING_FREETYPE ||
- decoder->builder.metrics_only )
+ if ( driver->hinting_engine == FT_HINTING_FREETYPE ||
+ decoder->builder.metrics_only )
error = decoder_funcs->parse_charstrings_old(
decoder,
(FT_Byte*)char_string->pointer,
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index 9e78f29f0..c00b322b1 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -21,7 +21,7 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_IDS_H
-#include FT_TYPE1_DRIVER_H
+#include FT_DRIVER_H
#include "t1gload.h"
#include "t1load.h"
@@ -588,9 +588,9 @@
/* set default property values, cf. `ftt1drv.h' */
#ifdef T1_CONFIG_OPTION_OLD_ENGINE
- driver->hinting_engine = FT_T1_HINTING_FREETYPE;
+ driver->hinting_engine = FT_HINTING_FREETYPE;
#else
- driver->hinting_engine = FT_T1_HINTING_ADOBE;
+ driver->hinting_engine = FT_HINTING_ADOBE;
#endif
driver->no_stem_darkening = TRUE;
View Lorry Controller Status