cairo 1.15.13-x64-mingw32 → 1.15.14-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (151) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS +24 -0
  3. data/README.rdoc +11 -40
  4. data/Rakefile +4 -2
  5. data/ext/cairo/rb_cairo.h +1 -1
  6. data/ext/cairo/rb_cairo_context.c +35 -3
  7. data/ext/cairo/rb_cairo_font_options.c +5 -6
  8. data/ext/cairo/rb_cairo_private.h +2 -2
  9. data/ext/cairo/rb_cairo_scaled_font.c +11 -2
  10. data/ext/cairo/rb_cairo_surface.c +89 -48
  11. data/lib/2.2/cairo.so +0 -0
  12. data/lib/2.3/cairo.so +0 -0
  13. data/lib/2.4/cairo.so +0 -0
  14. data/lib/2.5/cairo.so +0 -0
  15. data/test/{cairo-test-utils.rb → helper.rb} +4 -5
  16. data/test/run-test.rb +3 -10
  17. data/test/test_context.rb +6 -6
  18. data/test/test_font_extents.rb +1 -1
  19. data/test/test_font_face.rb +1 -1
  20. data/test/test_font_options.rb +1 -1
  21. data/test/test_image_surface.rb +2 -2
  22. data/test/test_pdf_surface.rb +1 -1
  23. data/test/test_quartz_image_surface.rb +1 -1
  24. data/test/test_raster_source_pattern.rb +13 -13
  25. data/test/test_recording_surface.rb +2 -2
  26. data/test/test_region.rb +1 -1
  27. data/test/test_scaled_font.rb +1 -1
  28. data/test/test_script_device.rb +1 -1
  29. data/test/test_script_surface.rb +1 -1
  30. data/test/test_surface.rb +5 -5
  31. data/test/test_svg_surface.rb +1 -1
  32. data/test/test_tee_surface.rb +2 -2
  33. data/test/test_text_cluster.rb +1 -1
  34. data/test/test_text_extents.rb +1 -1
  35. data/test/test_text_to_glyphs_data.rb +1 -1
  36. data/test/test_xml_device.rb +1 -1
  37. data/test/test_xml_surface.rb +2 -2
  38. data/vendor/local/bin/fc-cache.exe +0 -0
  39. data/vendor/local/bin/fc-cat.exe +0 -0
  40. data/vendor/local/bin/fc-conflist.exe +0 -0
  41. data/vendor/local/bin/fc-list.exe +0 -0
  42. data/vendor/local/bin/fc-match.exe +0 -0
  43. data/vendor/local/bin/fc-pattern.exe +0 -0
  44. data/vendor/local/bin/fc-query.exe +0 -0
  45. data/vendor/local/bin/fc-scan.exe +0 -0
  46. data/vendor/local/bin/fc-validate.exe +0 -0
  47. data/vendor/local/bin/libcairo-2.dll +0 -0
  48. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  49. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  50. data/vendor/local/bin/libfontconfig-1.dll +0 -0
  51. data/vendor/local/bin/libfreetype-6.dll +0 -0
  52. data/vendor/local/bin/libpixman-1-0.dll +0 -0
  53. data/vendor/local/bin/libpng-config +1 -1
  54. data/vendor/local/bin/libpng16-16.dll +0 -0
  55. data/vendor/local/bin/libpng16-config +1 -1
  56. data/vendor/local/bin/libxml2-2.dll +0 -0
  57. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  58. data/vendor/local/bin/pngfix.exe +0 -0
  59. data/vendor/local/bin/xmlcatalog.exe +0 -0
  60. data/vendor/local/bin/xmllint.exe +0 -0
  61. data/vendor/local/bin/zlib1211.dll +0 -0
  62. data/vendor/local/include/freetype2/freetype/config/ftconfig.h +82 -3
  63. data/vendor/local/include/freetype2/freetype/config/ftheader.h +43 -85
  64. data/vendor/local/include/freetype2/freetype/config/ftoption.h +43 -56
  65. data/vendor/local/include/freetype2/freetype/config/ftstdlib.h +1 -1
  66. data/vendor/local/include/freetype2/freetype/freetype.h +185 -85
  67. data/vendor/local/include/freetype2/freetype/ftadvanc.h +1 -1
  68. data/vendor/local/include/freetype2/freetype/ftbbox.h +2 -2
  69. data/vendor/local/include/freetype2/freetype/ftbdf.h +1 -1
  70. data/vendor/local/include/freetype2/freetype/ftbitmap.h +2 -2
  71. data/vendor/local/include/freetype2/freetype/ftbzip2.h +1 -1
  72. data/vendor/local/include/freetype2/freetype/ftcache.h +1 -16
  73. data/vendor/local/include/freetype2/freetype/ftchapters.h +3 -0
  74. data/vendor/local/include/freetype2/freetype/ftcid.h +2 -2
  75. data/vendor/local/include/freetype2/freetype/ftdriver.h +1225 -0
  76. data/vendor/local/include/freetype2/freetype/fterrdef.h +1 -1
  77. data/vendor/local/include/freetype2/freetype/fterrors.h +1 -1
  78. data/vendor/local/include/freetype2/freetype/ftfntfmt.h +1 -1
  79. data/vendor/local/include/freetype2/freetype/ftgasp.h +6 -1
  80. data/vendor/local/include/freetype2/freetype/ftglyph.h +3 -3
  81. data/vendor/local/include/freetype2/freetype/ftgxval.h +5 -5
  82. data/vendor/local/include/freetype2/freetype/ftgzip.h +4 -1
  83. data/vendor/local/include/freetype2/freetype/ftimage.h +18 -18
  84. data/vendor/local/include/freetype2/freetype/ftincrem.h +2 -13
  85. data/vendor/local/include/freetype2/freetype/ftlcdfil.h +5 -18
  86. data/vendor/local/include/freetype2/freetype/ftlist.h +1 -1
  87. data/vendor/local/include/freetype2/freetype/ftlzw.h +1 -1
  88. data/vendor/local/include/freetype2/freetype/ftmac.h +1 -1
  89. data/vendor/local/include/freetype2/freetype/ftmm.h +99 -11
  90. data/vendor/local/include/freetype2/freetype/ftmodapi.h +12 -11
  91. data/vendor/local/include/freetype2/freetype/ftmoderr.h +1 -1
  92. data/vendor/local/include/freetype2/freetype/ftotval.h +1 -1
  93. data/vendor/local/include/freetype2/freetype/ftoutln.h +4 -7
  94. data/vendor/local/include/freetype2/freetype/ftparams.h +205 -0
  95. data/vendor/local/include/freetype2/freetype/ftpfr.h +4 -4
  96. data/vendor/local/include/freetype2/freetype/ftrender.h +2 -2
  97. data/vendor/local/include/freetype2/freetype/ftsizes.h +1 -1
  98. data/vendor/local/include/freetype2/freetype/ftsnames.h +8 -42
  99. data/vendor/local/include/freetype2/freetype/ftstroke.h +6 -6
  100. data/vendor/local/include/freetype2/freetype/ftsynth.h +1 -1
  101. data/vendor/local/include/freetype2/freetype/ftsystem.h +1 -1
  102. data/vendor/local/include/freetype2/freetype/fttrigon.h +1 -1
  103. data/vendor/local/include/freetype2/freetype/fttypes.h +2 -2
  104. data/vendor/local/include/freetype2/freetype/ftwinfnt.h +2 -2
  105. data/vendor/local/include/freetype2/freetype/t1tables.h +10 -1
  106. data/vendor/local/include/freetype2/freetype/ttnameid.h +2 -2
  107. data/vendor/local/include/freetype2/freetype/tttables.h +1 -1
  108. data/vendor/local/include/freetype2/freetype/tttags.h +1 -1
  109. data/vendor/local/include/freetype2/ft2build.h +1 -1
  110. data/vendor/local/include/libpng16/png.h +40 -40
  111. data/vendor/local/include/libpng16/pngconf.h +15 -14
  112. data/vendor/local/include/libpng16/pnglibconf.h +1 -1
  113. data/vendor/local/include/png.h +40 -40
  114. data/vendor/local/include/pngconf.h +15 -14
  115. data/vendor/local/include/pnglibconf.h +1 -1
  116. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  117. data/vendor/local/lib/libcairo-gobject.la +1 -1
  118. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  119. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  120. data/vendor/local/lib/libcairo.a +0 -0
  121. data/vendor/local/lib/libcairo.dll.a +0 -0
  122. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  123. data/vendor/local/lib/libfreetype.a +0 -0
  124. data/vendor/local/lib/libfreetype.dll.a +0 -0
  125. data/vendor/local/lib/libfreetype.la +3 -3
  126. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  127. data/vendor/local/lib/libpng.a +0 -0
  128. data/vendor/local/lib/libpng.dll.a +0 -0
  129. data/vendor/local/lib/libpng.la +2 -2
  130. data/vendor/local/lib/libpng16.a +0 -0
  131. data/vendor/local/lib/libpng16.dll.a +0 -0
  132. data/vendor/local/lib/libpng16.la +2 -2
  133. data/vendor/local/lib/libxml2.dll.a +0 -0
  134. data/vendor/local/lib/libz.dll.a +0 -0
  135. data/vendor/local/lib/pkgconfig/freetype2.pc +2 -2
  136. data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
  137. data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
  138. data/vendor/local/share/aclocal/freetype2.m4 +1 -1
  139. data/vendor/local/share/license/freetype/README +9 -9
  140. data/vendor/local/share/license/freetype/README.git +1 -1
  141. data/vendor/local/share/license/libpng/README +2 -2
  142. data/vendor/local/share/man/man3/libpng.3 +50 -54
  143. data/vendor/local/share/man/man3/libpngpf.3 +8 -4
  144. metadata +9 -14
  145. data/vendor/local/bin/freetype-config +0 -211
  146. data/vendor/local/include/freetype2/freetype/ftautoh.h +0 -533
  147. data/vendor/local/include/freetype2/freetype/ftcffdrv.h +0 -321
  148. data/vendor/local/include/freetype2/freetype/ftpcfdrv.h +0 -105
  149. data/vendor/local/include/freetype2/freetype/ftttdrv.h +0 -328
  150. data/vendor/local/include/freetype2/freetype/ttunpat.h +0 -63
  151. data/vendor/local/share/man/man1/freetype-config.1 +0 -146
