summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/autofit/aftypes.h
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/autofit/aftypes.h')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/autofit/aftypes.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/autofit/aftypes.h b/Build/source/libs/freetype2/freetype-src/src/autofit/aftypes.h
index cbe8bc23b1b..eae6e11783c 100644
--- a/Build/source/libs/freetype2/freetype-src/src/autofit/aftypes.h
+++ b/Build/source/libs/freetype2/freetype-src/src/autofit/aftypes.h
@@ -4,7 +4,7 @@
/* */
/* Auto-fitter types (specification only). */
/* */
-/* Copyright 2003-2015 by */
+/* Copyright 2003-2016 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -29,8 +29,8 @@
*************************************************************************/
-#ifndef __AFTYPES_H__
-#define __AFTYPES_H__
+#ifndef AFTYPES_H_
+#define AFTYPES_H_
#include <ft2build.h>
@@ -255,7 +255,7 @@ extern void* _af_debug_hints;
* outline according to the results of the glyph analyzer.
*/
-#define __AFWRTSYS_H__ /* don't load header files */
+#define AFWRTSYS_H_ /* don't load header files */
#undef WRITING_SYSTEM
#define WRITING_SYSTEM( ws, WS ) \
AF_WRITING_SYSTEM_ ## WS,
@@ -270,7 +270,7 @@ extern void* _af_debug_hints;
} AF_WritingSystem;
-#undef __AFWRTSYS_H__
+#undef AFWRTSYS_H_
typedef struct AF_WritingSystemClassRec_
@@ -309,7 +309,7 @@ extern void* _af_debug_hints;
*/
#undef SCRIPT
-#define SCRIPT( s, S, d, h, sc1, sc2, sc3 ) \
+#define SCRIPT( s, S, d, h, H, ss ) \
AF_SCRIPT_ ## S,
/* The list of known scripts. */
@@ -343,9 +343,9 @@ extern void* _af_debug_hints;
AF_Script_UniRange script_uni_ranges;
AF_Script_UniRange script_uni_nonbase_ranges;
- FT_UInt32 standard_char1; /* for default width and height */
- FT_UInt32 standard_char2; /* ditto */
- FT_UInt32 standard_char3; /* ditto */
+ FT_Bool top_to_bottom_hinting;
+
+ const char* standard_charstring; /* for default width and height */
} AF_ScriptClassRec;
@@ -481,6 +481,10 @@ extern void* _af_debug_hints;
} AF_StyleMetricsRec;
+#define AF_HINTING_BOTTOM_TO_TOP 0
+#define AF_HINTING_TOP_TO_BOTTOM 1
+
+
/* Declare and define vtables for classes */
#ifndef FT_CONFIG_OPTION_PIC
@@ -524,18 +528,16 @@ extern void* _af_debug_hints;
script, \
ranges, \
nonbase_ranges, \
- std_char1, \
- std_char2, \
- std_char3 ) \
+ top_to_bottom, \
+ std_charstring ) \
FT_CALLBACK_TABLE_DEF \
const AF_ScriptClassRec script_class = \
{ \
script, \
ranges, \
nonbase_ranges, \
- std_char1, \
- std_char2, \
- std_char3 \
+ top_to_bottom, \
+ std_charstring, \
};
@@ -601,18 +603,16 @@ extern void* _af_debug_hints;
script_, \
ranges, \
nonbase_ranges, \
- std_char1, \
- std_char2, \
- std_char3 ) \
+ top_to_bottom, \
+ std_charstring ) \
FT_LOCAL_DEF( void ) \
FT_Init_Class_ ## script_class( AF_ScriptClassRec* ac ) \
{ \
ac->script = script_; \
ac->script_uni_ranges = ranges; \
ac->script_uni_nonbase_ranges = nonbase_ranges; \
- ac->standard_char1 = std_char1; \
- ac->standard_char2 = std_char2; \
- ac->standard_char3 = std_char3; \
+ ac->top_to_bottom_hinting = top_to_bottom; \
+ ac->standard_charstring = std_charstring; \
}
@@ -644,7 +644,7 @@ extern void* _af_debug_hints;
FT_END_HEADER
-#endif /* __AFTYPES_H__ */
+#endif /* AFTYPES_H_ */
/* END */