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/ftgasp.h CHANGED
@@ -120,7 +120,8 @@
120
120
  FT_Get_Gasp( FT_Face face,
121
121
  FT_UInt ppem );
122
122
 
123
- /* */
123
+ /* */
124
+
124
125
 
125
126
  #endif /* _FT_GASP_H_ */
126
127
 
data/vendor/local/include/freetype2/ftglyph.h CHANGED
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType convenience functions to handle glyphs (specification). */
6
6
  /* */
7
- /* Copyright 1996-2003, 2006, 2008, 2009, 2011, 2013 by */
7
+ /* Copyright 1996-2003, 2006, 2008, 2009, 2011, 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, */
@@ -325,22 +325,8 @@ FT_BEGIN_HEADER
325
325
  } FT_Glyph_BBox_Mode;
326
326
 
327
327
 
328
- /*************************************************************************/
329
- /* */
330
- /* <Enum> */
331
- /* ft_glyph_bbox_xxx */
332
- /* */
333
- /* <Description> */
334
- /* These constants are deprecated. Use the corresponding */
335
- /* @FT_Glyph_BBox_Mode values instead. */
336
- /* */
337
- /* <Values> */
338
- /* ft_glyph_bbox_unscaled :: See @FT_GLYPH_BBOX_UNSCALED. */
339
- /* ft_glyph_bbox_subpixels :: See @FT_GLYPH_BBOX_SUBPIXELS. */
340
- /* ft_glyph_bbox_gridfit :: See @FT_GLYPH_BBOX_GRIDFIT. */
341
- /* ft_glyph_bbox_truncate :: See @FT_GLYPH_BBOX_TRUNCATE. */
342
- /* ft_glyph_bbox_pixels :: See @FT_GLYPH_BBOX_PIXELS. */
343
- /* */
328
+ /* these constants are deprecated; use the corresponding */
329
+ /* `FT_Glyph_BBox_Mode' values instead */
344
330
  #define ft_glyph_bbox_unscaled FT_GLYPH_BBOX_UNSCALED
345
331
  #define ft_glyph_bbox_subpixels FT_GLYPH_BBOX_SUBPIXELS
346
332
  #define ft_glyph_bbox_gridfit FT_GLYPH_BBOX_GRIDFIT
@@ -603,7 +589,6 @@ FT_BEGIN_HEADER
603
589
  FT_EXPORT( FT_Error )
604
590
  FT_Matrix_Invert( FT_Matrix* matrix );
605
591
 
606
-
607
592
  /* */
608
593
 
609
594
 
data/vendor/local/include/freetype2/ftgxval.h CHANGED
@@ -57,9 +57,19 @@ FT_BEGIN_HEADER
57
57
  /* some TrueTypeGX tables (feat, mort, morx, bsln, just, kern, opbd, */
58
58
  /* trak, prop, lcar). */
59
59
  /* */
60
+ /* <Order> */
61
+ /* FT_TrueTypeGX_Validate */
62
+ /* FT_TrueTypeGX_Free */
63
+ /* */
64
+ /* FT_ClassicKern_Validate */
65
+ /* FT_ClassicKern_Free */
66
+ /* */
67
+ /* FT_VALIDATE_GX_LENGTH */
68
+ /* FT_VALIDATE_GXXXX */
69
+ /* FT_VALIDATE_CKERNXXX */
70
+ /* */
60
71
  /*************************************************************************/
61
72
 
62
-
63
73
  /*************************************************************************/
64
74
  /* */
65
75
  /* */
@@ -171,8 +181,6 @@ FT_BEGIN_HEADER
171
181
  FT_VALIDATE_lcar )
172
182
 
173
183
 
174
- /* */
175
-
176
184
  /**********************************************************************
177
185
  *
178
186
  * @function:
@@ -221,8 +229,6 @@ FT_BEGIN_HEADER
221
229
  FT_UInt table_length );
222
230
 
223
231
 
224
- /* */
225
-
226
232
  /**********************************************************************
227
233
  *
228
234
  * @function:
@@ -248,8 +254,6 @@ FT_BEGIN_HEADER
248
254
  FT_Bytes table );
249
255
 
250
256
 
251
- /* */
252
-
253
257
  /**********************************************************************
254
258
  *
255
259
  * @enum:
@@ -277,8 +281,6 @@ FT_BEGIN_HEADER
277
281
  #define FT_VALIDATE_CKERN ( FT_VALIDATE_MS | FT_VALIDATE_APPLE )
278
282
 
279
283
 
280
- /* */
281
-
282
284
  /**********************************************************************
283
285
  *
284
286
  * @function:
@@ -320,8 +322,6 @@ FT_BEGIN_HEADER
320
322
  FT_Bytes *ckern_table );
321
323
 
322
324
 
323
- /* */
324
-
325
325
  /**********************************************************************
326
326
  *
327
327
  * @function:
@@ -346,8 +346,7 @@ FT_BEGIN_HEADER
346
346
  FT_ClassicKern_Free( FT_Face face,
347
347
  FT_Bytes table );
348
348
 
349
-
350
- /* */
349
+ /* */
351
350
 