Binary file
@@ -5,7 +5,7 @@
5
5
  /* */
6
6
  /* UNIX-specific configuration file (specification only). */
7
7
  /* */
8
- /* Copyright 1996-2017 by */
8
+ /* Copyright 1996-2018 by */
9
9
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
10
10
  /* */
11
11
  /* This file is part of the FreeType project, and may only be used, */
@@ -398,6 +398,14 @@ FT_BEGIN_HEADER
398
398
  #endif
399
399
 
400
400
 
401
+ /* Use FT_LOCAL and FT_LOCAL_DEF to declare and define, respectively, */
402
+ /* a function that gets used only within the scope of a module. */
403
+ /* Normally, both the header and source code files for such a */
404
+ /* function are within a single module directory. */
405
+ /* */
406
+ /* Intra-module arrays should be tagged with FT_LOCAL_ARRAY and */
407
+ /* FT_LOCAL_ARRAY_DEF. */
408
+ /* */
401
409
  #ifdef FT_MAKE_OPTION_SINGLE_OBJECT
402
410
 
403
411
  #define FT_LOCAL( x ) static x
@@ -419,6 +427,12 @@ FT_BEGIN_HEADER
419
427
  #define FT_LOCAL_ARRAY_DEF( x ) const x
420
428
 
421
429
 
