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
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e18dbe00cd0036b7b963069b6f8f0f8cada41b1c
4
- data.tar.gz: ca8212d54b4c1ca168f2eca3327123c0cc70ce70
3
+ metadata.gz: 51ad02499a7b6632a9fc255c8396b4ec61f2aadd
4
+ data.tar.gz: f2e09b83314b0c51819ade804e5a53149d9b635a
5
5
  SHA512:
6
- metadata.gz: a5d64baf35522fb1677627dd9d86a04e8fa29ebf70f602e8f686ba3d77593c60c7242ddcaa4c3d9d9bef42d738a0ff57ece38bc06e079041d83186988b1d2c8e
7
- data.tar.gz: e26bed5b7c4baada2ba54fefe3e9a1f6c7784620ca5ce6bbffe82855ece53ace2b17b415f8fb54a06857228a095a175fde3d6d548a29da940fa0acd2905fd251
6
+ metadata.gz: 342cbfabdc39c4f789641093bf301bcb232a43e4479d1153b0ab3d8bb42be8e5b974378632692c205d47edfe343e4a57db5fa97aee976a031dccef7de1c2d36f
7
+ data.tar.gz: 1eb34a19539778dd45f6a3889d810cdd512e7232beac3ac5a6737d9e85dd0b9fd6ea2f647e2d04262914fe70768b4964c91376af59925c7b08a6c0ccdf275e77
data/NEWS CHANGED
@@ -1,3 +1,15 @@
1
+ Release 1.14.1 (2014-12-23) Kouhei Sutou <kou@cozmixng.org>
2
+ ===========================================================
3
+
4
+ Windows users must upgrade. Non Windows users doesn't need to
5
+ upgrade.
6
+
7
+ Improvements
8
+ ------------
9
+
10
+ * Upgraded bundled libraries for Windows. libpng is upgraded to
11
+ 1.6.16 from 1.6.14. libpng 1.6.14 has vulnerability.
12
+
1
13
  Release 1.14.0 (2014-11-24) Kouhei Sutou <kou@cozmixng.org>
2
14
  ===========================================================
3
15
 
data/Rakefile CHANGED
@@ -450,16 +450,16 @@ windows_task = WindowsTask.new(spec) do |task|
450
450
  },
451
451
  {
452
452
  :name => "libpng",
453
- :version => "1.6.14",
454
- :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.14",
453
+ :version => "1.6.16",
454
+ :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.16",
455
455
  :windows => {
456
456
  :built_file => "bin/libpng16-16.dll",
457
457
  },
458
458
  },
459
459
  {
460
460
  :name => "freetype",
461
- :version => "2.5.3",
462
- :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.5.3",
461
+ :version => "2.5.4",
462
+ :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.5.4",
463
463
  :compression_method => "bz2",
464
464
  :windows => {
465
465
  :built_file => "bin/libfreetype-6.dll",
@@ -609,6 +609,16 @@ file "Makefile" => ["extconf.rb", "ext/cairo/extconf.rb"] do
609
609
  ruby("extconf.rb")
610
610
  end
611
611
 
612
+ namespace :make do
613
+ namespace :debug_flags do
614
+ task :reset do
615
+ ENV["MAKE"] ||= "make debugflags="
616
+ end
617
+ end
618
+ end
619
+
620
+ task :cross => "make:debug_flags:reset"
621
+
612
622
  desc "Configure"
613
623
  task :configure => "Makefile"
614
624
 
data/ext/cairo/rb_cairo.h CHANGED
@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
73
73
 
74
74
  #define RB_CAIRO_VERSION_MAJOR 1
75
75
  #define RB_CAIRO_VERSION_MINOR 14
76
- #define RB_CAIRO_VERSION_MICRO 0
76
+ #define RB_CAIRO_VERSION_MICRO 1
77
77
 
78
78
  RB_CAIRO_VAR VALUE rb_mCairo;
79
79
  RB_CAIRO_VAR VALUE rb_cCairo_Context;
data/lib/2.0/cairo.so CHANGED
Binary file
data/lib/2.1/cairo.so CHANGED
Binary file
data/lib/2.2/cairo.so CHANGED
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
@@ -75,7 +75,7 @@ while test $# -gt 0 ; do
75
75
  echo_exec_prefix=yes
76
76
  ;;
77
77
  --version)
78
- echo 17.2.11
78
+ echo 17.3.11
79
79
  exit 0
80
80
  ;;
81
81
  --ftversion)
