cairo 1.14.0-x86-mingw32 → 1.14.1-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of cairo might be problematic. Click here for more details.

Files changed (108) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS +12 -0
  3. data/Rakefile +14 -4
  4. data/ext/cairo/rb_cairo.h +1 -1
  5. data/lib/2.0/cairo.so +0 -0
  6. data/lib/2.1/cairo.so +0 -0
  7. data/lib/2.2/cairo.so +0 -0
  8. data/vendor/local/bin/fc-cache.exe +0 -0
  9. data/vendor/local/bin/fc-cat.exe +0 -0
  10. data/vendor/local/bin/fc-list.exe +0 -0
  11. data/vendor/local/bin/fc-match.exe +0 -0
  12. data/vendor/local/bin/fc-pattern.exe +0 -0
  13. data/vendor/local/bin/fc-query.exe +0 -0
  14. data/vendor/local/bin/fc-scan.exe +0 -0
  15. data/vendor/local/bin/fc-validate.exe +0 -0
  16. data/vendor/local/bin/freetype-config +2 -2
  17. data/vendor/local/bin/libcairo-2.dll +0 -0
  18. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  19. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  20. data/vendor/local/bin/libfontconfig-1.dll +0 -0
  21. data/vendor/local/bin/libfreetype-6.dll +0 -0
  22. data/vendor/local/bin/libpixman-1-0.dll +0 -0
  23. data/vendor/local/bin/libpng-config +1 -1
  24. data/vendor/local/bin/libpng16-16.dll +0 -0
  25. data/vendor/local/bin/libpng16-config +1 -1
  26. data/vendor/local/bin/libxml2-2.dll +0 -0
  27. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  28. data/vendor/local/bin/pngfix.exe +0 -0
  29. data/vendor/local/bin/xmlcatalog.exe +0 -0
  30. data/vendor/local/bin/xmllint.exe +0 -0
  31. data/vendor/local/bin/zlib1.dll +0 -0
  32. data/vendor/local/include/freetype2/config/ftconfig.h +12 -237
  33. data/vendor/local/include/freetype2/config/ftoption.h +59 -6
  34. data/vendor/local/include/freetype2/freetype.h +112 -140
  35. data/vendor/local/include/freetype2/ftadvanc.h +7 -2
  36. data/vendor/local/include/freetype2/ftautoh.h +11 -11
  37. data/vendor/local/include/freetype2/ftbbox.h +0 -1
  38. data/vendor/local/include/freetype2/ftbdf.h +2 -2
  39. data/vendor/local/include/freetype2/ftbitmap.h +7 -2
  40. data/vendor/local/include/freetype2/ftbzip2.h +1 -1
  41. data/vendor/local/include/freetype2/ftcache.h +4 -4
  42. data/vendor/local/include/freetype2/ftcffdrv.h +13 -5
  43. data/vendor/local/include/freetype2/ftcid.h +2 -1
  44. data/vendor/local/include/freetype2/fterrdef.h +91 -91
  45. data/vendor/local/include/freetype2/ftgasp.h +2 -1
  46. data/vendor/local/include/freetype2/ftglyph.h +3 -18
  47. data/vendor/local/include/freetype2/ftgxval.h +12 -13
  48. data/vendor/local/include/freetype2/ftgzip.h +1 -2
  49. data/vendor/local/include/freetype2/ftimage.h +51 -153
  50. data/vendor/local/include/freetype2/ftincrem.h +3 -2
  51. data/vendor/local/include/freetype2/ftlist.h +2 -3
  52. data/vendor/local/include/freetype2/ftlzw.h +1 -1
  53. data/vendor/local/include/freetype2/ftmm.h +0 -4
  54. data/vendor/local/include/freetype2/ftmodapi.h +28 -2
  55. data/vendor/local/include/freetype2/ftotval.h +8 -7
  56. data/vendor/local/include/freetype2/ftoutln.h +10 -8
  57. data/vendor/local/include/freetype2/ftpfr.h +1 -1
  58. data/vendor/local/include/freetype2/ftrender.h +0 -1
  59. data/vendor/local/include/freetype2/ftstroke.h +39 -5
  60. data/vendor/local/include/freetype2/ftsynth.h +1 -0
  61. data/vendor/local/include/freetype2/ftsystem.h +0 -1
  62. data/vendor/local/include/freetype2/fttrigon.h +2 -2
  63. data/vendor/local/include/freetype2/ftttdrv.h +1 -1
  64. data/vendor/local/include/freetype2/fttypes.h +6 -2
  65. data/vendor/local/include/freetype2/ftwinfnt.h +1 -1
  66. data/vendor/local/include/freetype2/ftxf86.h +2 -1
  67. data/vendor/local/include/freetype2/t1tables.h +109 -11
  68. data/vendor/local/include/freetype2/tttables.h +53 -11
  69. data/vendor/local/include/freetype2/ttunpat.h +2 -1
  70. data/vendor/local/include/libpng16/png.h +33 -27
  71. data/vendor/local/include/libpng16/pngconf.h +1 -1
  72. data/vendor/local/include/libpng16/pnglibconf.h +1 -1
  73. data/vendor/local/include/png.h +33 -27
  74. data/vendor/local/include/pngconf.h +1 -1
  75. data/vendor/local/include/pnglibconf.h +1 -1
  76. data/vendor/local/lib/libcairo-gobject.a +0 -0
  77. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  78. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  79. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  80. data/vendor/local/lib/libcairo.a +0 -0
  81. data/vendor/local/lib/libcairo.dll.a +0 -0
  82. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  83. data/vendor/local/lib/libfreetype.a +0 -0
  84. data/vendor/local/lib/libfreetype.dll.a +0 -0
  85. data/vendor/local/lib/libfreetype.la +1 -1
  86. data/vendor/local/lib/libpixman-1.a +0 -0
  87. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  88. data/vendor/local/lib/libpng.a +0 -0
  89. data/vendor/local/lib/libpng.dll.a +0 -0
  90. data/vendor/local/lib/libpng.la +2 -2
  91. data/vendor/local/lib/libpng16.a +0 -0
  92. data/vendor/local/lib/libpng16.dll.a +0 -0
  93. data/vendor/local/lib/libpng16.la +2 -2
  94. data/vendor/local/lib/libxml2.a +0 -0
  95. data/vendor/local/lib/libxml2.dll.a +0 -0
  96. data/vendor/local/lib/libz.a +0 -0
  97. data/vendor/local/lib/libz.dll.a +0 -0
  98. data/vendor/local/lib/pkgconfig/freetype2.pc +5 -5
  99. data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
  100. data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
  101. data/vendor/local/share/aclocal/freetype2.m4 +3 -3
  102. data/vendor/local/share/license/freetype/README +10 -10
  103. data/vendor/local/share/license/libpng/README +1 -1
  104. data/vendor/local/share/man/man1/freetype-config.1 +1 -1
  105. data/vendor/local/share/man/man3/libpng.3 +21 -18
  106. data/vendor/local/share/man/man3/libpngpf.3 +2 -2
  107. data/vendor/local/share/man/man5/png.5 +1 -1
  108. metadata +2 -2