430
+ /* Use FT_BASE and FT_BASE_DEF to declare and define, respectively, */
431
+ /* functions that are used in more than a single module. In the */
432
+ /* current setup this implies that the declaration is in a header */
433
+ /* file in the `include/freetype/internal' directory, and the */
434
+ /* function body is in a file in `src/base'. */
435
+ /* */
422
436
  #ifndef FT_BASE
423
437
 
424
438
  #ifdef __cplusplus
@@ -441,14 +455,63 @@ FT_BEGIN_HEADER
441
455
  #endif /* !FT_BASE_DEF */
442
456
 
443
457
 
458
+ /* When compiling FreeType as a DLL or DSO with hidden visibility */
459
+ /* some systems/compilers need a special attribute in front OR after */
460
+ /* the return type of function declarations. */
461
+ /* */
462
+ /* Two macros are used within the FreeType source code to define */
463
+ /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
464
+ /* */
465
+ /* FT_EXPORT( return_type ) */
466
+ /* */
467
+ /* is used in a function declaration, as in */
468
+ /* */
469
+ /* FT_EXPORT( FT_Error ) */
470
+ /* FT_Init_FreeType( FT_Library* alibrary ); */
471
+ /* */
472
+ /* */
473
+ /* FT_EXPORT_DEF( return_type ) */
474
+ /* */
475
+ /* is used in a function definition, as in */
476
+ /* */
477
+ /* FT_EXPORT_DEF( FT_Error ) */
478
+ /* FT_Init_FreeType( FT_Library* alibrary ) */
479
+ /* { */
480
+ /* ... some code ... */
481
+ /* return FT_Err_Ok; */
482
+ /* } */
483
+ /* */
484
+ /* You can provide your own implementation of FT_EXPORT and */
485
+ /* FT_EXPORT_DEF here if you want. */
486
+ /* */
487
+ /* To export a variable, use FT_EXPORT_VAR. */
488
+ /* */
444
489
  #ifndef FT_EXPORT