@@ -142,7 +142,7 @@ if test "$echo_cflags" = "yes" ; then
142
142
  fi
143
143
 
144
144
  if test "$echo_libs" = "yes" ; then
145
- libs="-lfreetype -L/home/vagrant/rcairo.win64/vendor/local/lib -lz -L/home/vagrant/rcairo.win64/vendor/local/lib -lpng16"
145
+ libs="-lfreetype"
146
146
  staticlibs="-lfreetype -L/home/vagrant/rcairo.win64/vendor/local/lib -lz -L/home/vagrant/rcairo.win64/vendor/local/lib -lpng16 -lz"
147
147
  if test "$show_static" = "yes" ; then
148
148
  libs="$staticlibs"
Binary file
Binary file
Binary file
Binary file
@@ -11,7 +11,7 @@
11
11
 
12
12
  # Modeled after libxml-config.
13
13
 
14
- version="1.6.14"
14
+ version="1.6.16"
15
15
  prefix="/home/vagrant/rcairo.win64/vendor/local"
16
16
  exec_prefix="${prefix}"
17
17
  libdir="${exec_prefix}/lib"
Binary file
@@ -11,7 +11,7 @@
11
11
 
12
12
  # Modeled after libxml-config.
13
13
 
14
- version="1.6.14"
14
+ version="1.6.16"
15
15
  prefix="/home/vagrant/rcairo.win64/vendor/local"
16
16
  exec_prefix="${prefix}"
17
17
  libdir="${exec_prefix}/lib"
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
@@ -297,7 +297,16 @@ FT_BEGIN_HEADER
297
297
  #define FT_INT64 long
298
298
  #define FT_UINT64 unsigned long
299
299
 
300
- #elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
300
+ /*************************************************************************/
301
+ /* */
302
+ /* A 64-bit data type may create compilation problems if you compile */
303
+ /* in strict ANSI mode. To avoid them, we disable other 64-bit data */
304
+ /* types if __STDC__ is defined. You can however ignore this rule */
305
+ /* by defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */
306
+ /* */
307
+ #elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 )
308
+
309
+ #if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
301
310
 
302
311
  /* this compiler provides the __int64 type */
303
312
  #define FT_LONG64
@@ -331,30 +340,9 @@ FT_BEGIN_HEADER
331
340
  #define FT_INT64 long long int
332
341
  #define FT_UINT64 unsigned long long int
333
342
 
334
- #endif /* FT_SIZEOF_LONG == 8 */
335
-
336
-
337
- /*************************************************************************/
338
- /* */
339
- /* A 64-bit data type will create compilation problems if you compile */
340
- /* in strict ANSI mode. To avoid them, we disable its use if __STDC__ */
341
- /* is defined. You can however ignore this rule by defining the */
342
- /* FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */
343
- /* */
344
- #if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 )
345
-
346
- #ifdef __STDC__
347
-
348
- /* Undefine the 64-bit macros in strict ANSI compilation mode. */
349
- /* Since `#undef' doesn't survive in configuration header files */
350
- /* we use the postprocessing facility of AC_CONFIG_HEADERS to */
351
- /* replace the leading `/' with `#'. */
352
- #undef FT_LONG64
353
- #undef FT_INT64
354
-
355
- #endif /* __STDC__ */
343
+ #endif /* _MSC_VER */
356
344
 