data/vendor/local/include/freetype2/freetype.h CHANGED
@@ -113,7 +113,8 @@ FT_BEGIN_HEADER
113
113
  /* The FreeType~2 base font interface. */
114
114
  /* */
115
115
  /* <Description> */
116
- /* This section describes the public high-level API of FreeType~2. */
116
+ /* This section describes the most important public high-level API */
117
+ /* functions of FreeType~2. */
117
118
  /* */
118
119
  /* <Order> */
119
120
  /* FT_Library */
@@ -122,6 +123,7 @@ FT_BEGIN_HEADER
122
123
  /* FT_GlyphSlot */
123
124
  /* FT_CharMap */
124
125
  /* FT_Encoding */
126
+ /* FT_ENC_TAG */
125
127
  /* */
126
128
  /* FT_FaceRec */
127
129
  /* */
@@ -138,8 +140,22 @@ FT_BEGIN_HEADER
138
140
  /* FT_FACE_FLAG_MULTIPLE_MASTERS */
139
141
  /* FT_FACE_FLAG_GLYPH_NAMES */
140
142
  /* FT_FACE_FLAG_EXTERNAL_STREAM */
141
- /* FT_FACE_FLAG_FAST_GLYPHS */
142
143
  /* FT_FACE_FLAG_HINTER */
