Commit 573a98d04818dad7625d74b632574a037c48883f
2001-10-18T11:46:25
add support for new postscript hinter
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 1911829..4d18067 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -426,11 +426,19 @@ FT_BEGIN_HEADER
typedef struct T1_Builder_Funcs_
{
+<<<<<<< psaux.h
void
(*init)( T1_Builder* builder,
FT_Face face,
FT_Size size,
FT_GlyphSlot slot );
+=======
+ void (*init)( T1_Builder* builder,
+ FT_Face face,
+ FT_Size size,
+ FT_GlyphSlot slot,
+ FT_Bool hinting );
+>>>>>>> 1.14.2.2
void
(*done)( T1_Builder* builder );
@@ -531,7 +539,10 @@ FT_BEGIN_HEADER
FT_Error error; /* only used for memory errors */
FT_Bool metrics_only;
- T1_Builder_Funcs funcs;
+ void* hints_funcs; /* hinter-specific */
+ void* hints_globals; /* hinter-specific */
+
+ T1_Builder_Funcs funcs;
};
@@ -583,22 +594,20 @@ FT_BEGIN_HEADER
struct T1_Decoder_Funcs_
{
- FT_Error
- (*init)( T1_Decoder* decoder,
- FT_Face face,
- FT_Size size,
- FT_GlyphSlot slot,
- FT_Byte** glyph_names,
- T1_Blend* blend,
- T1_Decoder_Callback callback );
-
- void
- (*done)( T1_Decoder* decoder );
-
- FT_Error
- (*parse_charstrings)( T1_Decoder* decoder,
- FT_Byte* base,
- FT_UInt len );
+ FT_Error (*init) ( T1_Decoder* decoder,
+ FT_Face face,
+ FT_Size size,
+ FT_GlyphSlot slot,
+ FT_Byte** glyph_names,
+ T1_Blend* blend,
+ FT_Bool hinting,
+ T1_Decoder_Callback callback );
+
+ void (*done) ( T1_Decoder* decoder );
+
+ FT_Error (*parse_charstrings)( T1_Decoder* decoder,
+ FT_Byte* base,
+ FT_UInt len );
};