352
351
 
353
352
  FT_END_HEADER
data/vendor/local/include/freetype2/ftgzip.h CHANGED
@@ -137,8 +137,7 @@ FT_BEGIN_HEADER
137
137
  const FT_Byte* input,
138
138
  FT_ULong input_len );
139
139
 
140
-
141
- /* */
140
+ /* */
142
141
 
143
142
 
144
143
  FT_END_HEADER
data/vendor/local/include/freetype2/ftimage.h CHANGED
@@ -5,7 +5,7 @@
5
5
  /* FreeType glyph image formats and default raster interface */
6
6
  /* (specification). */
7
7
  /* */
8
- /* Copyright 1996-2010, 2013 by */
8
+ /* Copyright 1996-2010, 2013, 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, */
@@ -193,67 +193,14 @@ FT_BEGIN_HEADER
193
193
  } FT_Pixel_Mode;
194
194
 
195
195
 
196
- /*************************************************************************/
197
- /* */
198
- /* <Enum> */
199
- /* ft_pixel_mode_xxx */
200
- /* */
201
- /* <Description> */
202
- /* A list of deprecated constants. Use the corresponding */
203
- /* @FT_Pixel_Mode values instead. */
204
- /* */
205
- /* <Values> */
206
- /* ft_pixel_mode_none :: See @FT_PIXEL_MODE_NONE. */
207
- /* ft_pixel_mode_mono :: See @FT_PIXEL_MODE_MONO. */
208
- /* ft_pixel_mode_grays :: See @FT_PIXEL_MODE_GRAY. */
209
- /* ft_pixel_mode_pal2 :: See @FT_PIXEL_MODE_GRAY2. */
210
- /* ft_pixel_mode_pal4 :: See @FT_PIXEL_MODE_GRAY4. */
211
- /* */
196
+ /* these constants are deprecated; use the corresponding `FT_Pixel_Mode' */
197
+ /* values instead. */
212
198
  #define ft_pixel_mode_none FT_PIXEL_MODE_NONE
213
199
  #define ft_pixel_mode_mono FT_PIXEL_MODE_MONO
214
200
  #define ft_pixel_mode_grays FT_PIXEL_MODE_GRAY
215
201
  #define ft_pixel_mode_pal2 FT_PIXEL_MODE_GRAY2
216
202
  #define ft_pixel_mode_pal4 FT_PIXEL_MODE_GRAY4
217
203
 
218
- /* */
219
-
220
- #if 0
221
-
222
- /*************************************************************************/
223
- /* */
224
- /* <Enum> */
225
- /* FT_Palette_Mode */
226
- /* */
227
- /* <Description> */
228
- /* THIS TYPE IS DEPRECATED. DO NOT USE IT! */
229
- /* */
230
- /* An enumeration type to describe the format of a bitmap palette, */
231
- /* used with ft_pixel_mode_pal4 and ft_pixel_mode_pal8. */
232
- /* */
233
- /* <Values> */
234
- /* ft_palette_mode_rgb :: The palette is an array of 3-byte RGB */
235
- /* records. */
236
- /* */
237
- /* ft_palette_mode_rgba :: The palette is an array of 4-byte RGBA */
238
- /* records. */
239
- /* */
240
- /* <Note> */
241
- /* As ft_pixel_mode_pal2, pal4 and pal8 are currently unused by */
242
- /* FreeType, these types are not handled by the library itself. */
243
- /* */
244
- typedef enum FT_Palette_Mode_
245
- {
246
- ft_palette_mode_rgb = 0,
247
- ft_palette_mode_rgba,
248
-
249
- ft_palette_mode_max /* do not remove */
250
-
251
- } FT_Palette_Mode;
252
-
253
- /* */
254
-
255
- #endif
256
-
257
204
 
258
205
  /*************************************************************************/
259
206
  /* */
@@ -318,13 +265,13 @@ FT_BEGIN_HEADER
318
265
  /* */
319
266
  typedef struct FT_Bitmap_