144
+ /* FT_FACE_FLAG_TRICKY */
145
+ /* */
146
+ /* FT_HAS_HORIZONTAL */
147
+ /* FT_HAS_VERTICAL */
148
+ /* FT_HAS_KERNING */
149
+ /* FT_HAS_FIXED_SIZES */
150
+ /* FT_HAS_GLYPH_NAMES */
151
+ /* FT_HAS_MULTIPLE_MASTERS */
152
+ /* FT_HAS_COLOR */
153
+ /* */
154
+ /* FT_IS_SFNT */
155
+ /* FT_IS_SCALABLE */
156
+ /* FT_IS_FIXED_WIDTH */
157
+ /* FT_IS_CID_KEYED */
158
+ /* FT_IS_TRICKY */
143
159
  /* */
144
160
  /* FT_STYLE_FLAG_BOLD */
145
161
  /* FT_STYLE_FLAG_ITALIC */
@@ -158,6 +174,7 @@ FT_BEGIN_HEADER
158
174
  /* */
159
175
  /* FT_New_Face */
160
176
  /* FT_Done_Face */
177
+ /* FT_Reference_Face */
161
178
  /* FT_New_Memory_Face */
162
179
  /* FT_Open_Face */
163
180
  /* FT_Open_Args */
@@ -170,10 +187,13 @@ FT_BEGIN_HEADER
170
187
  /* FT_Request_Size */
171
188
  /* FT_Select_Size */
172
189
  /* FT_Size_Request_Type */
190
+ /* FT_Size_RequestRec */
173
191
  /* FT_Size_Request */
174
192
  /* FT_Set_Transform */
175
193
  /* FT_Load_Glyph */
176
194
  /* FT_Get_Char_Index */
195
+ /* FT_Get_First_Char */
196
+ /* FT_Get_Next_Char */
177
197
  /* FT_Get_Name_Index */
178
198
  /* FT_Load_Char */
179
199
  /* */
@@ -190,11 +210,11 @@ FT_BEGIN_HEADER
190
210
  /* FT_LOAD_NO_SCALE */
191
211
  /* FT_LOAD_NO_HINTING */
192
212
  /* FT_LOAD_NO_BITMAP */
193
- /* FT_LOAD_CROP_BITMAP */
213
+ /* FT_LOAD_NO_AUTOHINT */
214
+ /* FT_LOAD_COLOR */
194
215
  /* */
195
216
  /* FT_LOAD_VERTICAL_LAYOUT */
196
217
  /* FT_LOAD_IGNORE_TRANSFORM */
197
- /* FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */
198
218
  /* FT_LOAD_FORCE_AUTOHINT */
199
219
  /* FT_LOAD_NO_RECURSE */
200
220
  /* FT_LOAD_PEDANTIC */
@@ -205,6 +225,8 @@ FT_BEGIN_HEADER
205
225
  /* FT_LOAD_TARGET_LCD */
206
226
  /* FT_LOAD_TARGET_LCD_V */
207
227
  /* */
228
+ /* FT_LOAD_TARGET_MODE */
229
+ /* */
208
230
  /* FT_Render_Glyph */
209
231
  /* FT_Render_Mode */
210
232
  /* FT_Get_Kerning */