357
- #endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
345
+ #endif /* FT_SIZEOF_LONG == 8 */
358
346
 
359
347
  #ifdef FT_LONG64
360
348
  typedef FT_INT64 FT_Int64;
@@ -367,219 +355,6 @@ FT_BEGIN_HEADER
367
355
  #define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT
368
356
 
369
357
 
370
- #ifndef FT_CONFIG_OPTION_NO_ASSEMBLER
371
- /* Provide assembler fragments for performance-critical functions. */
372
- /* These must be defined `static __inline__' with GCC. */
373
-
374
- #if defined( __CC_ARM ) || defined( __ARMCC__ ) /* RVCT */
375
-
376
- #define FT_MULFIX_ASSEMBLER FT_MulFix_arm
377
-
378
- /* documentation is in freetype.h */
379
-
380
- static __inline FT_Int32
381
- FT_MulFix_arm( FT_Int32 a,
382
- FT_Int32 b )
383
- {
384
- register FT_Int32 t, t2;
385
-
386
-
387
- __asm
388
- {
389
- smull t2, t, b, a /* (lo=t2,hi=t) = a*b */
390
- mov a, t, asr #31 /* a = (hi >> 31) */
391
- add a, a, #0x8000 /* a += 0x8000 */
392
- adds t2, t2, a /* t2 += a */
393
- adc t, t, #0 /* t += carry */
394
- mov a, t2, lsr #16 /* a = t2 >> 16 */
395
- orr a, a, t, lsl #16 /* a |= t << 16 */
396
- }
397
- return a;
398
- }
399
-
400
- #endif /* __CC_ARM || __ARMCC__ */
401
-
402
-
403
- #ifdef __GNUC__
404
-
405
- #if defined( __arm__ ) && \
406
- ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \
407
- !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
408
-
409
- #define FT_MULFIX_ASSEMBLER FT_MulFix_arm
410
-
411
- /* documentation is in freetype.h */
412
-
413
- static __inline__ FT_Int32
414
- FT_MulFix_arm( FT_Int32 a,
415
- FT_Int32 b )
416
- {
417
- register FT_Int32 t, t2;
418
-
419
-
420
- __asm__ __volatile__ (
421
- "smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */
422
- "mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */
423
- #if defined( __clang__ ) && defined( __thumb2__ )
424
- "add.w %0, %0, #0x8000\n\t" /* %0 += 0x8000 */
425
- #else
426
- "add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */
427
- #endif
428
- "adds %1, %1, %0\n\t" /* %1 += %0 */
429
- "adc %2, %2, #0\n\t" /* %2 += carry */
430
- "mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */
431
- "orr %0, %0, %2, lsl #16\n\t" /* %0 |= %2 << 16 */
432
- : "=r"(a), "=&r"(t2), "=&r"(t)
433
- : "r"(a), "r"(b)
434
- : "cc" );
435
- return a;
436
- }
437
-
438
- #endif /* __arm__ && */
439
- /* ( __thumb2__ || !__thumb__ ) && */
440
- /* !( __CC_ARM || __ARMCC__ ) */
441
-
442
-
443
- #if defined( __i386__ )
444
-
445
- #define FT_MULFIX_ASSEMBLER FT_MulFix_i386
446
-
447
- /* documentation is in freetype.h */
448
-
449
- static __inline__ FT_Int32
450
- FT_MulFix_i386( FT_Int32 a,
451
- FT_Int32 b )
452
- {
453
- register FT_Int32 result;
454
-
455
-
456
- __asm__ __volatile__ (
457
- "imul %%edx\n"
458
- "movl %%edx, %%ecx\n"
459
- "sarl $31, %%ecx\n"
460
- "addl $0x8000, %%ecx\n"
461
- "addl %%ecx, %%eax\n"
462
- "adcl $0, %%edx\n"
463
- "shrl $16, %%eax\n"
464
- "shll $16, %%edx\n"
465
- "addl %%edx, %%eax\n"
466
- : "=a"(result), "=d"(b)
467
- : "a"(a), "d"(b)
468
- : "%ecx", "cc" );
469
- return result;
470
- }
471
-
472
- #endif /* i386 */
473
-
474
- #endif /* __GNUC__ */
475
-
476
-
477
- #ifdef _MSC_VER /* Visual C++ */
478
-
479
- #ifdef _M_IX86
480
-
481
- #define FT_MULFIX_ASSEMBLER FT_MulFix_i386
482
-
483
- /* documentation is in freetype.h */
484
-
485
- static __inline FT_Int32
486
- FT_MulFix_i386( FT_Int32 a,
487
- FT_Int32 b )
488
- {
489
- register FT_Int32 result;
490
-
491
- __asm
492
- {
493
- mov eax, a
494
- mov edx, b
495
- imul edx
496
- mov ecx, edx
497
- sar ecx, 31
498
- add ecx, 8000h
499
- add eax, ecx
500
- adc edx, 0
501
- shr eax, 16
502
- shl edx, 16
503
- add eax, edx
504
- mov result, eax
505
- }
506
- return result;
507
- }
508
-
509
- #endif /* _M_IX86 */
510
-
511
- #endif /* _MSC_VER */
512
-
513
-
514
- #if defined( __GNUC__ ) && defined( __x86_64__ )
515
-
516
- #define FT_MULFIX_ASSEMBLER FT_MulFix_x86_64
517
-
518
- static __inline__ FT_Int32
519
- FT_MulFix_x86_64( FT_Int32 a,
520
- FT_Int32 b )
521
- {
522
- /* Temporarily disable the warning that C90 doesn't support */
523
- /* `long long'. */
524
- #if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
525
- #pragma GCC diagnostic push
526
- #pragma GCC diagnostic ignored "-Wlong-long"
527
- #endif
528
-
529
- #if 1
530
- /* Technically not an assembly fragment, but GCC does a really good */
531
- /* job at inlining it and generating good machine code for it. */
532
- long long ret, tmp;
533
-
534
-
535
- ret = (long long)a * b;
536
- tmp = ret >> 63;
537
- ret += 0x8000 + tmp;
538
-
539
- return (FT_Int32)( ret >> 16 );
540
- #else
541
-
542
- /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine */
543
- /* code from the lines below. The main issue is that `wide_a' is not */
544
- /* properly initialized by sign-extending `a'. Instead, the generated */
545
- /* machine code assumes that the register that contains `a' on input */
546
- /* can be used directly as a 64-bit value, which is wrong most of the */
547
- /* time. */
548
- long long wide_a = (long long)a;
549
- long long wide_b = (long long)b;
550
- long long result;
551
-
552
-
553
- __asm__ __volatile__ (
554
- "imul %2, %1\n"
555
- "mov %1, %0\n"
556
- "sar $63, %0\n"
557
- "lea 0x8000(%1, %0), %0\n"
558
- "sar $16, %0\n"
559
- : "=&r"(result), "=&r"(wide_a)
560
- : "r"(wide_b)
561
- : "cc" );
562
-
563
- return (FT_Int32)result;
564
- #endif
565
-
566
- #if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
567
- #pragma GCC diagnostic pop
568
- #endif
569
- }
570
-
571
- #endif /* __GNUC__ && __x86_64__ */
572
-
573
- #endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
574
-
575
-
576
- #ifdef FT_CONFIG_OPTION_INLINE_MULFIX
577
- #ifdef FT_MULFIX_ASSEMBLER
578
- #define FT_MULFIX_INLINED FT_MULFIX_ASSEMBLER
579
- #endif
580
- #endif
581
-
582
-
583
358
  #ifdef FT_MAKE_OPTION_SINGLE_OBJECT