445
490
 
446
- #ifdef __cplusplus
491
+ #ifdef FT2_BUILD_LIBRARY
492
+
493
+ #if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) )
494
+ #define FT_EXPORT( x ) __declspec( dllexport ) x
495
+ #elif defined( __GNUC__ ) && __GNUC__ >= 4
496
+ #define FT_EXPORT( x ) __attribute__(( visibility( "default" ) )) x
497
+ #elif defined( __cplusplus )
447
498
  #define FT_EXPORT( x ) extern "C" x
448
499
  #else
449
500
  #define FT_EXPORT( x ) extern x
450
501
  #endif
451
502
 
503
+ #else
504
+
505
+ #if defined( FT2_DLLIMPORT )
506
+ #define FT_EXPORT( x ) __declspec( dllimport ) x
507
+ #elif defined( __cplusplus )
508
+ #define FT_EXPORT( x ) extern "C" x
509
+ #else
510
+ #define FT_EXPORT( x ) extern x
511
+ #endif
512
+
513
+ #endif
514
+
452
515
  #endif /* !FT_EXPORT */
453
516
 
454
517
 
@@ -484,7 +547,13 @@ FT_BEGIN_HEADER
484
547
  /* functions which are accessed by (global) function pointers. */
485
548
  /* */
486
549
  /* */
487
- /* FT_CALLBACK_DEF is used to _define_ a callback function. */
550
+ /* FT_CALLBACK_DEF is used to _define_ a callback function, */
551
+ /* located in the same source code file as the structure that uses */
552
+ /* it. */
553
+ /* */
554
+ /* FT_BASE_CALLBACK and FT_BASE_CALLBACK_DEF are used to declare */
555
+ /* and define a callback function, respectively, in a similar way */
556
+ /* as FT_BASE and FT_BASE_DEF work. */
488
557
  /* */
489
558
  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
490
559
  /* contains pointers to callback functions. */
@@ -504,6 +573,16 @@ FT_BEGIN_HEADER
504
573
  #endif
505
574
  #endif /* FT_CALLBACK_DEF */
506
575
 
576
+ #ifndef FT_BASE_CALLBACK
577
+ #ifdef __cplusplus
578
+ #define FT_BASE_CALLBACK( x ) extern "C" x
579
+ #define FT_BASE_CALLBACK_DEF( x ) extern "C" x
580
+ #else
581
+ #define FT_BASE_CALLBACK( x ) extern x
582
+ #define FT_BASE_CALLBACK_DEF( x ) x
583
+ #endif
584
+ #endif /* FT_BASE_CALLBACK */
585
+
507
586
  #ifndef FT_CALLBACK_TABLE
508
587
  #ifdef __cplusplus
509
588
  #define FT_CALLBACK_TABLE extern "C"
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* Build macros of the FreeType 2 library. */
6
6
  /* */