@@ -218,14 +240,22 @@ FT_BEGIN_HEADER
218
240
  /* FT_Set_Charmap */
219
241
  /* FT_Get_Charmap_Index */
220
242
  /* */
221
- /* FT_FSTYPE_INSTALLABLE_EMBEDDING */
222
- /* FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING */
223
- /* FT_FSTYPE_PREVIEW_AND_PRINT_EMBEDDING */
224
- /* FT_FSTYPE_EDITABLE_EMBEDDING */
225
- /* FT_FSTYPE_NO_SUBSETTING */
226
- /* FT_FSTYPE_BITMAP_EMBEDDING_ONLY */
227
- /* */
228
243
  /* FT_Get_FSType_Flags */
244
+ /* FT_Get_SubGlyph_Info */
245
+ /* */
246
+ /* FT_Face_Internal */
247
+ /* FT_Size_Internal */
248
+ /* FT_Slot_Internal */
249
+ /* */
250
+ /* FT_FACE_FLAG_XXX */
251
+ /* FT_STYLE_FLAG_XXX */
252
+ /* FT_OPEN_XXX */
253
+ /* FT_LOAD_XXX */
254
+ /* FT_LOAD_TARGET_XXX */
255
+ /* FT_SUBGLYPH_FLAG_XXX */
256
+ /* FT_FSTYPE_XXX */
257
+ /* */
258
+ /* FT_HAS_FAST_GLYPHS */
229
259
  /* */
230
260
  /*************************************************************************/
231
261
 
@@ -376,6 +406,13 @@ FT_BEGIN_HEADER
376
406
  typedef struct FT_LibraryRec_ *FT_Library;
377
407
 
378
408
 
409
+ /*************************************************************************/
410
+ /* */
411
+ /* <Section> */
412
+ /* module_management */
413
+ /* */
414
+ /*************************************************************************/
415
+
379
416
  /*************************************************************************/
380
417
  /* */
381
418
  /* <Type> */
@@ -415,6 +452,13 @@ FT_BEGIN_HEADER
415
452
  typedef struct FT_RendererRec_* FT_Renderer;
416
453
 
417
454
 
455
+ /*************************************************************************/
456
+ /* */
457
+ /* <Section> */
458
+ /* base_interface */
459
+ /* */
460
+ /*************************************************************************/
461
+
418
462
  /*************************************************************************/
419
463
  /* */
420
464
  /* <Type> */
@@ -727,15 +771,8 @@ FT_BEGIN_HEADER
727
771
  } FT_Encoding;
728
772
 
729
773
 
730
- /*************************************************************************/
731
- /* */
732
- /* <Enum> */
733
- /* ft_encoding_xxx */
734
- /* */
735
- /* <Description> */
736
- /* These constants are deprecated; use the corresponding @FT_Encoding */
737
- /* values instead. */
738
- /* */
774
+ /* these constants are deprecated; use the corresponding `FT_Encoding' */
775
+ /* values instead */
739
776
  #define ft_encoding_none FT_ENCODING_NONE
740
777
  #define ft_encoding_unicode FT_ENCODING_UNICODE
741
778
  #define ft_encoding_symbol FT_ENCODING_MS_SYMBOL
@@ -1570,15 +1607,15 @@ FT_BEGIN_HEADER
1570
1607
  /* change between calls of @FT_Load_Glyph and a */
1571
1608
  /* few other functions. */
1572
1609
  /* */
1573
- /* bitmap_left :: This is the bitmap's left bearing expressed */
1574
- /* in integer pixels. Of course, this is only */
1575
- /* valid if the format is */
1576
- /* @FT_GLYPH_FORMAT_BITMAP. */
1610
+ /* bitmap_left :: The bitmap's left bearing expressed in */
1611
+ /* integer pixels. Only valid if the format is */
1612
+ /* @FT_GLYPH_FORMAT_BITMAP, this is, if the */
1613
+ /* glyph slot contains a bitmap. */
1577
1614
  /* */
