cairo 1.15.13-x86-mingw32 → 1.15.14-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (151) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS +24 -0
  3. data/README.rdoc +11 -40
  4. data/Rakefile +4 -2
  5. data/ext/cairo/rb_cairo.h +1 -1
  6. data/ext/cairo/rb_cairo_context.c +35 -3
  7. data/ext/cairo/rb_cairo_font_options.c +5 -6
  8. data/ext/cairo/rb_cairo_private.h +2 -2
  9. data/ext/cairo/rb_cairo_scaled_font.c +11 -2
  10. data/ext/cairo/rb_cairo_surface.c +89 -48
  11. data/lib/2.2/cairo.so +0 -0
  12. data/lib/2.3/cairo.so +0 -0
  13. data/lib/2.4/cairo.so +0 -0
  14. data/lib/2.5/cairo.so +0 -0
  15. data/test/{cairo-test-utils.rb → helper.rb} +4 -5
  16. data/test/run-test.rb +3 -10
  17. data/test/test_context.rb +6 -6
  18. data/test/test_font_extents.rb +1 -1
  19. data/test/test_font_face.rb +1 -1
  20. data/test/test_font_options.rb +1 -1
  21. data/test/test_image_surface.rb +2 -2
  22. data/test/test_pdf_surface.rb +1 -1
  23. data/test/test_quartz_image_surface.rb +1 -1
  24. data/test/test_raster_source_pattern.rb +13 -13
  25. data/test/test_recording_surface.rb +2 -2
  26. data/test/test_region.rb +1 -1
  27. data/test/test_scaled_font.rb +1 -1
  28. data/test/test_script_device.rb +1 -1
  29. data/test/test_script_surface.rb +1 -1
  30. data/test/test_surface.rb +5 -5
  31. data/test/test_svg_surface.rb +1 -1
  32. data/test/test_tee_surface.rb +2 -2
  33. data/test/test_text_cluster.rb +1 -1
  34. data/test/test_text_extents.rb +1 -1
  35. data/test/test_text_to_glyphs_data.rb +1 -1
  36. data/test/test_xml_device.rb +1 -1
  37. data/test/test_xml_surface.rb +2 -2
  38. data/vendor/local/bin/fc-cache.exe +0 -0
  39. data/vendor/local/bin/fc-cat.exe +0 -0
  40. data/vendor/local/bin/fc-conflist.exe +0 -0
  41. data/vendor/local/bin/fc-list.exe +0 -0
  42. data/vendor/local/bin/fc-match.exe +0 -0
  43. data/vendor/local/bin/fc-pattern.exe +0 -0
  44. data/vendor/local/bin/fc-query.exe +0 -0
  45. data/vendor/local/bin/fc-scan.exe +0 -0
  46. data/vendor/local/bin/fc-validate.exe +0 -0
  47. data/vendor/local/bin/libcairo-2.dll +0 -0
  48. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  49. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  50. data/vendor/local/bin/libfontconfig-1.dll +0 -0
  51. data/vendor/local/bin/libfreetype-6.dll +0 -0
  52. data/vendor/local/bin/libpixman-1-0.dll +0 -0
  53. data/vendor/local/bin/libpng-config +1 -1
  54. data/vendor/local/bin/libpng16-16.dll +0 -0
  55. data/vendor/local/bin/libpng16-config +1 -1
  56. data/vendor/local/bin/libxml2-2.dll +0 -0
  57. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  58. data/vendor/local/bin/pngfix.exe +0 -0
  59. data/vendor/local/bin/xmlcatalog.exe +0 -0
  60. data/vendor/local/bin/xmllint.exe +0 -0
  61. data/vendor/local/bin/zlib1211.dll +0 -0
  62. data/vendor/local/include/freetype2/freetype/config/ftconfig.h +82 -3
  63. data/vendor/local/include/freetype2/freetype/config/ftheader.h +43 -85
  64. data/vendor/local/include/freetype2/freetype/config/ftoption.h +43 -56
  65. data/vendor/local/include/freetype2/freetype/config/ftstdlib.h +1 -1
  66. data/vendor/local/include/freetype2/freetype/freetype.h +185 -85
  67. data/vendor/local/include/freetype2/freetype/ftadvanc.h +1 -1
  68. data/vendor/local/include/freetype2/freetype/ftbbox.h +2 -2
  69. data/vendor/local/include/freetype2/freetype/ftbdf.h +1 -1
  70. data/vendor/local/include/freetype2/freetype/ftbitmap.h +2 -2
  71. data/vendor/local/include/freetype2/freetype/ftbzip2.h +1 -1
  72. data/vendor/local/include/freetype2/freetype/ftcache.h +1 -16
  73. data/vendor/local/include/freetype2/freetype/ftchapters.h +3 -0
  74. data/vendor/local/include/freetype2/freetype/ftcid.h +2 -2
  75. data/vendor/local/include/freetype2/freetype/ftdriver.h +1225 -0
  76. data/vendor/local/include/freetype2/freetype/fterrdef.h +1 -1
  77. data/vendor/local/include/freetype2/freetype/fterrors.h +1 -1
  78. data/vendor/local/include/freetype2/freetype/ftfntfmt.h +1 -1
  79. data/vendor/local/include/freetype2/freetype/ftgasp.h +6 -1
  80. data/vendor/local/include/freetype2/freetype/ftglyph.h +3 -3
  81. data/vendor/local/include/freetype2/freetype/ftgxval.h +5 -5
  82. data/vendor/local/include/freetype2/freetype/ftgzip.h +4 -1
  83. data/vendor/local/include/freetype2/freetype/ftimage.h +18 -18
  84. data/vendor/local/include/freetype2/freetype/ftincrem.h +2 -13
  85. data/vendor/local/include/freetype2/freetype/ftlcdfil.h +5 -18
  86. data/vendor/local/include/freetype2/freetype/ftlist.h +1 -1
  87. data/vendor/local/include/freetype2/freetype/ftlzw.h +1 -1
  88. data/vendor/local/include/freetype2/freetype/ftmac.h +1 -1
  89. data/vendor/local/include/freetype2/freetype/ftmm.h +99 -11
  90. data/vendor/local/include/freetype2/freetype/ftmodapi.h +12 -11
  91. data/vendor/local/include/freetype2/freetype/ftmoderr.h +1 -1
  92. data/vendor/local/include/freetype2/freetype/ftotval.h +1 -1
  93. data/vendor/local/include/freetype2/freetype/ftoutln.h +4 -7
  94. data/vendor/local/include/freetype2/freetype/ftparams.h +205 -0
  95. data/vendor/local/include/freetype2/freetype/ftpfr.h +4 -4
  96. data/vendor/local/include/freetype2/freetype/ftrender.h +2 -2
  97. data/vendor/local/include/freetype2/freetype/ftsizes.h +1 -1
  98. data/vendor/local/include/freetype2/freetype/ftsnames.h +8 -42
  99. data/vendor/local/include/freetype2/freetype/ftstroke.h +6 -6
  100. data/vendor/local/include/freetype2/freetype/ftsynth.h +1 -1
  101. data/vendor/local/include/freetype2/freetype/ftsystem.h +1 -1
  102. data/vendor/local/include/freetype2/freetype/fttrigon.h +1 -1
  103. data/vendor/local/include/freetype2/freetype/fttypes.h +2 -2
  104. data/vendor/local/include/freetype2/freetype/ftwinfnt.h +2 -2
  105. data/vendor/local/include/freetype2/freetype/t1tables.h +10 -1
  106. data/vendor/local/include/freetype2/freetype/ttnameid.h +2 -2
  107. data/vendor/local/include/freetype2/freetype/tttables.h +1 -1
  108. data/vendor/local/include/freetype2/freetype/tttags.h +1 -1
  109. data/vendor/local/include/freetype2/ft2build.h +1 -1
  110. data/vendor/local/include/libpng16/png.h +40 -40
  111. data/vendor/local/include/libpng16/pngconf.h +15 -14
  112. data/vendor/local/include/libpng16/pnglibconf.h +1 -1
  113. data/vendor/local/include/png.h +40 -40
  114. data/vendor/local/include/pngconf.h +15 -14
  115. data/vendor/local/include/pnglibconf.h +1 -1
  116. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  117. data/vendor/local/lib/libcairo-gobject.la +1 -1
  118. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  119. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  120. data/vendor/local/lib/libcairo.a +0 -0
  121. data/vendor/local/lib/libcairo.dll.a +0 -0
  122. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  123. data/vendor/local/lib/libfreetype.a +0 -0
  124. data/vendor/local/lib/libfreetype.dll.a +0 -0
  125. data/vendor/local/lib/libfreetype.la +3 -3
  126. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  127. data/vendor/local/lib/libpng.a +0 -0
  128. data/vendor/local/lib/libpng.dll.a +0 -0
  129. data/vendor/local/lib/libpng.la +2 -2
  130. data/vendor/local/lib/libpng16.a +0 -0
  131. data/vendor/local/lib/libpng16.dll.a +0 -0
  132. data/vendor/local/lib/libpng16.la +2 -2
  133. data/vendor/local/lib/libxml2.dll.a +0 -0
  134. data/vendor/local/lib/libz.dll.a +0 -0
  135. data/vendor/local/lib/pkgconfig/freetype2.pc +2 -2
  136. data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
  137. data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
  138. data/vendor/local/share/aclocal/freetype2.m4 +1 -1
  139. data/vendor/local/share/license/freetype/README +9 -9
  140. data/vendor/local/share/license/freetype/README.git +1 -1
  141. data/vendor/local/share/license/libpng/README +2 -2
  142. data/vendor/local/share/man/man3/libpng.3 +50 -54
  143. data/vendor/local/share/man/man3/libpngpf.3 +8 -4
  144. metadata +9 -14
  145. data/vendor/local/bin/freetype-config +0 -211
  146. data/vendor/local/include/freetype2/freetype/ftautoh.h +0 -533
  147. data/vendor/local/include/freetype2/freetype/ftcffdrv.h +0 -321
  148. data/vendor/local/include/freetype2/freetype/ftpcfdrv.h +0 -105
  149. data/vendor/local/include/freetype2/freetype/ftttdrv.h +0 -328
  150. data/vendor/local/include/freetype2/freetype/ttunpat.h +0 -63
  151. data/vendor/local/share/man/man1/freetype-config.1 +0 -146
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType modules public interface (specification). */
6
6
  /* */
