cairo 1.14.0-x64-mingw32 → 1.14.1-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 (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/ftincrem.h CHANGED
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType incremental loading (specification). */
6
6
  /* */
7
- /* Copyright 2002, 2003, 2006, 2007, 2008, 2010 by */
7
+ /* Copyright 2002, 2003, 2006-2008, 2010, 2014 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, */
@@ -45,7 +45,7 @@ FT_BEGIN_HEADER
45
45
  * @description:
46
46
  * This section contains various functions used to perform so-called
47
47
  * `incremental' glyph loading. This is a mode where all glyphs loaded
48
- * from a given @FT_Face are provided by the client application,
48
+ * from a given @FT_Face are provided by the client application.
49
49
  *
50
50
  * Apart from that, all other tables are loaded normally from the font
51
51
  * file. This mode is useful when FreeType is used within another
@@ -345,6 +345,7 @@ FT_BEGIN_HEADER
345
345
 
346
346
  /* */
347
347
 
348
+
348
349
  FT_END_HEADER
349
350
 
350
351
  #endif /* __FTINCREM_H__ */
data/vendor/local/include/freetype2/ftlist.h CHANGED
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* Generic list support for FreeType (specification). */
6
6
  /* */
7
- /* Copyright 1996-2001, 2003, 2007, 2010, 2013 by */
7
+ /* Copyright 1996-2001, 2003, 2007, 2010, 2013, 2014 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, */
@@ -248,7 +248,7 @@ FT_BEGIN_HEADER
248
248
  /* list :: A handle to the list. */
249
249
  /* */
250
250
  /* destroy :: A list destructor that will be applied to each element */
251
- /* of the list. */
251
+ /* of the list. Set this to NULL if not needed. */
252
252
  /* */
253
253
  /* memory :: The current memory object that handles deallocation. */
254
254
  /* */
@@ -265,7 +265,6 @@ FT_BEGIN_HEADER
265
265
  FT_Memory memory,
266
266
  void* user );
267
267
 
268
-
269
268
  /* */
270
269
 
271
270
 
data/vendor/local/include/freetype2/ftlzw.h CHANGED
@@ -88,7 +88,7 @@ FT_BEGIN_HEADER
88
88
  FT_Stream_OpenLZW( FT_Stream stream,
89
89
  FT_Stream source );
90
90
 
91
- /* */
91
+ /* */
92
92
 
93
93
 
94
94
  FT_END_HEADER
data/vendor/local/include/freetype2/ftmm.h CHANGED
@@ -218,9 +218,6 @@ FT_BEGIN_HEADER
218
218
  } FT_MM_Var;
219
219
 
220
220
 
221
- /* */
222
-
223
-
224
221
  /*************************************************************************/
225
222
  /* */
226
223
  /* <Function> */
@@ -365,7 +362,6 @@ FT_BEGIN_HEADER
365
362
  FT_UInt num_coords,
366
363
  FT_Fixed* coords );
367
364
 
368
-
369
365
  /* */
370
366
 
371
367
 
data/vendor/local/include/freetype2/ftmodapi.h CHANGED
@@ -75,6 +75,33 @@ FT_BEGIN_HEADER
75
75
  /* */
76
76
  /* Note that the FreeType Cache sub-system is not a FreeType module. */
77
77
  /* */
78
+ /* <Order> */
79
+ /* FT_Module */
80
+ /* FT_Module_Constructor */
81
+ /* FT_Module_Destructor */
82
+ /* FT_Module_Requester */
83
+ /* FT_Module_Class */
84
+ /* */
85
+ /* FT_Add_Module */
86
+ /* FT_Get_Module */
87
+ /* FT_Remove_Module */
88
+ /* FT_Add_Default_Modules */
89
+ /* */
90
+ /* FT_Property_Set */
91
+ /* FT_Property_Get */
92
+ /* */
93
+ /* FT_New_Library */
94
+ /* FT_Done_Library */
95
+ /* FT_Reference_Library */
96
+ /* */
97
+ /* FT_Renderer */
98
+ /* FT_Renderer_Class */
99
+ /* */
100
+ /* FT_Get_Renderer */
101
+ /* FT_Set_Renderer */
102
+ /* */
103
+ /* FT_Set_Debug_Hook */
104
+ /* */
78
105
  /*************************************************************************/
79
106
 
80
107
 
@@ -491,7 +518,7 @@ FT_BEGIN_HEADER
491
518
  FT_EXPORT( FT_Error )
492
519
  FT_Done_Library( FT_Library library );
493
520
 
494
- /* */
521
+ /* */
495
522
 
496
523
  typedef void
497
524
  (*FT_DebugHook_Func)( void* arg );
@@ -629,7 +656,6 @@ FT_BEGIN_HEADER
629
656
  FT_EXPORT( FT_TrueTypeEngineType )
630
657
  FT_Get_TrueType_Engine_Type( FT_Library library );
631
658
 
632
-
633
659
  /* */
634
660
 
635
661
 
data/vendor/local/include/freetype2/ftotval.h CHANGED
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType API for validating OpenType tables (specification). */
6
6
  /* */
7
- /* Copyright 2004-2007, 2013 by */
7
+ /* Copyright 2004-2007, 2013, 2014 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, */
@@ -58,6 +58,12 @@ FT_BEGIN_HEADER
58
58
  /* This section contains the declaration of functions to validate */
59
59
  /* some OpenType tables (BASE, GDEF, GPOS, GSUB, JSTF, MATH). */
60
60
  /* */
61
+ /* <Order> */
62
+ /* FT_OpenType_Validate */
63
+ /* FT_OpenType_Free */
64
+ /* */
65
+ /* FT_VALIDATE_OTXXX */
66
+ /* */
61
67
  /*************************************************************************/
62
68
 
63
69
 
@@ -107,8 +113,6 @@ FT_BEGIN_HEADER
107
113
  FT_VALIDATE_JSTF | \
108
114
  FT_VALIDATE_MATH
109
115
 
110
- /* */
111
-
112
116
  /**********************************************************************
113
117
  *
114
118
  * @function:
@@ -165,8 +169,6 @@ FT_BEGIN_HEADER
165
169
  FT_Bytes *GSUB_table,
166
170
  FT_Bytes *JSTF_table );
167
171
 
168
- /* */
169
-
170
172
  /**********************************************************************
171
173
  *
172
174
  * @function:
@@ -191,8 +193,7 @@ FT_BEGIN_HEADER
191
193
  FT_OpenType_Free( FT_Face face,
192
194
  FT_Bytes table );
193
195
 
194
-
195
- /* */
196
+ /* */
196
197
 
197
198
 
198
199
  FT_END_HEADER
data/vendor/local/include/freetype2/ftoutln.h CHANGED
@@ -52,7 +52,6 @@ FT_BEGIN_HEADER
52
52
  /* */
53
53
  /* <Order> */
54
54
  /* FT_Outline */
55
- /* FT_OUTLINE_FLAGS */
56
55
  /* FT_Outline_New */
57
56
  /* FT_Outline_Done */
58
57
  /* FT_Outline_Copy */
@@ -68,13 +67,17 @@ FT_BEGIN_HEADER
68
67
  /* */
69
68
  /* FT_Outline_Get_Bitmap */
70
69
  /* FT_Outline_Render */
71
- /* */
72
70
  /* FT_Outline_Decompose */
73
71
  /* FT_Outline_Funcs */
74
- /* FT_Outline_MoveTo_Func */
75
- /* FT_Outline_LineTo_Func */
76
- /* FT_Outline_ConicTo_Func */
77
- /* FT_Outline_CubicTo_Func */
72
+ /* FT_Outline_MoveToFunc */
73
+ /* FT_Outline_LineToFunc */
74
+ /* FT_Outline_ConicToFunc */
75
+ /* FT_Outline_CubicToFunc */
76
+ /* */
77
+ /* FT_Orientation */
78
+ /* FT_Outline_Get_Orientation */
79
+ /* */
80
+ /* FT_OUTLINE_XXX */
78
81
  /* */
79
82
  /*************************************************************************/
80
83
 
@@ -535,7 +538,7 @@ FT_BEGIN_HEADER
535
538
  *
536
539
  * @description:
537
540
  * This function analyzes a glyph outline and tries to compute its
538
- * fill orientation (see @FT_Orientation). This is done by integrating
541
+ * fill orientation (see @FT_Orientation). This is done by integrating
539
542
  * the total area covered by the outline. The positive integral
540
543
  * corresponds to the clockwise orientation and @FT_ORIENTATION_POSTSCRIPT
541
544
  * is returned. The negative integral corresponds to the counter-clockwise
@@ -555,7 +558,6 @@ FT_BEGIN_HEADER
555
558
  FT_EXPORT( FT_Orientation )
556
559
  FT_Outline_Get_Orientation( FT_Outline* outline );
557
560
 
558
-
559
561
  /* */
560
562
 
561
563
 
data/vendor/local/include/freetype2/ftpfr.h CHANGED
@@ -161,7 +161,7 @@ FT_BEGIN_HEADER
161
161
  FT_UInt gindex,
162
162
  FT_Pos *aadvance );
163
163
 
164
- /* */
164
+ /* */
165
165
 
166
166
 
167
167
  FT_END_HEADER
data/vendor/local/include/freetype2/ftrender.h CHANGED
@@ -226,7 +226,6 @@ FT_BEGIN_HEADER
226
226
  FT_UInt num_params,
227
227
  FT_Parameter* parameters );
228
228
 
229
-
230
229
  /* */
231
230
 
232
231
 
data/vendor/local/include/freetype2/ftstroke.h CHANGED
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType path stroker (specification). */
6
6
  /* */
7
- /* Copyright 2002-2006, 2008, 2009, 2011-2012 by */
7
+ /* Copyright 2002-2006, 2008, 2009, 2011-2012, 2014 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, */
@@ -46,6 +46,38 @@ FT_BEGIN_HEADER
46
46
  * This can be useful to generate `bordered' glyph, i.e., glyphs
47
47
  * displayed with a coloured (and anti-aliased) border around their
48
48
  * shape.
49
+ *
50
+ * @order:
51
+ * FT_Stroker
52
+ *
53
+ * FT_Stroker_LineJoin
54
+ * FT_Stroker_LineCap
55
+ * FT_StrokerBorder
56
+ *
57
+ * FT_Outline_GetInsideBorder
58
+ * FT_Outline_GetOutsideBorder
59
+ *
60
+ * FT_Glyph_Stroke
61
+ * FT_Glyph_StrokeBorder
62
+ *
63
+ * FT_Stroker_New
64
+ * FT_Stroker_Set
65
+ * FT_Stroker_Rewind
66
+ * FT_Stroker_ParseOutline
67
+ * FT_Stroker_Done
68
+ *
69
+ * FT_Stroker_BeginSubPath
70
+ * FT_Stroker_EndSubPath
71
+ *
72
+ * FT_Stroker_LineTo
73
+ * FT_Stroker_ConicTo
74
+ * FT_Stroker_CubicTo
75
+ *
76
+ * FT_Stroker_GetBorderCounts
77
+ * FT_Stroker_ExportBorder
78
+ * FT_Stroker_GetCounts
79
+ * FT_Stroker_Export
80
+ *
49
81
  */
50
82
 
51
83
 
@@ -55,7 +87,7 @@ FT_BEGIN_HEADER
55
87
  * FT_Stroker
56
88
  *
57
89
  * @description:
58
- * Opaque handler to a path stroker object.
90
+ * Opaque handle to a path stroker object.
59
91
  */
60
92
  typedef struct FT_StrokerRec_* FT_Stroker;
61
93
 
@@ -276,6 +308,8 @@ FT_BEGIN_HEADER
276
308
  * @note:
277
309
  * The radius is expressed in the same units as the outline
278
310
  * coordinates.
311
+ *
312
+ * This function calls @FT_Stroker_Rewind automatically.
279
313
  */
280
314
  FT_EXPORT( void )
281
315
  FT_Stroker_Set( FT_Stroker stroker,
@@ -570,10 +604,10 @@ FT_BEGIN_HEADER
570
604
  * receive all new data.
571
605
  *
572
606
  * When an outline, or a sub-path, is `closed', the stroker generates
573
- * two independent `border' outlines, named `left' and `right'
607
+ * two independent `border' outlines, named `left' and `right'.
574
608
  *
575
609
  * When the outline, or a sub-path, is `opened', the stroker merges
576
- * the `border' outlines with caps. The `left' border receives all
610
+ * the `border' outlines with caps. The `left' border receives all
577
611
  * points, while the `right' border becomes empty.
578
612
  *
579
613
  * Use the function @FT_Stroker_Export instead if you want to
@@ -736,7 +770,7 @@ FT_BEGIN_HEADER
736
770
  FT_Bool inside,
737
771
  FT_Bool destroy );
738
772
 
739
- /* */
773
+ /* */
740
774
 
741
775
  FT_END_HEADER
742
776
 
data/vendor/local/include/freetype2/ftsynth.h CHANGED
@@ -73,6 +73,7 @@ FT_BEGIN_HEADER
73
73
 
74
74
  /* */
75
75
 
76
+
76
77
  FT_END_HEADER
77
78
 
78
79
  #endif /* __FTSYNTH_H__ */
data/vendor/local/include/freetype2/ftsystem.h CHANGED
@@ -335,7 +335,6 @@ FT_BEGIN_HEADER
335
335
 
336
336
  } FT_StreamRec;
337
337
 
338
-
339
338
  /* */
340
339
 
341
340
 
data/vendor/local/include/freetype2/fttrigon.h CHANGED
@@ -237,7 +237,7 @@ FT_BEGIN_HEADER
237
237
  *
238
238
  * @input:
239
239
  * angle ::
240
- * The address of angle.
240
+ * The input angle.
241
241
  *
242
242
  */
243
243
  FT_EXPORT( void )
@@ -259,7 +259,7 @@ FT_BEGIN_HEADER
259
259
  *
260
260
  * @input:
261
261
  * angle ::
262
- * The address of angle.
262
+ * The input angle.
263
263
  *
264
264
  */
265
265
  FT_EXPORT( void )
data/vendor/local/include/freetype2/ftttdrv.h CHANGED
@@ -158,9 +158,9 @@ FT_BEGIN_HEADER
158
158
  #define TT_INTERPRETER_VERSION_35 35
159
159
  #define TT_INTERPRETER_VERSION_38 38
160
160
 
161
-
162
161
  /* */
163
162
 
163
+
164
164
  FT_END_HEADER
165
165
 
166
166
 
data/vendor/local/include/freetype2/fttypes.h CHANGED
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType simple types definitions (specification only). */
6
6
  /* */
7
- /* Copyright 1996-2002, 2004, 2006-2009, 2012, 2013 by */
7
+ /* Copyright 1996-2002, 2004, 2006-2009, 2012-2014 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, */
@@ -57,6 +57,8 @@ FT_BEGIN_HEADER
57
57
  /* FT_UInt16 */
58
58
  /* FT_Int32 */
59
59
  /* FT_UInt32 */
60
+ /* FT_Int64 */
61
+ /* FT_UInt64 */
60
62
  /* FT_Short */
61
63
  /* FT_UShort */
62
64
  /* FT_Long */
@@ -78,7 +80,9 @@ FT_BEGIN_HEADER
78
80
  /* FT_F2Dot14 */
79
81
  /* FT_UnitVector */
80
82
  /* FT_F26Dot6 */
83
+ /* FT_Data */
81
84
  /* */
85
+ /* FT_MAKE_TAG */
82
86
  /* */
83
87
  /* FT_Generic */
84
88
  /* FT_Generic_Finalizer */
@@ -567,9 +571,9 @@ FT_BEGIN_HEADER
567
571
 
568
572
  } FT_ListRec;
569
573
 
570
-
571
574
  /* */
572
575
 
576
+
573
577
  #define FT_IS_EMPTY( list ) ( (list).head == 0 )
574
578
  #define FT_BOOL( x ) ( (FT_Bool)( x ) )
575
579
 
data/vendor/local/include/freetype2/ftwinfnt.h CHANGED
@@ -259,9 +259,9 @@ FT_BEGIN_HEADER
259
259
  FT_Get_WinFNT_Header( FT_Face face,
260
260
  FT_WinFNT_HeaderRec *aheader );
261
261
 
262
-
263
262
  /* */
264
263
 
264
+
265
265
  FT_END_HEADER
266
266
 
267
267
  #endif /* __FTWINFNT_H__ */
data/vendor/local/include/freetype2/ftxf86.h CHANGED
@@ -76,7 +76,8 @@ FT_BEGIN_HEADER
76
76
  FT_EXPORT( const char* )
77
77
  FT_Get_X11_Font_Format( FT_Face face );
78
78
 
79
- /* */
79
+ /* */
80
+
80
81
 
81
82
  FT_END_HEADER
82
83
 
data/vendor/local/include/freetype2/t1tables.h CHANGED
@@ -5,7 +5,7 @@
5
5
  /* Basic Type 1/Type 2 tables definitions and interface (specification */
6
6
  /* only). */
7
7
  /* */
8
- /* Copyright 1996-2004, 2006, 2008, 2009, 2011 by */
8
+ /* Copyright 1996-2004, 2006, 2008, 2009, 2011, 2014 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, */
@@ -49,6 +49,26 @@ FT_BEGIN_HEADER
49
49
  /* This section contains the definition of Type 1-specific tables, */
50
50
  /* including structures related to other PostScript font formats. */
51
51
  /* */
52
+ /* <Order> */
53
+ /* PS_FontInfoRec */
54
+ /* PS_FontInfo */
55
+ /* PS_PrivateRec */
56
+ /* PS_Private */
57
+ /* */
58
+ /* CID_FaceDictRec */
59
+ /* CID_FaceDict */
60
+ /* CID_FaceInfoRec */
61
+ /* CID_FaceInfo */
62
+ /* */
63
+ /* FT_Has_PS_Glyph_Names */
64
+ /* FT_Get_PS_Font_Info */
65
+ /* FT_Get_PS_Font_Private */
66
+ /* FT_Get_PS_Font_Value */
67
+ /* */
68
+ /* T1_Blend_Flags */
69
+ /* T1_EncodingType */
70
+ /* PS_Dict_Keys */
71
+ /* */
52
72
  /*************************************************************************/
53
73
 
54
74
 
@@ -190,14 +210,30 @@ FT_BEGIN_HEADER
190
210
  /* given blend dictionary (font info or private). Used to support */
191
211
  /* Multiple Masters fonts. */
192
212
  /* */
213
+ /* <Values> */
214
+ /* T1_BLEND_UNDERLINE_POSITION :: */
215
+ /* T1_BLEND_UNDERLINE_THICKNESS :: */
216
+ /* T1_BLEND_ITALIC_ANGLE :: */
217
+ /* T1_BLEND_BLUE_VALUES :: */
218
+ /* T1_BLEND_OTHER_BLUES :: */
219
+ /* T1_BLEND_STANDARD_WIDTH :: */
220
+ /* T1_BLEND_STANDARD_HEIGHT :: */
221
+ /* T1_BLEND_STEM_SNAP_WIDTHS :: */
222
+ /* T1_BLEND_STEM_SNAP_HEIGHTS :: */
223
+ /* T1_BLEND_BLUE_SCALE :: */
224
+ /* T1_BLEND_BLUE_SHIFT :: */
225
+ /* T1_BLEND_FAMILY_BLUES :: */
226
+ /* T1_BLEND_FAMILY_OTHER_BLUES :: */
227
+ /* T1_BLEND_FORCE_BOLD :: */
228
+ /* */
193
229
  typedef enum T1_Blend_Flags_
194
230
  {
195
- /*# required fields in a FontInfo blend dictionary */
231
+ /* required fields in a FontInfo blend dictionary */
196
232
  T1_BLEND_UNDERLINE_POSITION = 0,
197
233
  T1_BLEND_UNDERLINE_THICKNESS,
198
234
  T1_BLEND_ITALIC_ANGLE,
199
235
 
200
- /*# required fields in a Private blend dictionary */
236
+ /* required fields in a Private blend dictionary */
201
237
  T1_BLEND_BLUE_VALUES,
202
238
  T1_BLEND_OTHER_BLUES,
203
239
  T1_BLEND_STANDARD_WIDTH,
@@ -210,15 +246,13 @@ FT_BEGIN_HEADER
210
246
  T1_BLEND_FAMILY_OTHER_BLUES,
211
247
  T1_BLEND_FORCE_BOLD,
212
248
 
213
- /*# never remove */
214
- T1_BLEND_MAX
249
+ T1_BLEND_MAX /* do not remove */
215
250
 
216
251
  } T1_Blend_Flags;
217
252
 
218
- /* */
219
253
 
220
-
221
- /*# backwards compatible definitions */
254
+ /* these constants are deprecated; use the corresponding */
255
+ /* `T1_Blend_Flags' values instead */
222
256
  #define t1_blend_underline_position T1_BLEND_UNDERLINE_POSITION
223
257
  #define t1_blend_underline_thickness T1_BLEND_UNDERLINE_THICKNESS
224
258
  #define t1_blend_italic_angle T1_BLEND_ITALIC_ANGLE
@@ -235,6 +269,8 @@ FT_BEGIN_HEADER
235
269
  #define t1_blend_force_bold T1_BLEND_FORCE_BOLD
236
270
  #define t1_blend_max T1_BLEND_MAX
237
271
 
272
+ /* */
273
+
238
274
 
239
275
  /* maximum number of Multiple Masters designs, as defined in the spec */
240
276
  #define T1_MAX_MM_DESIGNS 16
@@ -333,10 +369,17 @@ FT_BEGIN_HEADER
333
369
  /* */
334
370
  typedef struct CID_FaceDictRec_* CID_FaceDict;
335
371
 
336
- /* */
337
-
338
372
 
339
- /* backwards-compatible definition */
373
+ /*************************************************************************/
374
+ /* */
375
+ /* <Struct> */
376
+ /* CID_FontDict */
377
+ /* */
378
+ /* <Description> */
379
+ /* This type is equivalent to @CID_FaceDictRec. It is deprecated but */
380
+ /* kept to maintain source compatibility between various versions of */
381
+ /* FreeType. */
382
+ /* */
340
383
  typedef CID_FaceDictRec CID_FontDict;
341
384
 
342
385
 
@@ -503,6 +546,13 @@ FT_BEGIN_HEADER
503
546
  /* An enumeration describing the `Encoding' entry in a Type 1 */
504
547
  /* dictionary. */
505
548
  /* */
549
+ /* <Values> */
550
+ /* T1_ENCODING_TYPE_NONE :: */
551
+ /* T1_ENCODING_TYPE_ARRAY :: */
552
+ /* T1_ENCODING_TYPE_STANDARD :: */
553
+ /* T1_ENCODING_TYPE_ISOLATIN1 :: */
554
+ /* T1_ENCODING_TYPE_EXPERT :: */
555
+ /* */
506
556
  typedef enum T1_EncodingType_
507
557
  {
508
558
  T1_ENCODING_TYPE_NONE = 0,
@@ -523,6 +573,54 @@ FT_BEGIN_HEADER
523
573
  /* An enumeration used in calls to @FT_Get_PS_Font_Value to identify */
524
574
  /* the Type~1 dictionary entry to retrieve. */
525
575
  /* */
576
+ /* <Values> */
577
+ /* PS_DICT_FONT_TYPE :: */
578
+ /* PS_DICT_FONT_MATRIX :: */
579
+ /* PS_DICT_FONT_BBOX :: */
580
+ /* PS_DICT_PAINT_TYPE :: */
581
+ /* PS_DICT_FONT_NAME :: */
582
+ /* PS_DICT_UNIQUE_ID :: */
583
+ /* PS_DICT_NUM_CHAR_STRINGS :: */
584
+ /* PS_DICT_CHAR_STRING_KEY :: */
585
+ /* PS_DICT_CHAR_STRING :: */
586
+ /* PS_DICT_ENCODING_TYPE :: */
587
+ /* PS_DICT_ENCODING_ENTRY :: */
588
+ /* PS_DICT_NUM_SUBRS :: */
589
+ /* PS_DICT_SUBR :: */
590
+ /* PS_DICT_STD_HW :: */
591
+ /* PS_DICT_STD_VW :: */
592
+ /* PS_DICT_NUM_BLUE_VALUES :: */
593
+ /* PS_DICT_BLUE_VALUE :: */
594
+ /* PS_DICT_BLUE_FUZZ :: */
595
+ /* PS_DICT_NUM_OTHER_BLUES :: */
596
+ /* PS_DICT_OTHER_BLUE :: */
597
+ /* PS_DICT_NUM_FAMILY_BLUES :: */
598
+ /* PS_DICT_FAMILY_BLUE :: */
599
+ /* PS_DICT_NUM_FAMILY_OTHER_BLUES :: */
600
+ /* PS_DICT_FAMILY_OTHER_BLUE :: */
601
+ /* PS_DICT_BLUE_SCALE :: */
602
+ /* PS_DICT_BLUE_SHIFT :: */
603
+ /* PS_DICT_NUM_STEM_SNAP_H :: */
604
+ /* PS_DICT_STEM_SNAP_H :: */
605
+ /* PS_DICT_NUM_STEM_SNAP_V :: */
606
+ /* PS_DICT_STEM_SNAP_V :: */
607
+ /* PS_DICT_FORCE_BOLD :: */
608
+ /* PS_DICT_RND_STEM_UP :: */
609
+ /* PS_DICT_MIN_FEATURE :: */
610
+ /* PS_DICT_LEN_IV :: */
611
+ /* PS_DICT_PASSWORD :: */
612
+ /* PS_DICT_LANGUAGE_GROUP :: */
613
+ /* PS_DICT_VERSION :: */
614
+ /* PS_DICT_NOTICE :: */
615
+ /* PS_DICT_FULL_NAME :: */
616
+ /* PS_DICT_FAMILY_NAME :: */
617
+ /* PS_DICT_WEIGHT :: */
618
+ /* PS_DICT_IS_FIXED_PITCH :: */
619
+ /* PS_DICT_UNDERLINE_POSITION :: */
620
+ /* PS_DICT_UNDERLINE_THICKNESS :: */
621
+ /* PS_DICT_FS_TYPE :: */
622
+ /* PS_DICT_ITALIC_ANGLE :: */
623
+ /* */
526
624
  typedef enum PS_Dict_Keys_
527
625
  {
528
626
  /* conventionally in the font dictionary */