1578
- /* bitmap_top :: This is the bitmap's top bearing expressed in */
1579
- /* integer pixels. Remember that this is the */
1580
- /* distance from the baseline to the top-most */
1581
- /* glyph scanline, upwards y~coordinates being */
1615
+ /* bitmap_top :: The bitmap's top bearing expressed in integer */
1616
+ /* pixels. Remember that this is the distance */
1617
+ /* from the baseline to the top-most glyph */
1618
+ /* scanline, upwards y~coordinates being */
1582
1619
  /* *positive*. */
1583
1620
  /* */
1584
1621
  /* outline :: The outline descriptor for the current glyph */
@@ -1592,7 +1629,6 @@ FT_BEGIN_HEADER
1592
1629
  /* This field is only valid for the composite */
1593
1630
  /* glyph format that should normally only be */
1594
1631
  /* loaded with the @FT_LOAD_NO_RECURSE flag. */
1595
- /* For now this is internal to FreeType. */
1596
1632
  /* */
1597
1633
  /* subglyphs :: An array of subglyph descriptors for */
1598
1634
  /* composite glyphs. There are `num_subglyphs' */
@@ -1783,16 +1819,6 @@ FT_BEGIN_HEADER
1783
1819
  /* */
1784
1820
  /* FT_OPEN_PARAMS :: Use the `num_params' and `params' fields. */
1785
1821
  /* */
1786
- /* ft_open_memory :: Deprecated; use @FT_OPEN_MEMORY instead. */
1787
- /* */
1788
- /* ft_open_stream :: Deprecated; use @FT_OPEN_STREAM instead. */
1789
- /* */
1790
- /* ft_open_pathname :: Deprecated; use @FT_OPEN_PATHNAME instead. */
1791
- /* */
1792
- /* ft_open_driver :: Deprecated; use @FT_OPEN_DRIVER instead. */
1793
- /* */
1794
- /* ft_open_params :: Deprecated; use @FT_OPEN_PARAMS instead. */
1795
- /* */
1796
1822
  /* <Note> */
1797
1823
  /* The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME' */
1798
1824
  /* flags are mutually exclusive. */
@@ -1803,11 +1829,14 @@ FT_BEGIN_HEADER
1803
1829
  #define FT_OPEN_DRIVER 0x8
1804
1830
  #define FT_OPEN_PARAMS 0x10
1805
1831
 
1806
- #define ft_open_memory FT_OPEN_MEMORY /* deprecated */
1807
- #define ft_open_stream FT_OPEN_STREAM /* deprecated */
1808
- #define ft_open_pathname FT_OPEN_PATHNAME /* deprecated */
1809
- #define ft_open_driver FT_OPEN_DRIVER /* deprecated */
1810
- #define ft_open_params FT_OPEN_PARAMS /* deprecated */
1832
+
1833
+ /* these constants are deprecated; use the corresponding `FT_OPEN_XXX' */
1834
+ /* values instead */
1835
+ #define ft_open_memory FT_OPEN_MEMORY
1836
+ #define ft_open_stream FT_OPEN_STREAM
1837
+ #define ft_open_pathname FT_OPEN_PATHNAME
1838
+ #define ft_open_driver FT_OPEN_DRIVER
1839
+ #define ft_open_params FT_OPEN_PARAMS
1811
1840
 
1812
1841
 
1813
1842
  /*************************************************************************/
@@ -1872,22 +1901,22 @@ FT_BEGIN_HEADER
1872
1901
  /* The stream type is determined by the contents of `flags' that */
1873
1902
  /* are tested in the following order by @FT_Open_Face: */
1874
1903
  /* */
1875
- /* If the `FT_OPEN_MEMORY' bit is set, assume that this is a */
1904
+ /* If the @FT_OPEN_MEMORY bit is set, assume that this is a */
1876
1905
  /* memory file of `memory_size' bytes, located at `memory_address'. */