584
359
 
585
360
  #define FT_LOCAL( x ) static x
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* User-selectable configuration macros (specification only). */
6
6
  /* */
7
- /* Copyright 1996-2013 by */
7
+ /* Copyright 1996-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, */
@@ -61,7 +61,7 @@ FT_BEGIN_HEADER
61
61
  /* that are statically linked to the library at compile time. By */
62
62
  /* default, this file is <config/ftmodule.h>. */
63
63
  /* */
64
- /* We highly recommend using the third method whenever possible. */
64
+ /* We highly recommend using the third method whenever possible. */
65
65
  /* */
66
66
  /*************************************************************************/
67
67
 
@@ -216,7 +216,7 @@ FT_BEGIN_HEADER
216
216
 
217
217
  /*************************************************************************/
218
218
  /* */
219
- /* PNG bitmap support. */
219
+ /* PNG bitmap support. */
220
220
  /* */
221
221
  /* FreeType now handles loading color bitmap glyphs in the PNG format. */
222
222
  /* This requires help from the external libpng library. Uncompressed */
@@ -230,7 +230,7 @@ FT_BEGIN_HEADER
230
230
 
231
231
  /*************************************************************************/
232
232
  /* */
233
- /* HarfBuzz support. */
233
+ /* HarfBuzz support. */
234
234
  /* */