7
- /* Copyright 1996-2017 by */
7
+ /* Copyright 1996-2018 by */
8
8
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -323,16 +323,15 @@ FT_BEGIN_HEADER
323
323
  * The module name.
324
324
  *
325
325
  * property_name ::
326
- * The property name. Properties are described in the `Synopsis'
327
- * subsection of the module's documentation.
326
+ * The property name. Properties are described in section
327
+ * @properties.
328
328
  *
329
329
  * Note that only a few modules have properties.
330
330
  *
331
331
  * value ::
332
332
  * A generic pointer to a variable or structure that gives the new
333
333
  * value of the property. The exact definition of `value' is
334
- * dependent on the property; see the `Synopsis' subsection of the
335
- * module's documentation.
334
+ * dependent on the property; see section @properties.
336
335
  *
337
336
  * @return:
338
337
  * FreeType error code. 0~means success.
@@ -390,15 +389,14 @@ FT_BEGIN_HEADER
390
389
  * The module name.
391
390
  *
392
391
  * property_name ::
393
- * The property name. Properties are described in the `Synopsis'
394
- * subsection of the module's documentation.
392
+ * The property name. Properties are described in section
393
+ * @properties.
395
394
  *
396
395
  * @inout:
397
396
  * value ::
398
397
  * A generic pointer to a variable or structure that gives the