1877
1906
  /* The data are are not copied, and the client is responsible for */
1878
1907
  /* releasing and destroying them _after_ the corresponding call to */
1879
1908
  /* @FT_Done_Face. */
1880
1909
  /* */
1881
- /* Otherwise, if the `FT_OPEN_STREAM' bit is set, assume that a */
1910
+ /* Otherwise, if the @FT_OPEN_STREAM bit is set, assume that a */
1882
1911
  /* custom input stream `stream' is used. */
1883
1912
  /* */
1884
- /* Otherwise, if the `FT_OPEN_PATHNAME' bit is set, assume that this */
1913
+ /* Otherwise, if the @FT_OPEN_PATHNAME bit is set, assume that this */
1885
1914
  /* is a normal file and use `pathname' to open it. */
1886
1915
  /* */
1887
- /* If the `FT_OPEN_DRIVER' bit is set, @FT_Open_Face only tries to */
1916
+ /* If the @FT_OPEN_DRIVER bit is set, @FT_Open_Face only tries to */
1888
1917
  /* open the file with the driver whose handler is in `driver'. */
1889
1918
  /* */
1890
- /* If the `FT_OPEN_PARAMS' bit is set, the parameters given by */
1919
+ /* If the @FT_OPEN_PARAMS bit is set, the parameters given by */
1891
1920
  /* `num_params' and `params' is used. They are ignored otherwise. */
1892
1921
  /* */
1893
1922
  /* Ideally, both the `pathname' and `params' fields should be tagged */
@@ -2541,11 +2570,6 @@ FT_BEGIN_HEADER
2541
2570
  * Indicates that the auto-hinter is preferred over the font's native
2542
2571
  * hinter. See also the note below.
2543
2572
  *
2544
- * FT_LOAD_CROP_BITMAP ::
2545
- * Indicates that the font driver should crop the loaded bitmap glyph
2546
- * (i.e., remove all space around its black bits). Not all drivers
2547
- * implement this.
2548
- *
2549
2573
  * FT_LOAD_PEDANTIC ::
2550
2574
  * Indicates that the font driver should perform pedantic verifications
2551
2575
  * during glyph loading. This is mostly used to detect broken glyphs
@@ -2556,18 +2580,12 @@ FT_BEGIN_HEADER
2556
2580
  * result in partially hinted or distorted glyphs in case a glyph's
2557
2581
  * bytecode is buggy.
2558
2582
  *
2559
- * FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ::
2560
- * Ignored. Deprecated.
2561
- *
2562
2583
  * FT_LOAD_NO_RECURSE ::
2563
- * This flag is only used internally. It merely indicates that the
2564
- * font driver should not load composite glyphs recursively. Instead,
2565
- * it should set the `num_subglyph' and `subglyphs' values of the
2566
- * glyph slot accordingly, and set `glyph->format' to
2567
- * @FT_GLYPH_FORMAT_COMPOSITE.
2568
- *
2569
- * The description of sub-glyphs is not available to client
2570
- * applications for now.
2584
+ * Indicate that the font driver should not load composite glyphs
2585
+ * recursively. Instead, it should set the `num_subglyph' and
2586
+ * `subglyphs' values of the glyph slot accordingly, and set
2587
+ * `glyph->format' to @FT_GLYPH_FORMAT_COMPOSITE. The description of
2588
+ * subglyphs can then be accessed with @FT_Get_SubGlyph_Info.
2571
2589
  *
2572
2590
  * This flag implies @FT_LOAD_NO_SCALE and @FT_LOAD_IGNORE_TRANSFORM.
2573
2591
  *
@@ -2600,6 +2618,12 @@ FT_BEGIN_HEADER
2600
2618
  * bitmaps transparently. Those bitmaps will be in the
2601
2619
  * @FT_PIXEL_MODE_GRAY format.
2602
2620
  *