320
267
  {
321
- int rows;
322
- int width;
268
+ unsigned int rows;
269
+ unsigned int width;
323
270
  int pitch;
324
271
  unsigned char* buffer;
325
- short num_grays;
326
- char pixel_mode;
327
- char palette_mode;
272
+ unsigned short num_grays;
273
+ unsigned char pixel_mode;
274
+ unsigned char palette_mode;
328
275
  void* palette;
329
276
 
330
277
  } FT_Bitmap;
@@ -381,7 +328,7 @@ FT_BEGIN_HEADER
381
328
  /* */
382
329
  /* flags :: A set of bit flags used to characterize the outline */
383
330
  /* and give hints to the scan-converter and hinter on */
384
- /* how to convert/grid-fit it. See @FT_OUTLINE_FLAGS. */
331
+ /* how to convert/grid-fit it. See @FT_OUTLINE_XXX. */
385
332
  /* */
386
333
  /* <Note> */
387
334
  /* The B/W rasterizer only checks bit~2 in the `tags' array for the */
@@ -402,6 +349,8 @@ FT_BEGIN_HEADER
402
349
 
403
350
  } FT_Outline;
404
351
 
352
+ /* */
353
+
405
354
  /* Following limits must be consistent with */
406
355
  /* FT_Outline.{n_contours,n_points} */
407
356
  #define FT_OUTLINE_CONTOURS_MAX SHRT_MAX
@@ -411,7 +360,7 @@ FT_BEGIN_HEADER
411
360
  /*************************************************************************/
412
361
  /* */
413
362
  /* <Enum> */
414
- /* FT_OUTLINE_FLAGS */
363
+ /* FT_OUTLINE_XXX */
415
364
  /* */
416
365
  /* <Description> */
417
366
  /* A list of bit-field constants use for the flags in an outline's */
@@ -492,24 +441,8 @@ FT_BEGIN_HEADER
492
441
  #define FT_OUTLINE_SINGLE_PASS 0x200
493
442
 
494
443
 
495
- /*************************************************************************
496
- *
497
- * @enum:
498
- * ft_outline_flags
499
- *
500
- * @description:
501
- * These constants are deprecated. Please use the corresponding
502
- * @FT_OUTLINE_FLAGS values.
503
- *
504
- * @values:
505
- * ft_outline_none :: See @FT_OUTLINE_NONE.
506
- * ft_outline_owner :: See @FT_OUTLINE_OWNER.
507
- * ft_outline_even_odd_fill :: See @FT_OUTLINE_EVEN_ODD_FILL.
508
- * ft_outline_reverse_fill :: See @FT_OUTLINE_REVERSE_FILL.
509
- * ft_outline_ignore_dropouts :: See @FT_OUTLINE_IGNORE_DROPOUTS.
510
- * ft_outline_high_precision :: See @FT_OUTLINE_HIGH_PRECISION.
511
- * ft_outline_single_pass :: See @FT_OUTLINE_SINGLE_PASS.
512
- */
444
+ /* these constants are deprecated; use the corresponding */
445
+ /* `FT_OUTLINE_XXX' values instead */
513
446
  #define ft_outline_none FT_OUTLINE_NONE
514
447
  #define ft_outline_owner FT_OUTLINE_OWNER
515
448
  #define ft_outline_even_odd_fill FT_OUTLINE_EVEN_ODD_FILL
@@ -796,22 +729,8 @@ FT_BEGIN_HEADER
796
729
  } FT_Glyph_Format;
797
730
 
798
731
 
799
- /*************************************************************************/
800
- /* */
801
- /* <Enum> */
802
- /* ft_glyph_format_xxx */
803
- /* */
804
- /* <Description> */
805
- /* A list of deprecated constants. Use the corresponding */
806
- /* @FT_Glyph_Format values instead. */
807
- /* */
808
- /* <Values> */
809
- /* ft_glyph_format_none :: See @FT_GLYPH_FORMAT_NONE. */
810
- /* ft_glyph_format_composite :: See @FT_GLYPH_FORMAT_COMPOSITE. */
811
- /* ft_glyph_format_bitmap :: See @FT_GLYPH_FORMAT_BITMAP. */
812
- /* ft_glyph_format_outline :: See @FT_GLYPH_FORMAT_OUTLINE. */
813
- /* ft_glyph_format_plotter :: See @FT_GLYPH_FORMAT_PLOTTER. */
814
- /* */
732
+ /* these constants are deprecated; use the corresponding */
733
+ /* `FT_Glyph_Format' values instead. */
815
734
  #define ft_glyph_format_none FT_GLYPH_FORMAT_NONE