399
398
  * value of the property. The exact definition of `value' is
400
- * dependent on the property; see the `Synopsis' subsection of the
401
- * module's documentation.
399
+ * dependent on the property; see section @properties.
402
400
  *
403
401
  * @return:
404
402
  * FreeType error code. 0~means success.
@@ -446,8 +444,8 @@ FT_BEGIN_HEADER
446
444
  /* <Description> */
447
445
  /* If compilation option FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES is */
448
446
  /* set, this function reads the `FREETYPE_PROPERTIES' environment */
449
- /* variable to control driver properties. See sections @auto_hinter, */
450
- /* @cff_driver, @pcf_driver, and @tt_driver for more. */
447
+ /* variable to control driver properties. See section @properties */
448
+ /* for more. */
451
449
  /* */
452
450
  /* If the compilation option is not set, this function does nothing. */
453
451
  /* */
@@ -475,6 +473,9 @@ FT_BEGIN_HEADER
475
473
  /* <InOut> */
476
474
  /* library :: A handle to a new library object. */
477
475
  /* */
476
+ /* <Since> */
477
+ /* 2.8 */
478
+ /* */
478
479
  FT_EXPORT( void )
479
480
  FT_Set_Default_Properties( FT_Library library );
480
481
 
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType module error offsets (specification). */
6
6
  /* */