2621
+ * FT_LOAD_CROP_BITMAP ::
2622
+ * Ignored. Deprecated.
2623
+ *
2624
+ * FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ::
2625
+ * Ignored. Deprecated.
2626
+ *
2603
2627
  * @note:
2604
2628
  * By default, hinting is enabled and the font's native hinter (see
2605
2629
  * @FT_FACE_FLAG_HINTER) is preferred over the auto-hinter. You can
@@ -2836,19 +2860,8 @@ FT_BEGIN_HEADER
2836
2860
  } FT_Render_Mode;
2837
2861
 
2838
2862
 
2839
- /*************************************************************************/
2840
- /* */
2841
- /* <Enum> */
2842
- /* ft_render_mode_xxx */
2843
- /* */
2844
- /* <Description> */
2845
- /* These constants are deprecated. Use the corresponding */
2846
- /* @FT_Render_Mode values instead. */
2847
- /* */
2848
- /* <Values> */
2849
- /* ft_render_mode_normal :: see @FT_RENDER_MODE_NORMAL */
2850
- /* ft_render_mode_mono :: see @FT_RENDER_MODE_MONO */
2851
- /* */
2863
+ /* these constants are deprecated; use the corresponding */
2864
+ /* `FT_Render_Mode' values instead */
2852
2865
  #define ft_render_mode_normal FT_RENDER_MODE_NORMAL
2853
2866
  #define ft_render_mode_mono FT_RENDER_MODE_MONO
2854
2867
 
@@ -2912,39 +2925,10 @@ FT_BEGIN_HEADER
2912
2925
  } FT_Kerning_Mode;
2913
2926
 
2914
2927
 
2915
- /*************************************************************************/
2916
- /* */
2917
- /* <Const> */
2918
- /* ft_kerning_default */
2919
- /* */
2920
- /* <Description> */
2921
- /* This constant is deprecated. Please use @FT_KERNING_DEFAULT */
2922
- /* instead. */
2923
- /* */
2928
+ /* these constants are deprecated; use the corresponding */
2929
+ /* `FT_Kerning_Mode' values instead */
2924
2930
  #define ft_kerning_default FT_KERNING_DEFAULT
2925
-
2926
-
2927
- /*************************************************************************/
2928
- /* */
2929
- /* <Const> */
2930
- /* ft_kerning_unfitted */
2931
- /* */
2932
- /* <Description> */
2933
- /* This constant is deprecated. Please use @FT_KERNING_UNFITTED */
2934
- /* instead. */
2935
- /* */
2936
2931
  #define ft_kerning_unfitted FT_KERNING_UNFITTED
2937
-
2938
-
2939
- /*************************************************************************/
2940
- /* */
2941
- /* <Const> */
2942
- /* ft_kerning_unscaled */
2943
- /* */
2944
- /* <Description> */
2945
- /* This constant is deprecated. Please use @FT_KERNING_UNSCALED */
2946
- /* instead. */
2947
- /* */
2948
2932
  #define ft_kerning_unscaled FT_KERNING_UNSCALED
2949
2933
 
2950
2934
 
@@ -3065,9 +3049,8 @@ FT_BEGIN_HEADER
3065
3049
  /* glyph index~0 always corresponds to the `missing glyph' (called */
3066
3050
  /* `.notdef'). */
3067
3051
  /* */
3068
- /* This function is not compiled within the library if the config */
3069
- /* macro `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is defined in */
3070
- /* `ftoptions.h'. */
3052
+ /* This function always returns an error if the config macro */
3053
+ /* `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is not defined in `ftoptions.h'. */
3071
3054
  /* */
3072
3055
  FT_EXPORT( FT_Error )