7
- /* Copyright 1996-2017 by */
7
+ /* Copyright 1996-2018 by */
8
8
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -315,6 +315,19 @@
315
315
  #define FT_RENDER_H <freetype/ftrender.h>
316
316
 
317
317
 
318
+ /*************************************************************************
319
+ *
320
+ * @macro:
321
+ * FT_DRIVER_H
322
+ *
323
+ * @description:
324
+ * A macro used in #include statements to name the file containing
325
+ * structures and macros related to the driver modules.
326
+ *
327
+ */
328
+ #define FT_DRIVER_H <freetype/ftdriver.h>
329
+
330
+
318
331
  /*************************************************************************
319
332
  *
320
333
  * @macro:
@@ -324,8 +337,10 @@
324
337
  * A macro used in #include statements to name the file containing
325
338
  * structures and macros related to the auto-hinting module.
326
339
  *
340
+ * Deprecated since version 2.9; use @FT_DRIVER_H instead.
341
+ *
327
342
  */
328
- #define FT_AUTOHINTER_H <freetype/ftautoh.h>
343
+ #define FT_AUTOHINTER_H FT_DRIVER_H
329
344
 
330
345
 
331
346
  /*************************************************************************
@@ -337,8 +352,10 @@
337
352
  * A macro used in #include statements to name the file containing
338
353
  * structures and macros related to the CFF driver module.
339
354
  *
355
+ * Deprecated since version 2.9; use @FT_DRIVER_H instead.
356
+ *
340
357
  */
341
- #define FT_CFF_DRIVER_H <freetype/ftcffdrv.h>
358
+ #define FT_CFF_DRIVER_H FT_DRIVER_H
342
359
 
343
360
 
344
361
  /*************************************************************************
@@ -350,8 +367,10 @@
350
367
  * A macro used in #include statements to name the file containing
351
368
  * structures and macros related to the TrueType driver module.
352
369
  *
370
+ * Deprecated since version 2.9; use @FT_DRIVER_H instead.
371
+ *
353
372
  */
354
- #define FT_TRUETYPE_DRIVER_H <freetype/ftttdrv.h>
373
+ #define FT_TRUETYPE_DRIVER_H FT_DRIVER_H
355
374
 
356
375
 
357
376
  /*************************************************************************
@@ -363,8 +382,10 @@
363
382
  * A macro used in #include statements to name the file containing
364
383
  * structures and macros related to the PCF driver module.
365
384
  *
385
+ * Deprecated since version 2.9; use @FT_DRIVER_H instead.
386
+ *
366
387
  */
367
- #define FT_PCF_DRIVER_H <freetype/ftpcfdrv.h>
388
+ #define FT_PCF_DRIVER_H FT_DRIVER_H
368
389
 
369
390
 
