cairo 1.14.3-x64-mingw32 → 1.14.6-x64-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 (173) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS +11 -0
  3. data/Rakefile +11 -9
  4. data/ext/cairo/rb_cairo.h +2 -2
  5. data/ext/cairo/rb_cairo_font_options.c +5 -1
  6. data/ext/cairo/rb_cairo_surface.c +28 -5
  7. data/lib/2.2/cairo.so +0 -0
  8. data/lib/2.3/cairo.so +0 -0
  9. data/test/test_font_options.rb +47 -2
  10. data/vendor/local/bin/fc-cache.exe +0 -0
  11. data/vendor/local/bin/fc-cat.exe +0 -0
  12. data/vendor/local/bin/fc-list.exe +0 -0
  13. data/vendor/local/bin/fc-match.exe +0 -0
  14. data/vendor/local/bin/fc-pattern.exe +0 -0
  15. data/vendor/local/bin/fc-query.exe +0 -0
  16. data/vendor/local/bin/fc-scan.exe +0 -0
  17. data/vendor/local/bin/fc-validate.exe +0 -0
  18. data/vendor/local/bin/freetype-config +6 -8
  19. data/vendor/local/bin/libcairo-2.dll +0 -0
  20. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  21. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  22. data/vendor/local/bin/libfontconfig-1.dll +0 -0
  23. data/vendor/local/bin/libfreetype-6.dll +0 -0
  24. data/vendor/local/bin/libgcc_s_seh-1.dll +0 -0
  25. data/vendor/local/bin/libpixman-1-0.dll +0 -0
  26. data/vendor/local/bin/libpng-config +1 -1
  27. data/vendor/local/bin/libpng16-16.dll +0 -0
  28. data/vendor/local/bin/libpng16-config +1 -1
  29. data/vendor/local/bin/libstdc++-6.dll +0 -0
  30. data/vendor/local/bin/libwinpthread-1.dll +0 -0
  31. data/vendor/local/bin/libxml2-2.dll +0 -0
  32. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  33. data/vendor/local/bin/pngfix.exe +0 -0
  34. data/vendor/local/bin/xmlcatalog.exe +0 -0
  35. data/vendor/local/bin/xmllint.exe +0 -0
  36. data/vendor/local/bin/zlib1.dll +0 -0
  37. data/vendor/local/include/cairo/cairo-features.h +15 -0
  38. data/vendor/local/include/cairo/cairo-version.h +1 -1
  39. data/vendor/local/include/freetype2/{config → freetype/config}/ftconfig.h +15 -9
  40. data/vendor/local/include/freetype2/{config → freetype/config}/ftheader.h +64 -65
  41. data/vendor/local/include/freetype2/{config → freetype/config}/ftmodule.h +0 -0
  42. data/vendor/local/include/freetype2/{config → freetype/config}/ftoption.h +29 -64
  43. data/vendor/local/include/freetype2/{config → freetype/config}/ftstdlib.h +6 -6
  44. data/vendor/local/include/freetype2/{freetype.h → freetype/freetype.h} +270 -67
  45. data/vendor/local/include/freetype2/{ftadvanc.h → freetype/ftadvanc.h} +4 -4
  46. data/vendor/local/include/freetype2/{ftautoh.h → freetype/ftautoh.h} +59 -6
  47. data/vendor/local/include/freetype2/{ftbbox.h → freetype/ftbbox.h} +4 -4
  48. data/vendor/local/include/freetype2/{ftbdf.h → freetype/ftbdf.h} +4 -4
  49. data/vendor/local/include/freetype2/{ftbitmap.h → freetype/ftbitmap.h} +4 -4
  50. data/vendor/local/include/freetype2/{ftbzip2.h → freetype/ftbzip2.h} +4 -4
  51. data/vendor/local/include/freetype2/{ftcache.h → freetype/ftcache.h} +4 -4
  52. data/vendor/local/include/freetype2/{ftcffdrv.h → freetype/ftcffdrv.h} +8 -8
  53. data/vendor/local/include/freetype2/{ftchapters.h → freetype/ftchapters.h} +14 -0
  54. data/vendor/local/include/freetype2/{ftcid.h → freetype/ftcid.h} +4 -4
  55. data/vendor/local/include/freetype2/{fterrdef.h → freetype/fterrdef.h} +39 -12
  56. data/vendor/local/include/freetype2/{fterrors.h → freetype/fterrors.h} +73 -45
  57. data/vendor/local/include/freetype2/{ftfntfmt.h → freetype/ftfntfmt.h} +7 -4
  58. data/vendor/local/include/freetype2/{ftgasp.h → freetype/ftgasp.h} +4 -4
  59. data/vendor/local/include/freetype2/{ftglyph.h → freetype/ftglyph.h} +4 -4
  60. data/vendor/local/include/freetype2/{ftgxval.h → freetype/ftgxval.h} +4 -4
  61. data/vendor/local/include/freetype2/{ftgzip.h → freetype/ftgzip.h} +4 -4
  62. data/vendor/local/include/freetype2/{ftimage.h → freetype/ftimage.h} +6 -6
  63. data/vendor/local/include/freetype2/{ftincrem.h → freetype/ftincrem.h} +4 -4
  64. data/vendor/local/include/freetype2/{ftlcdfil.h → freetype/ftlcdfil.h} +111 -76
  65. data/vendor/local/include/freetype2/{ftlist.h → freetype/ftlist.h} +4 -4
  66. data/vendor/local/include/freetype2/{ftlzw.h → freetype/ftlzw.h} +4 -4
  67. data/vendor/local/include/freetype2/{ftmac.h → freetype/ftmac.h} +4 -4
  68. data/vendor/local/include/freetype2/{ftmm.h → freetype/ftmm.h} +10 -5
  69. data/vendor/local/include/freetype2/{ftmodapi.h → freetype/ftmodapi.h} +15 -17
  70. data/vendor/local/include/freetype2/{ftmoderr.h → freetype/ftmoderr.h} +5 -5
  71. data/vendor/local/include/freetype2/{ftotval.h → freetype/ftotval.h} +4 -4
  72. data/vendor/local/include/freetype2/{ftoutln.h → freetype/ftoutln.h} +6 -6
  73. data/vendor/local/include/freetype2/{ftpfr.h → freetype/ftpfr.h} +4 -4
  74. data/vendor/local/include/freetype2/{ftrender.h → freetype/ftrender.h} +4 -4
  75. data/vendor/local/include/freetype2/{ftsizes.h → freetype/ftsizes.h} +4 -4
  76. data/vendor/local/include/freetype2/{ftsnames.h → freetype/ftsnames.h} +4 -4
  77. data/vendor/local/include/freetype2/{ftstroke.h → freetype/ftstroke.h} +4 -4
  78. data/vendor/local/include/freetype2/{ftsynth.h → freetype/ftsynth.h} +4 -4
  79. data/vendor/local/include/freetype2/{ftsystem.h → freetype/ftsystem.h} +4 -4
  80. data/vendor/local/include/freetype2/{fttrigon.h → freetype/fttrigon.h} +6 -6
  81. data/vendor/local/include/freetype2/{ftttdrv.h → freetype/ftttdrv.h} +81 -4
  82. data/vendor/local/include/freetype2/{fttypes.h → freetype/fttypes.h} +4 -4
  83. data/vendor/local/include/freetype2/{ftwinfnt.h → freetype/ftwinfnt.h} +4 -4
  84. data/vendor/local/include/freetype2/{t1tables.h → freetype/t1tables.h} +4 -4
  85. data/vendor/local/include/freetype2/{ttnameid.h → freetype/ttnameid.h} +4 -4
  86. data/vendor/local/include/freetype2/{tttables.h → freetype/tttables.h} +4 -4
  87. data/vendor/local/include/freetype2/{tttags.h → freetype/tttags.h} +4 -4
  88. data/vendor/local/include/freetype2/{ttunpat.h → freetype/ttunpat.h} +11 -8
  89. data/vendor/local/include/freetype2/ft2build.h +5 -5
  90. data/vendor/local/include/libpng16/png.h +310 -318
  91. data/vendor/local/include/libpng16/pngconf.h +8 -8
  92. data/vendor/local/include/libpng16/pnglibconf.h +3 -4
  93. data/vendor/local/include/png.h +310 -318
  94. data/vendor/local/include/pngconf.h +8 -8
  95. data/vendor/local/include/pnglibconf.h +3 -4
  96. data/vendor/local/lib/libcairo-gobject.a +0 -0
  97. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  98. data/vendor/local/lib/libcairo-gobject.la +2 -2
  99. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  100. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  101. data/vendor/local/lib/libcairo-script-interpreter.la +1 -1
  102. data/vendor/local/lib/libcairo.a +0 -0
  103. data/vendor/local/lib/libcairo.dll.a +0 -0
  104. data/vendor/local/lib/libcairo.la +1 -1
  105. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  106. data/vendor/local/lib/libfreetype.a +0 -0
  107. data/vendor/local/lib/libfreetype.dll.a +0 -0
  108. data/vendor/local/lib/libfreetype.la +1 -1
  109. data/vendor/local/lib/libpixman-1.a +0 -0
  110. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  111. data/vendor/local/lib/libpng.a +0 -0
  112. data/vendor/local/lib/libpng.dll.a +0 -0
  113. data/vendor/local/lib/libpng.la +2 -2
  114. data/vendor/local/lib/libpng16.a +0 -0
  115. data/vendor/local/lib/libpng16.dll.a +0 -0
  116. data/vendor/local/lib/libpng16.la +2 -2
  117. data/vendor/local/lib/libxml2.a +0 -0
  118. data/vendor/local/lib/libxml2.dll.a +0 -0
  119. data/vendor/local/lib/libz.a +0 -0
  120. data/vendor/local/lib/libz.dll.a +0 -0
  121. data/vendor/local/lib/pkgconfig/cairo-fc.pc +1 -1
  122. data/vendor/local/lib/pkgconfig/cairo-ft.pc +1 -1
  123. data/vendor/local/lib/pkgconfig/cairo-gobject.pc +1 -1
  124. data/vendor/local/lib/pkgconfig/cairo-pdf.pc +1 -1
  125. data/vendor/local/lib/pkgconfig/cairo-png.pc +1 -1
  126. data/vendor/local/lib/pkgconfig/cairo-ps.pc +1 -1
  127. data/vendor/local/lib/pkgconfig/cairo-script.pc +1 -1
  128. data/vendor/local/lib/pkgconfig/cairo-svg.pc +1 -1
  129. data/vendor/local/lib/pkgconfig/cairo-win32-font.pc +1 -1
  130. data/vendor/local/lib/pkgconfig/cairo-win32.pc +1 -1
  131. data/vendor/local/lib/pkgconfig/cairo.pc +1 -1
  132. data/vendor/local/lib/pkgconfig/freetype2.pc +3 -3
  133. data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
  134. data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
  135. data/vendor/local/share/aclocal/freetype2.m4 +1 -1
  136. data/vendor/local/share/gtk-doc/html/cairo/cairo-Error-handling.html +1 -1
  137. data/vendor/local/share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html +1 -1
  138. data/vendor/local/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html +1 -1
  139. data/vendor/local/share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html +4 -4
  140. data/vendor/local/share/gtk-doc/html/cairo/cairo-Paths.html +3 -3
  141. data/vendor/local/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html +6 -6
  142. data/vendor/local/share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html +3 -3
  143. data/vendor/local/share/gtk-doc/html/cairo/cairo-Regions.html +10 -10
  144. data/vendor/local/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html +3 -3
  145. data/vendor/local/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html +1 -1
  146. data/vendor/local/share/gtk-doc/html/cairo/cairo-User-Fonts.html +14 -14
  147. data/vendor/local/share/gtk-doc/html/cairo/cairo-Win32-Fonts.html +1 -1
  148. data/vendor/local/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html +5 -5
  149. data/vendor/local/share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html +1 -1
  150. data/vendor/local/share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html +1 -1
  151. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-device-t.html +3 -3
  152. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html +4 -4
  153. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html +2 -2
  154. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html +31 -31
  155. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html +12 -12
  156. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html +18 -18
  157. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-t.html +8 -8
  158. data/vendor/local/share/gtk-doc/html/cairo/cairo-text.html +11 -11
  159. data/vendor/local/share/gtk-doc/html/cairo/cairo.devhelp2 +1 -0
  160. data/vendor/local/share/gtk-doc/html/cairo/index-1.12.html +2 -2
  161. data/vendor/local/share/gtk-doc/html/cairo/index-1.14.html +52 -0
  162. data/vendor/local/share/gtk-doc/html/cairo/index.html +2 -1
  163. data/vendor/local/share/gtk-doc/html/cairo/language-bindings.html +2 -2
  164. data/vendor/local/share/license/freetype/README +7 -6
  165. data/vendor/local/share/license/freetype/README.git +1 -1
  166. data/vendor/local/share/license/libpng/README +1 -1
  167. data/vendor/local/share/man/man1/freetype-config.1 +1 -1
  168. data/vendor/local/share/man/man3/libpng.3 +308 -352
  169. data/vendor/local/share/man/man3/libpngpf.3 +2 -2
  170. data/vendor/local/share/man/man5/png.5 +4 -4
  171. metadata +72 -72
  172. data/lib/2.0/cairo.so +0 -0
  173. data/lib/2.1/cairo.so +0 -0
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* Quick computation of advance widths (specification only). */
6
6
  /* */