3073
3056
  FT_Get_Glyph_Name( FT_Face face,
@@ -3515,8 +3498,8 @@ FT_BEGIN_HEADER
3515
3498
  /* */
3516
3499
  /* http://www.unicode.org/reports/tr37/ */
3517
3500
  /* */
3518
- /* To date (November 2012), the character with the most variants is */
3519
- /* U+9089, having 31 such IVS. */
3501
+ /* To date (November 2014), the character with the most variants is */
3502
+ /* U+9089, having 32 such IVS. */
3520
3503
  /* */
3521
3504
  /* Adobe and MS decided to support IVS with a new cmap subtable */
3522
3505
  /* (format~14). It is an odd subtable because it is not a mapping of */
@@ -3767,12 +3750,6 @@ FT_BEGIN_HEADER
3767
3750
  FT_Long c );
3768
3751
 
3769
3752
 
3770
- /* */
3771
-
3772
- /* The following #if 0 ... #endif is for the documentation formatter, */
3773
- /* hiding the internal `FT_MULFIX_INLINED' macro. */
3774
-
3775
- #if 0
3776
3753
  /*************************************************************************/
3777
3754
  /* */
3778
3755
  /* <Function> */
@@ -3806,17 +3783,6 @@ FT_BEGIN_HEADER
3806
3783
  FT_MulFix( FT_Long a,
3807
3784
  FT_Long b );
3808
3785
 
3809
- /* */
3810
- #endif
3811
-
3812
- #ifdef FT_MULFIX_INLINED
3813
- #define FT_MulFix( a, b ) FT_MULFIX_INLINED( a, b )
3814
- #else
3815
- FT_EXPORT( FT_Long )
3816
- FT_MulFix( FT_Long a,
3817
- FT_Long b );
3818
- #endif
3819
-
3820
3786
 
3821
3787
  /*************************************************************************/
3822
3788
  /* */
@@ -3829,18 +3795,12 @@ FT_BEGIN_HEADER
3829
3795
  /* used to divide a given value by a 16.16 fixed-point factor. */
3830
3796
  /* */
3831
3797
  /* <Input> */
3832
- /* a :: The first multiplier. */
3833
- /* b :: The second multiplier. Use a 16.16 factor here whenever */
3834
- /* possible (see note below). */
3798
+ /* a :: The numerator. */
3799
+ /* b :: The denominator. Use a 16.16 factor here. */
3835
3800
  /* */
3836
3801
  /* <Return> */
3837
3802
  /* The result of `(a*0x10000)/b'. */
3838
3803
  /* */
3839
- /* <Note> */
3840
- /* The optimization for FT_DivFix() is simple: If (a~<<~16) fits in */
3841
- /* 32~bits, then the division is computed directly. Otherwise, we */
3842
- /* use a specialized version of @FT_MulDiv. */
3843
- /* */
3844
3804
  FT_EXPORT( FT_Long )
3845
3805
  FT_DivFix( FT_Long a,
3846
3806
  FT_Long b );
@@ -3940,6 +3900,18 @@ FT_BEGIN_HEADER
3940
3900
  /* even a new release of FreeType with only documentation changes */
3941
3901
  /* increases the version number. */
3942
3902
  /* */
3903
+ /* <Order> */
3904
+ /* FT_Library_Version */
3905
+ /* */
3906
+ /* FREETYPE_MAJOR */
3907
+ /* FREETYPE_MINOR */
3908
+ /* FREETYPE_PATCH */
3909
+ /* */
3910
+ /* FT_Face_CheckTrueTypePatents */
3911
+ /* FT_Face_SetUnpatentedHinting */
3912
+ /* */
3913
+ /* FREETYPE_XXX */
3914
+ /* */
3943
3915
  /*************************************************************************/
3944
3916
 
3945
3917
 
@@ -3965,7 +3937,7 @@ FT_BEGIN_HEADER
3965
3937
  */
3966
3938
  #define FREETYPE_MAJOR 2
3967
3939
  #define FREETYPE_MINOR 5
3968
- #define FREETYPE_PATCH 3
3940
+ #define FREETYPE_PATCH 4
3969
3941
 
3970
3942
 
3971
3943
  /*************************************************************************/