7
- /* Copyright 2001-2017 by */
7
+ /* Copyright 2001-2018 by */
8
8
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType API for validating OpenType tables (specification). */
6
6
  /* */
7
- /* Copyright 2004-2017 by */
7
+ /* Copyright 2004-2018 by */
8
8
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -5,7 +5,7 @@
5
5
  /* Support for the FT_Outline type used to store glyph shapes of */
6
6
  /* most scalable font formats (specification). */
7
7
  /* */
8
- /* Copyright 1996-2017 by */
8
+ /* Copyright 1996-2018 by */
9
9
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
10
10
  /* */
11
11
  /* This file is part of the FreeType project, and may only be used, */
@@ -89,7 +89,7 @@ FT_BEGIN_HEADER
89
89
  /* */
90
90
  /* <Description> */
91
91
  /* Walk over an outline's structure to decompose it into individual */
92
- /* segments and Bézier arcs. This function also emits `move to' */
92
+ /* segments and Bezier arcs. This function also emits `move to' */
93
93
  /* operations to indicate the start of new contours in the outline. */
94
94
  /* */
95
95
  /* <Input> */
@@ -190,9 +190,6 @@ FT_BEGIN_HEADER
190
190
  /* If the outline's `owner' field is not set, only the outline */
191
191
  /* descriptor will be released. */
192
192
  /* */
193
- /* The reason why this function takes an `library' parameter is */
194
- /* simply to use ft_mem_free(). */
195
- /* */
196
193
  FT_EXPORT( FT_Error )
197
194
  FT_Outline_Done( FT_Library library,
198
195
  FT_Outline* outline );
@@ -232,10 +229,10 @@ FT_BEGIN_HEADER
232
229
  /* */
233
230
  /* <Description> */
234
231
  /* Return an outline's `control box'. The control box encloses all */
235
- /* the outline's points, including Bézier control points. Though it */
232
+ /* the outline's points, including Bezier control points. Though it */
236
233
  /* coincides with the exact bounding box for most glyphs, it can be */
237
234
  /* slightly larger in some situations (like when rotating an outline */
238
- /* that contains Bézier outside arcs). */
235
+ /* that contains Bezier outside arcs). */
239
236
  /* */
240
237
  /* Computing the control box is very fast, while getting the bounding */
241
238
  /* box can take much more time as it needs to walk over all segments */