7
- /* Copyright 2008-2015 by */
7
+ /* Copyright 2008-2016 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, */
@@ -16,8 +16,8 @@
16
16
  /***************************************************************************/
17
17
 
18
18
 
19
- #ifndef __FTADVANC_H__
20
- #define __FTADVANC_H__
19
+ #ifndef FTADVANC_H_
20
+ #define FTADVANC_H_
21
21
 
22
22
 
23
23
  #include <ft2build.h>
@@ -181,7 +181,7 @@ FT_BEGIN_HEADER
181
181
 
182
182
  FT_END_HEADER
183
183
 
184
- #endif /* __FTADVANC_H__ */
184
+ #endif /* FTADVANC_H_ */
185
185
 
186
186
 
187
187
  /* END */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType API for controlling the auto-hinter (specification only). */
6
6
  /* */
7
- /* Copyright 2012-2015 by */
7
+ /* Copyright 2012-2016 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, */
@@ -16,8 +16,8 @@
16
16
  /***************************************************************************/
17
17
 
18
18
 
19
- #ifndef __FTAUTOH_H__
20
- #define __FTAUTOH_H__
19
+ #ifndef FTAUTOH_H_
20
+ #define FTAUTOH_H_
21
21
 
22
22
  #include <ft2build.h>
23
23
  #include FT_FREETYPE_H