370
391
  /*************************************************************************
@@ -554,63 +575,6 @@
554
575
  #define FT_CACHE_H <freetype/ftcache.h>
555
576
 
556
577
 
557
- /*************************************************************************
558
- *
559
- * @macro:
560
- * FT_CACHE_IMAGE_H
561
- *
562
- * @description:
563
- * A macro used in #include statements to name the file containing the
564
- * `glyph image' API of the FreeType~2 cache sub-system.
565
- *
566
- * It is used to define a cache for @FT_Glyph elements. You can also
567
- * use the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need to
568
- * store small glyph bitmaps, as it will use less memory.
569
- *
570
- * This macro is deprecated. Simply include @FT_CACHE_H to have all
571
- * glyph image-related cache declarations.
572
- *
573
- */
574
- #define FT_CACHE_IMAGE_H FT_CACHE_H
575
-
576
-
577
- /*************************************************************************
578
- *
579
- * @macro:
580
- * FT_CACHE_SMALL_BITMAPS_H
581
- *
582
- * @description:
583
- * A macro used in #include statements to name the file containing the
584
- * `small bitmaps' API of the FreeType~2 cache sub-system.
585
- *
586
- * It is used to define a cache for small glyph bitmaps in a relatively
587
- * memory-efficient way. You can also use the API defined in
588
- * @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images,
589
- * including scalable outlines.
590
- *
591
- * This macro is deprecated. Simply include @FT_CACHE_H to have all
592
- * small bitmaps-related cache declarations.
593
- *
594
- */
595
- #define FT_CACHE_SMALL_BITMAPS_H FT_CACHE_H
596
-
597
-
598
- /*************************************************************************
599
- *
600
- * @macro:
601
- * FT_CACHE_CHARMAP_H
602
- *
603
- * @description:
604
- * A macro used in #include statements to name the file containing the
605
- * `charmap' API of the FreeType~2 cache sub-system.
606
- *
607
- * This macro is deprecated. Simply include @FT_CACHE_H to have all
608
- * charmap-based cache declarations.
609
- *
610
- */
611
- #define FT_CACHE_CHARMAP_H FT_CACHE_H
612
-
613
-
614
578
  /*************************************************************************
615
579
  *
616
580
  * @macro:
@@ -760,17 +724,6 @@
760
724
  #define FT_LCD_FILTER_H <freetype/ftlcdfil.h>
761
725
 
762
726
 
763
- /*************************************************************************
764
- *
765
- * @macro:
766
- * FT_UNPATENTED_HINTING_H
767
- *
768
- * @description:
769
- * Deprecated.
770
- */
771
- #define FT_UNPATENTED_HINTING_H <freetype/ttunpat.h>
772
-
773
-
774
727
  /*************************************************************************
775
728
  *
776
729
  * @macro:
@@ -809,25 +762,30 @@
809
762
 
810
763
  /* */
811
764
 
765
+ /* These header files don't need to be included by the user. */
812
766
  #define FT_ERROR_DEFINITIONS_H <freetype/fterrdef.h>
767
+ #define FT_PARAMETER_TAGS_H <freetype/ftparams.h>
813
768
 
769
+ /* Deprecated macros. */
770
+ #define FT_UNPATENTED_HINTING_H <freetype/ftparams.h>
771
+ #define FT_TRUETYPE_UNPATENTED_H <freetype/ftparams.h>
772
+
773
+ /* FT_CACHE_H is the only header file needed for the cache subsystem. */
774
+ #define FT_CACHE_IMAGE_H FT_CACHE_H
775
+ #define FT_CACHE_SMALL_BITMAPS_H FT_CACHE_H
776
+ #define FT_CACHE_CHARMAP_H FT_CACHE_H
814
777
 
815
778
  /* The internals of the cache sub-system are no longer exposed. We */
816
779
  /* default to FT_CACHE_H at the moment just in case, but we know of */
817
780
  /* no rogue client that uses them. */
818
781
  /* */
819
- #define FT_CACHE_MANAGER_H <freetype/ftcache.h>
820
- #define FT_CACHE_INTERNAL_MRU_H <freetype/ftcache.h>
821
- #define FT_CACHE_INTERNAL_MANAGER_H <freetype/ftcache.h>
822
- #define FT_CACHE_INTERNAL_CACHE_H <freetype/ftcache.h>
823
- #define FT_CACHE_INTERNAL_GLYPH_H <freetype/ftcache.h>
824
- #define FT_CACHE_INTERNAL_IMAGE_H <freetype/ftcache.h>
825
- #define FT_CACHE_INTERNAL_SBITS_H <freetype/ftcache.h>
826
-
827
-
828
- #define FT_INCREMENTAL_H <freetype/ftincrem.h>
829
-
830
- #define FT_TRUETYPE_UNPATENTED_H <freetype/ttunpat.h>
782
+ #define FT_CACHE_MANAGER_H FT_CACHE_H
783
+ #define FT_CACHE_INTERNAL_MRU_H FT_CACHE_H
784
+ #define FT_CACHE_INTERNAL_MANAGER_H FT_CACHE_H
785
+ #define FT_CACHE_INTERNAL_CACHE_H FT_CACHE_H
786
+ #define FT_CACHE_INTERNAL_GLYPH_H FT_CACHE_H
787
+ #define FT_CACHE_INTERNAL_IMAGE_H FT_CACHE_H
788
+ #define FT_CACHE_INTERNAL_SBITS_H FT_CACHE_H
831
789
 