@@ -0,0 +1,205 @@
1
+ /***************************************************************************/
2
+ /* */
3
+ /* ftparams.h */
4
+ /* */
5
+ /* FreeType API for possible FT_Parameter tags (specification only). */
6
+ /* */
7
+ /* Copyright 2017-2018 by */
8
+ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9
+ /* */
10
+ /* This file is part of the FreeType project, and may only be used, */
11
+ /* modified, and distributed under the terms of the FreeType project */
12
+ /* license, LICENSE.TXT. By continuing to use, modify, or distribute */
13
+ /* this file you indicate that you have read the license and */
14
+ /* understand and accept it fully. */
15
+ /* */
16
+ /***************************************************************************/
17
+
18
+
19
+ #ifndef FTPARAMS_H_
20
+ #define FTPARAMS_H_
21
+
22
+ #include <ft2build.h>
23
+ #include FT_FREETYPE_H
24
+
25
+ #ifdef FREETYPE_H
26
+ #error "freetype.h of FreeType 1 has been loaded!"
27
+ #error "Please fix the directory search order for header files"
28
+ #error "so that freetype.h of FreeType 2 is found first."
29
+ #endif
30
+
31
+
32
+ FT_BEGIN_HEADER
33
+
34
+
35
+ /**************************************************************************
36
+ *
37
+ * @section:
38
+ * parameter_tags
39
+ *
40
+ * @title:
41
+ * Parameter Tags
42
+ *
43
+ * @abstract:
44
+ * Macros for driver property and font loading parameter tags.
45
+ *
46
+ * @description:
47
+ * This section contains macros for the @FT_Parameter structure that are
48
+ * used with various functions to activate some special functionality or
49
+ * different behaviour of various components of FreeType.
50
+ *
51
+ */
52
+
53
+
54
+ /***************************************************************************
55
+ *
56
+ * @constant:
57
+ * FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_FAMILY
58
+ *
59
+ * @description:
60
+ * A tag for @FT_Parameter to make @FT_Open_Face ignore typographic
61
+ * family names in the `name' table (introduced in OpenType version
62
+ * 1.4). Use this for backward compatibility with legacy systems that
63
+ * have a four-faces-per-family restriction.
64
+ *
65
+ * @since:
66
+ * 2.8
67
+ *
68
+ */
69
+ #define FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_FAMILY \
70
+ FT_MAKE_TAG( 'i', 'g', 'p', 'f' )
71
+
72
+
73
+ /* this constant is deprecated */
74
+ #define FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY \
75
+ FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_FAMILY
76
+
77
+
78
+ /***************************************************************************
79
+ *
80
+ * @constant:
81
+ * FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_SUBFAMILY
82
+ *
83
+ * @description:
84
+ * A tag for @FT_Parameter to make @FT_Open_Face ignore typographic
85
+ * subfamily names in the `name' table (introduced in OpenType version
86
+ * 1.4). Use this for backward compatibility with legacy systems that
87
+ * have a four-faces-per-family restriction.
88
+ *
89
+ * @since:
90
+ * 2.8
91
+ *
92
+ */
93
+ #define FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_SUBFAMILY \
94
+ FT_MAKE_TAG( 'i', 'g', 'p', 's' )
95
+
96
+
97
+ /* this constant is deprecated */
98
+ #define FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY \
99
+ FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_SUBFAMILY
100
+
101
+
102
+ /***************************************************************************
103
+ *
104
+ * @constant:
105
+ * FT_PARAM_TAG_INCREMENTAL
106
+ *
107
+ * @description:
108
+ * An @FT_Parameter tag to be used with @FT_Open_Face to indicate
109
+ * incremental glyph loading.
110
+ *
111
+ */
112
+ #define FT_PARAM_TAG_INCREMENTAL \
113
+ FT_MAKE_TAG( 'i', 'n', 'c', 'r' )
114
+
115
+
116
+ /**************************************************************************
117
+ *
118
+ * @constant:
119
+ * FT_PARAM_TAG_LCD_FILTER_WEIGHTS
120
+ *
121
+ * @description:
122
+ * An @FT_Parameter tag to be used with @FT_Face_Properties. The
123
+ * corresponding argument specifies the five LCD filter weights for a
124
+ * given face (if using @FT_LOAD_TARGET_LCD, for example), overriding
125
+ * the global default values or the values set up with
126
+ * @FT_Library_SetLcdFilterWeights.
127
+ *
128
+ * @since:
129
+ * 2.8
130
+ *
131
+ */
132
+ #define FT_PARAM_TAG_LCD_FILTER_WEIGHTS \
133
+ FT_MAKE_TAG( 'l', 'c', 'd', 'f' )
134
+
135
+
136
+ /**************************************************************************
137
+ *
138
+ * @constant:
139
+ * FT_PARAM_TAG_RANDOM_SEED
140
+ *
141
+ * @description:
142
+ * An @FT_Parameter tag to be used with @FT_Face_Properties. The
143
+ * corresponding 32bit signed integer argument overrides the font
144
+ * driver's random seed value with a face-specific one; see
145
+ * @random-seed.
146
+ *
147
+ * @since:
148
+ * 2.8
149
+ *
150
+ */
151
+ #define FT_PARAM_TAG_RANDOM_SEED \
152
+ FT_MAKE_TAG( 's', 'e', 'e', 'd' )
153
+
154
+
155
+ /**************************************************************************
156
+ *
157
+ * @constant:
158
+ * FT_PARAM_TAG_STEM_DARKENING
159
+ *
160
+ * @description:
161
+ * An @FT_Parameter tag to be used with @FT_Face_Properties. The
162
+ * corresponding Boolean argument specifies whether to apply stem
163
+ * darkening, overriding the global default values or the values set up
164
+ * with @FT_Property_Set (see @no-stem-darkening).
165
+ *
166
+ * This is a passive setting that only takes effect if the font driver
167
+ * or autohinter honors it, which the CFF, Type~1, and CID drivers
168
+ * always do, but the autohinter only in `light' hinting mode (as of
169
+ * version 2.9).
170
+ *
171
+ * @since:
172
+ * 2.8
173
+ *
174
+ */
175
+ #define FT_PARAM_TAG_STEM_DARKENING \
176
+ FT_MAKE_TAG( 'd', 'a', 'r', 'k' )
177
+
178
+
179
+ /***************************************************************************
180
+ *
181
+ * @constant:
182
+ * FT_PARAM_TAG_UNPATENTED_HINTING
183
+ *
184
+ * @description:
185
+ * Deprecated, no effect.
186
+ *
187
+ * Previously: A constant used as the tag of an @FT_Parameter structure to
188
+ * indicate that unpatented methods only should be used by the TrueType
189
+ * bytecode interpreter for a typeface opened by @FT_Open_Face.
190
+ *
191
+ */
192
+ #define FT_PARAM_TAG_UNPATENTED_HINTING \
193
+ FT_MAKE_TAG( 'u', 'n', 'p', 'a' )
194
+
195
+
196
+ /* */
197
+
198
+
199
+ FT_END_HEADER
200
+
201
+
202
+ #endif /* FTPARAMS_H_ */
203
+
204
+
205
+ /* END */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType API for accessing PFR-specific data (specification only). */
6
6
  /* */