@@ -247,8 +247,8 @@ FT_BEGIN_HEADER
247
247
  */
248
248
  typedef struct FT_Prop_GlyphToScriptMap_
249
249
  {
250
- FT_Face face;
251
- FT_Byte* map;
250
+ FT_Face face;
251
+ FT_UShort* map;
252
252
 
253
253
  } FT_Prop_GlyphToScriptMap;
254
254
 
@@ -439,12 +439,65 @@ FT_BEGIN_HEADER
439
439
  */
440
440
 
441
441
 
442
+ /**************************************************************************
443
+ *
444
+ * @property:
445
+ * no-stem-darkening[autofit]
446
+ *
447
+ * @description:
448
+ * *Experimental* *only,* *requires* *linear* *alpha* *blending* *and*
449
+ * *gamma* *correction*
450
+ *
451
+ * Stem darkening emboldens glyphs at smaller sizes to make them more
452
+ * readable on common low-DPI screens when using linear alpha blending
453
+ * and gamma correction, see @FT_Render_Glyph. When not using linear
454
+ * alpha blending and gamma correction, glyphs will appear heavy and
455
+ * fuzzy!
456
+ *
457
+ * Gamma correction essentially lightens fonts since shades of grey are
458
+ * shifted to higher pixel values (=~higher brightness) to match the
459
+ * original intention to the reality of our screens. The side-effect is
460
+ * that glyphs `thin out'. Mac OS~X and Adobe's proprietary font
461
+ * rendering library implement a counter-measure: stem darkening at
462
+ * smaller sizes where shades of gray dominate. By emboldening a glyph
463
+ * slightly in relation to its pixel size, individual pixels get higher
464
+ * coverage of filled-in outlines and are therefore `blacker'. This
465
+ * counteracts the `thinning out' of glyphs, making text remain readable
466
+ * at smaller sizes. All glyphs that pass through the auto-hinter will
467
+ * be emboldened unless this property is set to TRUE.
468
+ *
469
+ * See the description of the CFF driver for algorithmic details. Total
470
+ * consistency with the CFF driver is currently not achieved because the
471
+ * emboldening method differs and glyphs must be scaled down on the
472
+ * Y-axis to keep outline points inside their precomputed blue zones.
473
+ * The smaller the size (especially 9ppem and down), the higher the loss
474
+ * of emboldening versus the CFF driver.
475
+ *
476
+ */
477
+
478
+
479
+ /**************************************************************************
480
+ *
481
+ * @property:
482
+ * darkening-parameters[autofit]
483
+ *
484
+ * @description:
485
+ * *Experimental* *only*
486
+ *
487
+ * See the description of the CFF driver for details. This
488
+ * implementation appropriates the
489
+ * CFF_CONFIG_OPTION_DARKENING_PARAMETER_* #defines for consistency.
490
+ * Note the differences described in @no-stem-darkening[autofit].
491
+ *
492
+ */
493
+
494
+
442
495
  /* */