816
735
  #define ft_glyph_format_composite FT_GLYPH_FORMAT_COMPOSITE
817
736
  #define ft_glyph_format_bitmap FT_GLYPH_FORMAT_BITMAP
@@ -856,6 +775,21 @@ FT_BEGIN_HEADER
856
775
  /* <Description> */
857
776
  /* This section contains technical definitions. */
858
777
  /* */
778
+ /* <Order> */
779
+ /* FT_Raster */
780
+ /* FT_Span */
781
+ /* FT_SpanFunc */
782
+ /* */
783
+ /* FT_Raster_Params */
784
+ /* FT_RASTER_FLAG_XXX */
785
+ /* */
786
+ /* FT_Raster_NewFunc */
787
+ /* FT_Raster_DoneFunc */
788
+ /* FT_Raster_ResetFunc */
789
+ /* FT_Raster_SetModeFunc */
790
+ /* FT_Raster_RenderFunc */
791
+ /* FT_Raster_Funcs */
792
+ /* */
859
793
  /*************************************************************************/
860
794
 
861
795
 
@@ -865,8 +799,8 @@ FT_BEGIN_HEADER
865
799
  /* FT_Raster */
866
800
  /* */
867
801
  /* <Description> */
868
- /* A handle (pointer) to a raster object. Each object can be used */
869
- /* independently to convert an outline into a bitmap or pixmap. */
802
+ /* An opaque handle (pointer) to a raster object. Each object can be */
803
+ /* used independently to convert an outline into a bitmap or pixmap. */
870
804
  /* */
871
805
  typedef struct FT_RasterRec_* FT_Raster;
872
806
 
@@ -877,8 +811,8 @@ FT_BEGIN_HEADER
877
811
  /* FT_Span */
878
812
  /* */
879
813
  /* <Description> */
880
- /* A structure used to model a single span of gray (or black) pixels */
881
- /* when rendering a monochrome or anti-aliased bitmap. */
814
+ /* A structure used to model a single span of gray pixels when */
815
+ /* rendering an anti-aliased bitmap. */
882
816
  /* */
883
817
  /* <Fields> */
884
818
  /* x :: The span's horizontal start position. */
@@ -886,8 +820,7 @@ FT_BEGIN_HEADER
886
820
  /* len :: The span's length in pixels. */
887
821
  /* */
888
822
  /* coverage :: The span color/coverage, ranging from 0 (background) */
889
- /* to 255 (foreground). Only used for anti-aliased */
890
- /* rendering. */
823
+ /* to 255 (foreground). */
891
824
  /* */
892
825
  /* <Note> */
893
826
  /* This structure is used by the span drawing callback type named */
@@ -957,22 +890,7 @@ FT_BEGIN_HEADER
957
890
  /* FT_Raster_BitTest_Func */
958
891
  /* */
959
892
  /* <Description> */
960
- /* THIS TYPE IS DEPRECATED. DO NOT USE IT. */
961
- /* */
962
- /* A function used as a call-back by the monochrome scan-converter */
963
- /* to test whether a given target pixel is already set to the drawing */
964
- /* `color'. These tests are crucial to implement drop-out control */
965
- /* per-se the TrueType spec. */
966
- /* */
967
- /* <Input> */
968
- /* y :: The pixel's y~coordinate. */
969
- /* */
970
- /* x :: The pixel's x~coordinate. */
971
- /* */
972
- /* user :: User-supplied data that is passed to the callback. */
973
- /* */
974
- /* <Return> */
975
- /* 1~if the pixel is `set', 0~otherwise. */
893
+ /* Deprecated, unimplemented. */
976
894
  /* */
977
895
  typedef int