7
- /* Copyright 2002-2017 by */
7
+ /* Copyright 2002-2018 by */
8
8
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -71,7 +71,7 @@ FT_BEGIN_HEADER
71
71
  *
72
72
  * ametrics_x_scale ::
73
73
  * A 16.16 fixed-point number used to scale distance expressed
74
- * in metrics units to device sub-pixels. This is equivalent to
74
+ * in metrics units to device subpixels. This is equivalent to
75
75
  * `face->size->x_scale', but for metrics only. Optional (parameter
76
76
  * can be NULL).
77
77
  *
@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
123
123
  * mode, which always returns distances converted to outline units.
124
124
  *
125
125
  * You can use the value of the `x_scale' and `y_scale' parameters
126
- * returned by @FT_Get_PFR_Metrics to scale these to device sub-pixels.
126
+ * returned by @FT_Get_PFR_Metrics to scale these to device subpixels.
127
127
  */
128
128
  FT_EXPORT( FT_Error )
129
129
  FT_Get_PFR_Kerning( FT_Face face,
@@ -154,7 +154,7 @@ FT_BEGIN_HEADER
154
154
  *
155
155
  * @note:
156
156
  * You can use the `x_scale' or `y_scale' results of @FT_Get_PFR_Metrics
157
- * to convert the advance to device sub-pixels (i.e., 1/64th of pixels).
157
+ * to convert the advance to device subpixels (i.e., 1/64th of pixels).
158
158
  */
159
159
  FT_EXPORT( FT_Error )
160
160
  FT_Get_PFR_Advance( FT_Face face,
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType renderer modules public interface (specification). */
6
6
  /* */
7
- /* Copyright 1996-2017 by */
7
+ /* Copyright 1996-2018 by */
8
8
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -88,7 +88,7 @@ FT_BEGIN_HEADER
88
88
  typedef FT_Error
89
89
  (*FT_Renderer_RenderFunc)( FT_Renderer renderer,
90
90
  FT_GlyphSlot slot,
91
- FT_UInt mode,
91
+ FT_Render_Mode mode,
92
92
  const FT_Vector* origin );
93
93
 
94
94
  typedef FT_Error
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType size objects management (specification). */
6
6
  /* */
7
- /* Copyright 1996-2017 by */
7
+ /* Copyright 1996-2018 by */
8
8
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -7,7 +7,7 @@
7
7
  /* */
8
8
  /* This is _not_ used to retrieve glyph names! */
9
9
  /* */
10
- /* Copyright 1996-2017 by */
10
+ /* Copyright 1996-2018 by */
11
11
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
12
12
  /* */
13
13
  /* This file is part of the FreeType project, and may only be used, */
@@ -25,6 +25,7 @@
25
25
 
26
26
  #include <ft2build.h>
27
27
  #include FT_FREETYPE_H
28
+ #include FT_PARAMETER_TAGS_H
28
29
 
29
30
  #ifdef FREETYPE_H
30
31
  #error "freetype.h of FreeType 1 has been loaded!"
@@ -189,6 +190,9 @@ FT_BEGIN_HEADER
189
190
  /* Please refer to the TrueType or OpenType specification for more */
190
191
  /* details. */
191
192
  /* */
193
+ /* <Since> */
194
+ /* 2.8 */
195
+ /* */
192
196
  typedef struct FT_SfntLangTag_
193
197
  {
194
198
  FT_Byte* string; /* this string is *not* null-terminated! */
@@ -229,53 +233,15 @@ FT_BEGIN_HEADER
229
233
  /* invalid format~1 language ID values, FT_Err_Invalid_Argument is */
230
234
  /* returned. */
231
235
  /* */
236
+ /* <Since> */
237
+ /* 2.8 */
238
+ /* */
232
239
  FT_EXPORT( FT_Error )
233
240
  FT_Get_Sfnt_LangTag( FT_Face face,
234
241
  FT_UInt langID,
235
242
  FT_SfntLangTag *alangTag );
236
243
 
237
244
 
238
- /***************************************************************************
239
- *
240
- * @constant:
241
- * FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_FAMILY
242
- *
243
- * @description:
244
- * A tag for @FT_Parameter to make @FT_Open_Face ignore typographic
245
- * family names in the `name' table (introduced in OpenType version
246
- * 1.4). Use this for backward compatibility with legacy systems that
247
- * have a four-faces-per-family restriction.
248
- *
249
- */
250
- #define FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_FAMILY \
251
- FT_MAKE_TAG( 'i', 'g', 'p', 'f' )
252
-
253
-
254
- /* this constant is deprecated */
255
- #define FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY \
256
- FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_FAMILY
257
-
258
-
259
- /***************************************************************************
260
- *
261
- * @constant:
262
- * FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_SUBFAMILY
263
- *
264
- * @description:
265
- * A tag for @FT_Parameter to make @FT_Open_Face ignore typographic
266
- * subfamily names in the `name' table (introduced in OpenType version
267
- * 1.4). Use this for backward compatibility with legacy systems that
268
- * have a four-faces-per-family restriction.
269
- *
270
- */
271
- #define FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_SUBFAMILY \
272
- FT_MAKE_TAG( 'i', 'g', 'p', 's' )
273
-
274
-
275
- /* this constant is deprecated */
276
- #define FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY \
277
- FT_PARAM_TAG_IGNORE_TYPOGRAPHIC_SUBFAMILY
278
-
279
245
  /* */
280
246
 
281
247