443
496
 
444
497
 
445
498
  FT_END_HEADER
446
499
 
447
- #endif /* __FTAUTOH_H__ */
500
+ #endif /* FTAUTOH_H_ */
448
501
 
449
502
 
450
503
  /* END */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType exact bbox computation (specification). */
6
6
  /* */
7
- /* Copyright 1996-2015 by */
7
+ /* Copyright 1996-2016 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, */
@@ -27,8 +27,8 @@
27
27
  /*************************************************************************/
28
28
 
29
29
 
30
- #ifndef __FTBBOX_H__
31
- #define __FTBBOX_H__
30
+ #ifndef FTBBOX_H_
31
+ #define FTBBOX_H_
32
32
 
33
33
 
34
34
  #include <ft2build.h>
@@ -90,7 +90,7 @@ FT_BEGIN_HEADER
90
90
 
91
91
  FT_END_HEADER
92
92
 
93
- #endif /* __FTBBOX_H__ */
93
+ #endif /* FTBBOX_H_ */
94
94
 
95
95
 
96
96
  /* END */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType API for accessing BDF-specific strings (specification). */
6
6
  /* */
7
- /* Copyright 2002-2015 by */
7
+ /* Copyright 2002-2016 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, */
@@ -16,8 +16,8 @@
16
16
  /***************************************************************************/