978
896
  (*FT_Raster_BitTest_Func)( int y,
@@ -986,21 +904,7 @@ FT_BEGIN_HEADER
986
904
  /* FT_Raster_BitSet_Func */
987
905
  /* */
988
906
  /* <Description> */
989
- /* THIS TYPE IS DEPRECATED. DO NOT USE IT. */
990
- /* */
991
- /* A function used as a call-back by the monochrome scan-converter */
992
- /* to set an individual target pixel. This is crucial to implement */
993
- /* drop-out control according to the TrueType specification. */
994
- /* */
995
- /* <Input> */
996
- /* y :: The pixel's y~coordinate. */
997
- /* */
998
- /* x :: The pixel's x~coordinate. */
999
- /* */
1000
- /* user :: User-supplied data that is passed to the callback. */
1001
- /* */
1002
- /* <Return> */
1003
- /* 1~if the pixel is `set', 0~otherwise. */
907
+ /* Deprecated, unimplemented. */
1004
908
  /* */
1005
909
  typedef void
1006
910
  (*FT_Raster_BitSet_Func)( int y,
@@ -1034,8 +938,8 @@ FT_BEGIN_HEADER
1034
938
  /* pixmap's buffer _must_ be zeroed before */
1035
939
  /* rendering. */
1036
940
  /* */
1037
- /* Note that for now, direct rendering is */
1038
- /* only possible with anti-aliased glyphs. */
941
+ /* Direct rendering is only possible with */
942
+ /* anti-aliased glyphs. */
1039
943
  /* */
1040
944
  /* FT_RASTER_FLAG_CLIP :: This flag is only used in direct */
1041
945
  /* rendering mode. If set, the output will */
@@ -1053,7 +957,8 @@ FT_BEGIN_HEADER
1053
957
  #define FT_RASTER_FLAG_DIRECT 0x2
1054
958
  #define FT_RASTER_FLAG_CLIP 0x4
1055
959
 
1056
- /* deprecated */
960
+ /* these constants are deprecated; use the corresponding */
961
+ /* `FT_RASTER_FLAG_XXX' values instead */
1057
962
  #define ft_raster_flag_default FT_RASTER_FLAG_DEFAULT
1058
963
  #define ft_raster_flag_aa FT_RASTER_FLAG_AA
1059
964
  #define ft_raster_flag_direct FT_RASTER_FLAG_DIRECT
@@ -1079,11 +984,11 @@ FT_BEGIN_HEADER
1079
984
  /* */
1080
985
  /* gray_spans :: The gray span drawing callback. */
1081
986
  /* */
1082
- /* black_spans :: The black span drawing callback. UNIMPLEMENTED! */
987
+ /* black_spans :: Unused. */
1083
988
  /* */
1084
- /* bit_test :: The bit test callback. UNIMPLEMENTED! */
989
+ /* bit_test :: Unused. */
1085
990
  /* */
1086
- /* bit_set :: The bit set callback. UNIMPLEMENTED! */
991
+ /* bit_set :: Unused. */
1087
992
  /* */
1088
993
  /* user :: User-supplied data that is passed to each drawing */
1089
994
  /* callback. */
@@ -1100,15 +1005,9 @@ FT_BEGIN_HEADER
1100
1005
  /* */
1101
1006
  /* If the @FT_RASTER_FLAG_DIRECT bit flag is set in `flags', the */
1102
1007
  /* raster will call the `gray_spans' callback to draw gray pixel */
1103
- /* spans, in the case of an aa glyph bitmap, it will call */
1104
- /* `black_spans', and `bit_test' and `bit_set' in the case of a */
1105
- /* monochrome bitmap. This allows direct composition over a */
1106
- /* pre-existing bitmap through user-provided callbacks to perform the */
1107
- /* span drawing/composition. */
1108
- /* */
1109
- /* Note that the `bit_test' and `bit_set' callbacks are required when */
1110
- /* rendering a monochrome bitmap, as they are crucial to implement */
1111
- /* correct drop-out control as defined in the TrueType specification. */
1008
+ /* spans. This allows direct composition over a pre-existing bitmap */
1009
+ /* through user-provided callbacks to perform the span drawing and */
1010
+ /* composition. Not supported by the monochrome rasterizer. */
1112
1011
  /* */
1113
1012
  typedef struct FT_Raster_Params_
1114
1013
  {
@@ -1116,9 +1015,9 @@ FT_BEGIN_HEADER
1116
1015
  const void* source;
1117
1016
  int flags;
1118
1017
  FT_SpanFunc gray_spans;
1119
- FT_SpanFunc black_spans; /* doesn't work! */
1120
- FT_Raster_BitTest_Func bit_test; /* doesn't work! */
1121
- FT_Raster_BitSet_Func bit_set; /* doesn't work! */
1018
+ FT_SpanFunc black_spans; /* unused */
1019
+ FT_Raster_BitTest_Func bit_test; /* unused */
1020
+ FT_Raster_BitSet_Func bit_set; /* unused */
1122
1021
  void* user;
1123
1022
  FT_BBox clip_box;
1124
1023
 
@@ -1305,7 +1204,6 @@ FT_BEGIN_HEADER
1305
1204
 
1306
1205
  } FT_Raster_Funcs;
1307
1206
 
1308
-
1309
1207
  /* */
1310
1208
 
1311
1209