diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index 0864e3f17..25fb67308 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -91,6 +91,14 @@
trace_t2objs,
trace_t2parse,
+ /* CID driver components */
+ trace_cidafm,
+ trace_ciddriver,
+ trace_cidgload,
+ trace_cidload,
+ trace_cidobjs,
+ trace_cidparse,
+
/* other trace levels */
/* the last level must always be `trace_max' */
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index ea4aaee53..09bc88ea9 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -104,6 +104,7 @@
FT_Driver driver = face->driver;
FT_Set_MM_Blend_Func func;
+
func = (FT_Set_MM_Blend_Func)driver->interface.get_interface(
driver, "set_mm_blend" );
if ( func )
diff --git a/src/cff/t2gload.c b/src/cff/t2gload.c
index d93c6b91e..f42a5b68f 100644
--- a/src/cff/t2gload.c
+++ b/src/cff/t2gload.c
@@ -405,7 +405,7 @@
}
- /* add a new point, do not check room */
+ /* add a new point, do not check space */
static
void add_point( T2_Builder* builder,
TT_Pos x,
@@ -528,7 +528,9 @@
}
-#define USE_ARGS(n) top -= n; if (top < decoder->stack) goto Stack_Underflow
+#define USE_ARGS( n ) top -= n; \
+ if ( top < decoder->stack ) \
+ goto Stack_Underflow
/*************************************************************************/
@@ -578,7 +580,7 @@
if ( seed == 0 )
seed = 0x7384;
- /* First of all, initialize the decoder */
+ /* initialize the decoder */
decoder->top = decoder->stack;
decoder->zone = decoder->zones;
zone = decoder->zones;
@@ -608,7 +610,6 @@
/* */
/* Decode operator or operand */
/* */
- /* */
v = *ip++;
if ( v >= 32 || v == 28 )
{
@@ -1692,8 +1693,8 @@
glyph->root.format = ft_glyph_format_none;
{
- FT_Byte* charstring;
- FT_ULong charstring_len;
+ TT_Byte* charstring;
+ TT_ULong charstring_len;
T2_Init_Decoder( &decoder, face, size, glyph );
@@ -1804,8 +1805,8 @@
{
cbox.xMin &= -64;
cbox.yMin &= -64;
- cbox.xMax = ( cbox.xMax+63 ) & -64;
- cbox.yMax = ( cbox.yMax+63 ) & -64;
+ cbox.xMax = ( cbox.xMax + 63 ) & -64;
+ cbox.yMax = ( cbox.yMax + 63 ) & -64;
}
metrics->width = cbox.xMax - cbox.xMin;
diff --git a/src/cff/t2objs.c b/src/cff/t2objs.c
index ffab17e29..b85619f32 100644
--- a/src/cff/t2objs.c
+++ b/src/cff/t2objs.c
@@ -42,7 +42,7 @@
/*************************************************************************/
/* */
- /* GLYPH ZONE FUNCTIONS */
+ /* FACE FUNCTIONS */
/* */
/*************************************************************************/
@@ -246,12 +246,14 @@
/* */
/* size :: A handle to the target size object. */
/* */
+ /*