17
17
 
18
18
 
19
- #ifndef __FTBDF_H__
20
- #define __FTBDF_H__
19
+ #ifndef FTBDF_H_
20
+ #define FTBDF_H_
21
21
 
22
22
  #include <ft2build.h>
23
23
  #include FT_FREETYPE_H
@@ -204,7 +204,7 @@ FT_BEGIN_HEADER
204
204
 
205
205
  FT_END_HEADER
206
206
 
207
- #endif /* __FTBDF_H__ */
207
+ #endif /* FTBDF_H_ */
208
208
 
209
209
 
210
210
  /* END */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType utility functions for bitmaps (specification). */
6
6
  /* */
7
- /* Copyright 2004-2015 by */
7
+ /* Copyright 2004-2016 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, */
@@ -16,8 +16,8 @@
16
16
  /***************************************************************************/
17
17
 
18
18
 
19
- #ifndef __FTBITMAP_H__
20
- #define __FTBITMAP_H__
19
+ #ifndef FTBITMAP_H_
20
+ #define FTBITMAP_H_
21
21
 
22
22
 
23
23
  #include <ft2build.h>
@@ -234,7 +234,7 @@ FT_BEGIN_HEADER
234
234
 
235
235
  FT_END_HEADER
236
236
 
237
- #endif /* __FTBITMAP_H__ */
237
+ #endif /* FTBITMAP_H_ */
238
238
 