235
235
  /* FreeType uses the HarfBuzz library to improve auto-hinting of */
236
236
  /* OpenType fonts. If available, many glyphs not directly addressable */
@@ -771,6 +771,30 @@ FT_BEGIN_HEADER
771
771
  /*************************************************************************/
772
772
 
773
773
 
774
+ /*************************************************************************/
775
+ /* */
776
+ /* Using CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4} it is */
777
+ /* possible to set up the default values of the four control points that */
778
+ /* define the stem darkening behaviour of the (new) CFF engine. For */
779
+ /* more details please read the documentation of the */
780
+ /* `darkening-parameters' property of the cff driver module (file */
781
+ /* `ftcffdrv.h'), which allows the control at run-time. */
782
+ /* */
783
+ /* Do *not* undefine these macros! */
784
+ /* */
785
+ #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 500
786
+ #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 400
787
+
788
+ #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 1000
789
+ #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 275
790
+
791
+ #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 1667
792
+ #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 275
793
+
794
+ #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 2333
795
+ #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 0
796
+
797
+
774
798
  /*************************************************************************/
775
799
  /* */
776
800
  /* CFF_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe CFF */
@@ -820,8 +844,8 @@ FT_BEGIN_HEADER
820
844
 
821
845
 
822
846
  /*
823
- * This macro is obsolete. Support has been removed in FreeType
824
- * version 2.5.
847
+ * This macro is obsolete. Support has been removed in FreeType
848
+ * version 2.5.
825
849
  */
826
850
  /* #define FT_CONFIG_OPTION_OLD_INTERNALS */
827
851
 
@@ -837,6 +861,35 @@ FT_BEGIN_HEADER
837
861
  #define TT_USE_BYTECODE_INTERPRETER
838
862
  #endif
839
863
 
864
+
865
+ /*
866
+ * Check CFF darkening parameters. The checks are the same as in function
867
+ * `cff_property_set' in file `cffdrivr.c'.
868
+ */
869
+ #if CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 < 0 || \
870
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 < 0 || \
871
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 < 0 || \
872
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 < 0 || \
873
+ \
874
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 < 0 || \
875
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 < 0 || \
876
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 < 0 || \
877
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 < 0 || \
878
+ \
879
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 > \
880
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 || \
881
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 > \
882
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 || \
883
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 > \
884
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 || \
885
+ \
886
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 > 500 || \
887
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 > 500 || \
888
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 > 500 || \
889
+ CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 > 500
890
+ #error "Invalid CFF darkening parameters!"
891
+ #endif
892
+
840
893
  FT_END_HEADER
841
894
 
842
895