832
790
 
833
791
  /*
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* User-selectable configuration macros (specification only). */
6
6
  /* */
7
- /* Copyright 1996-2017 by */
7
+ /* Copyright 1996-2018 by */
8
8
  /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9
9
  /* */
10
10
  /* This file is part of the FreeType project, and may only be used, */
@@ -75,19 +75,21 @@ FT_BEGIN_HEADER
75
75
  /*************************************************************************/
76
76
 
77
77
 
78
- /*************************************************************************/
78
+ /*#***********************************************************************/
79
79
  /* */
80
80
  /* If you enable this configuration option, FreeType recognizes an */
81
81
  /* environment variable called `FREETYPE_PROPERTIES', which can be used */
82
82
  /* to control the various font drivers and modules. The controllable */
83
- /* properties are listed in the section `Controlling FreeType Modules' */
84
- /* in the reference's table of contents; currently there are properties */
85
- /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */
86
- /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */
83
+ /* properties are listed in the section @properties. */
84
+ /* */
85
+ /* You have to undefine this configuration option on platforms that lack */
86
+ /* the concept of environment variables (and thus don't have the */
87
+ /* `getenv' function), for example Windows CE. */
87
88
  /* */
88
89
  /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */
89
90
  /* multiple lines for better readability). */
90
91
  /* */
92
+ /* { */
91
93
  /* <optional whitespace> */
92
94
  /* <module-name1> ':' */
93
95
  /* <property-name1> '=' <property-value1> */
@@ -95,6 +97,7 @@ FT_BEGIN_HEADER
95
97
  /* <module-name2> ':' */
96
98
  /* <property-name2> '=' <property-value2> */
97
99
  /* ... */
100
+ /* } */
98
101
  /* */
99
102
  /* Example: */
100
103
  /* */
@@ -211,7 +214,11 @@ FT_BEGIN_HEADER
211
214
  /* Do not #undef this macro here since the build system might define */
212
215
  /* it for certain configurations only. */
213
216
  /* */
214
- /* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
217
+ /* If you use a build system like cmake or the `configure' script, */
218
+ /* options set by those programs have precendence, overwriting the */
219
+ /* value here with the configured one. */
220
+ /* */
221
+ #define FT_CONFIG_OPTION_SYSTEM_ZLIB
215
222
 
216
223
 
217
224
  /*************************************************************************/
@@ -227,7 +234,11 @@ FT_BEGIN_HEADER
227
234
  /* */
228
235
  /* Define this macro if you want to enable this `feature'. */
229
236
  /* */
230
- /* #define FT_CONFIG_OPTION_USE_BZIP2 */
237
+ /* If you use a build system like cmake or the `configure' script, */
238
+ /* options set by those programs have precendence, overwriting the */
239
+ /* value here with the configured one. */
240
+ /* */
241
+ /* #undef FT_CONFIG_OPTION_USE_BZIP2 */
231
242
 
232
243
 
233
244
  /*************************************************************************/
@@ -252,7 +263,11 @@ FT_BEGIN_HEADER
252
263
  /* */
253
264
  /* Define this macro if you want to enable this `feature'. */
254
265
  /* */
255
- /* #define FT_CONFIG_OPTION_USE_PNG */
266
+ /* If you use a build system like cmake or the `configure' script, */
267
+ /* options set by those programs have precendence, overwriting the */
268
+ /* value here with the configured one. */
269
+ /* */
270
+ #define FT_CONFIG_OPTION_USE_PNG
256
271
 
257
272
 
258
273
  /*************************************************************************/
@@ -265,49 +280,11 @@ FT_BEGIN_HEADER
265
280
  /* */
266
281
  /* Define this macro if you want to enable this `feature'. */
267
282
  /* */