239
239
 
240
240
  /* END */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* Bzip2-compressed stream support. */
6
6
  /* */
7
- /* Copyright 2010-2015 by */
7
+ /* Copyright 2010-2016 by */
8
8
  /* Joel Klinghed. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -16,8 +16,8 @@
16
16
  /***************************************************************************/
17
17
 
18
18
 
19
- #ifndef __FTBZIP2_H__
20
- #define __FTBZIP2_H__
19
+ #ifndef FTBZIP2_H_
20
+ #define FTBZIP2_H_
21
21
 
22
22
  #include <ft2build.h>
23
23
  #include FT_FREETYPE_H
@@ -96,7 +96,7 @@ FT_BEGIN_HEADER
96
96
 
97
97
  FT_END_HEADER
98
98
 
99
- #endif /* __FTBZIP2_H__ */
99
+ #endif /* FTBZIP2_H_ */
100
100
 
101
101
 
102
102
  /* END */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType Cache subsystem (specification). */
6
6
  /* */
7
- /* Copyright 1996-2015 by */
7
+ /* Copyright 1996-2016 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, */
@@ -16,8 +16,8 @@
16
16
  /***************************************************************************/
17
17
 
18
18
 
19
- #ifndef __FTCACHE_H__
20
- #define __FTCACHE_H__
19
+ #ifndef FTCACHE_H_
20
+ #define FTCACHE_H_
21
21
 
22
22
 
23
23
  #include <ft2build.h>
@@ -1051,7 +1051,7 @@ FT_BEGIN_HEADER
1051
1051
 
1052
1052
  FT_END_HEADER
1053
1053
 
1054
- #endif /* __FTCACHE_H__ */
1054
+ #endif /* FTCACHE_H_ */
1055
1055
 
1056
1056
 
1057
1057
  /* END */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType API for controlling the CFF driver (specification only). */
6
6
  /* */
7
- /* Copyright 2013-2015 by */
7
+ /* Copyright 2013-2016 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, */
@@ -16,8 +16,8 @@
16
16
  /***************************************************************************/
17
17
 
18
18
 
19
- #ifndef __FTCFFDRV_H__
20
- #define __FTCFFDRV_H__
19
+ #ifndef FTCFFDRV_H_
20
+ #define FTCFFDRV_H_
21
21
 
22
22
  #include <ft2build.h>
23
23
  #include FT_FREETYPE_H
@@ -111,8 +111,8 @@ FT_BEGIN_HEADER
111
111
  *
112
112
  * @order:
113
113
  * hinting-engine
114
- * no-stem-darkening
115
- * darkening-parameters
114
+ * no-stem-darkening[cff]
115
+ * darkening-parameters[cff]
116
116
  *
117
117
  */
118
118
 
@@ -175,7 +175,7 @@ FT_BEGIN_HEADER
175
175
  /**************************************************************************
176
176
  *
177
177
  * @property:
178
- * no-stem-darkening
178
+ * no-stem-darkening[cff]
179
179
  *
180
180
  * @description:
181
181
  * By default, the Adobe CFF engine darkens stems at smaller sizes,
@@ -205,7 +205,7 @@ FT_BEGIN_HEADER
205
205
  /**************************************************************************
206
206
  *
207
207
  * @property:
208
- * darkening-parameters
208
+ * darkening-parameters[cff]
209
209
  *
210
210
  * @description:
211
211
  * By default, the Adobe CFF engine darkens stems as follows (if the
@@ -256,7 +256,7 @@ FT_BEGIN_HEADER
256
256
  FT_END_HEADER
257
257
 
258
258
 
259
- #endif /* __FTCFFDRV_H__ */
259
+ #endif /* FTCFFDRV_H_ */
260
260
 
261
261
 
262
262
  /* END */
@@ -119,3 +119,17 @@
119
119
  /* lcd_filtering */
120
120
  /* */
121
121
  /***************************************************************************/
122
+
123
+ /***************************************************************************/
124
+ /* */
125
+ /* <Chapter> */
126
+ /* error_codes */
127
+ /* */
128
+ /* <Title> */
129
+ /* Error Codes */
130
+ /* */
131
+ /* <Sections> */
132
+ /* error_enumerations */
133
+ /* error_code_values */
134
+ /* */
135
+ /***************************************************************************/
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType API for accessing CID font information (specification). */
6
6
  /* */
7
- /* Copyright 2007-2015 by */
7
+ /* Copyright 2007-2016 by */
8
8
  /* Dereg Clegg and Michael Toftdal. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -16,8 +16,8 @@
16
16
  /***************************************************************************/
17
17
 
18
18
 
19
- #ifndef __FTCID_H__
20
- #define __FTCID_H__
19
+ #ifndef FTCID_H_
20
+ #define FTCID_H_
21
21
 
22
22
  #include <ft2build.h>
23
23
  #include FT_FREETYPE_H
@@ -162,7 +162,7 @@ FT_BEGIN_HEADER
162
162
 
163
163
  FT_END_HEADER
164
164
 
165
- #endif /* __FTCID_H__ */
165
+ #endif /* FTCID_H_ */
166
166
 
167
167
 
168
168
  /* END */
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType error codes (specification). */
6
6
  /* */
7
- /* Copyright 2002-2015 by */
7
+ /* Copyright 2002-2016 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, */
@@ -16,18 +16,43 @@
16
16
  /***************************************************************************/
17
17
 
18
18
 
19
- /*******************************************************************/
20
- /*******************************************************************/
21
- /***** *****/
22
- /***** LIST OF ERROR CODES/MESSAGES *****/
23
- /***** *****/
24
- /*******************************************************************/
25
- /*******************************************************************/
19
+ /*************************************************************************/
20
+ /* */
21
+ /* <Section> */
22
+ /* error_code_values */
23
+ /* */
24
+ /* <Title> */
25
+ /* Error Code Values */
26
+ /* */
27
+ /* <Abstract> */
28
+ /* All possible error codes returned by FreeType functions. */
29
+ /* */
30
+ /* <Description> */
31
+ /* The list below is taken verbatim from the file `fterrdef.h' */
32
+ /* (loaded automatically by including `FT_FREETYPE_H'). The first */
33
+ /* argument of the `FT_ERROR_DEF_' macro is the error label; by */
34
+ /* default, the prefix `FT_Err_' gets added so that you get error */
35
+ /* names like `FT_Err_Cannot_Open_Resource'. The second argument is */
36
+ /* the error code, and the last argument an error string, which is not */
37
+ /* used by FreeType. */
38
+ /* */
39
+ /* Within your application you should *only* use error names and */
40
+ /* *never* its numeric values! The latter might (and actually do) */
41
+ /* change in forthcoming FreeType versions. */
42
+ /* */
43
+ /* Macro `FT_NOERRORDEF_' defines `FT_Err_Ok', which is always zero. */
44
+ /* See the `Error Enumerations' subsection how to automatically */
45
+ /* generate a list of error strings. */
46
+ /* */
47
+ /*************************************************************************/
26
48
 
27
49
 
28
- /* You need to define both FT_ERRORDEF_ and FT_NOERRORDEF_ before */
29
- /* including this file. */
30
-
50
+ /*************************************************************************/
51
+ /* */
52
+ /* <Enum> */
53
+ /* FT_Err_XXX */
54
+ /* */
55
+ /*************************************************************************/
31
56
 
32
57
  /* generic errors */
33
58
 
@@ -218,7 +243,7 @@
218
243
  FT_ERRORDEF_( No_Unicode_Glyph_Name, 0xA3,
219
244
  "no Unicode glyph name found" )
220
245
  FT_ERRORDEF_( Glyph_Too_Big, 0xA4,
221
- "glyph to big for hinting" )
246
+ "glyph too big for hinting" )
222
247
 
223
248
  /* BDF errors */
224
249
 
@@ -245,5 +270,7 @@
245
270
  FT_ERRORDEF_( Corrupted_Font_Glyphs, 0xBA,
246
271
  "Font glyphs corrupted or missing fields" )
247
272
 
273
+ /* */
274
+
248
275
 
249
276
  /* END */