268
- /* #define FT_CONFIG_OPTION_USE_HARFBUZZ */
269
-
270
-
271
- /*************************************************************************/
272
- /* */
273
- /* DLL export compilation */
274
- /* */
275
- /* When compiling FreeType as a DLL, some systems/compilers need a */
276
- /* special keyword in front OR after the return type of function */
277
- /* declarations. */
278
- /* */
279
- /* Two macros are used within the FreeType source code to define */
280
- /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
281
- /* */
282
- /* FT_EXPORT( return_type ) */
283
- /* */
284
- /* is used in a function declaration, as in */
285
- /* */
286
- /* FT_EXPORT( FT_Error ) */
287
- /* FT_Init_FreeType( FT_Library* alibrary ); */
288
- /* */
283
+ /* If you use a build system like cmake or the `configure' script, */
284
+ /* options set by those programs have precendence, overwriting the */
285
+ /* value here with the configured one. */
289
286
  /* */
290
- /* FT_EXPORT_DEF( return_type ) */
291
- /* */
292
- /* is used in a function definition, as in */
293
- /* */
294
- /* FT_EXPORT_DEF( FT_Error ) */
295
- /* FT_Init_FreeType( FT_Library* alibrary ) */
296
- /* { */
297
- /* ... some code ... */
298
- /* return FT_Err_Ok; */
299
- /* } */
300
- /* */
301
- /* You can provide your own implementation of FT_EXPORT and */
302
- /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
303
- /* will be later automatically defined as `extern return_type' to */
304
- /* allow normal compilation. */
305
- /* */
306
- /* Do not #undef these macros here since the build system might define */
307
- /* them for certain configurations only. */
308
- /* */
309
- /* #define FT_EXPORT(x) extern x */
310
- /* #define FT_EXPORT_DEF(x) x */
287
+ /* #undef FT_CONFIG_OPTION_USE_HARFBUZZ */
311
288
 
312
289
 
313
290
  /*************************************************************************/
@@ -678,7 +655,7 @@ FT_BEGIN_HEADER
678
655
  /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
679
656
  /* defined. */
680
657
  /* */
681
- /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
658
+ /* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
682
659
  /* */
683
660
  /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
684
661
  #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
@@ -698,7 +675,7 @@ FT_BEGIN_HEADER
698
675
  /* composite flags array which can be used to disambiguate, but old */
699
676
  /* fonts will not have them. */
700
677
  /* */
701
- /* http://www.microsoft.com/typography/otspec/glyf.htm */
678
+ /* https://www.microsoft.com/typography/otspec/glyf.htm */
702
679
  /* https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6glyf.html */
703
680
  /* */
704
681
  #undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
@@ -795,6 +772,16 @@ FT_BEGIN_HEADER
795
772
  #undef T1_CONFIG_OPTION_NO_MM_SUPPORT
796
773
 
797
774
 
775
+ /*************************************************************************/
776
+ /* */
777
+ /* T1_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe Type 1 */
778
+ /* engine gets compiled into FreeType. If defined, it is possible to */
779
+ /* switch between the two engines using the `hinting-engine' property of */
780
+ /* the type1 driver module. */
781
+ /* */
782
+ /* #define T1_CONFIG_OPTION_OLD_ENGINE */
783
+
784
+
798
785
  /*************************************************************************/
799
786
  /*************************************************************************/
800
787
  /**** ****/
@@ -810,8 +797,8 @@ FT_BEGIN_HEADER
810
797
  /* possible to set up the default values of the four control points that */
811
798
  /* define the stem darkening behaviour of the (new) CFF engine. For */
812
799
  /* more details please read the documentation of the */
813
- /* `darkening-parameters' property of the cff driver module (file */
814
- /* `ftcffdrv.h'), which allows the control at run-time. */
800
+ /* `darkening-parameters' property (file `ftdriver.h'), which allows the */
801
+ /* control at run-time. */
815
802
  /* */
816
803
  /* Do *not* undefine these macros! */
817
804
  /* */
@@ -899,7 +886,7 @@ FT_BEGIN_HEADER
899
886
  /* */
900
887
  /* This experimental option is active only if the rendering mode is */
901
888
  /* FT_RENDER_MODE_LIGHT; you can switch warping on and off with the */
902
- /* `warping' property of the auto-hinter (see file `ftautoh.h' for more */
889
+ /* `warping' property of the auto-hinter (see file `ftdriver.h' for more */
903
890
  /* information; by default it is switched off). */
904
891
  /* */
905
892
  #define AF_CONFIG_OPTION_USE_WARPER