cairo 1.14.1-x86-mingw32 → 1.14.2-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 (215) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS +21 -0
  3. data/Rakefile +18 -7
  4. data/ext/cairo/cairo.def +1 -0
  5. data/ext/cairo/extconf.rb +23 -10
  6. data/ext/cairo/rb_cairo.c +3 -0
  7. data/ext/cairo/rb_cairo.h +3 -3
  8. data/ext/cairo/rb_cairo_context.c +1 -1
  9. data/ext/cairo/rb_cairo_io.c +4 -0
  10. data/ext/cairo/rb_cairo_io.h +2 -0
  11. data/ext/cairo/rb_cairo_pattern.c +4 -4
  12. data/ext/cairo/rb_cairo_private.h +2 -0
  13. data/ext/cairo/rb_cairo_surface.c +64 -232
  14. data/lib/2.0/cairo.so +0 -0
  15. data/lib/2.1/cairo.so +0 -0
  16. data/lib/2.2/cairo.so +0 -0
  17. data/lib/cairo.rb +20 -19
  18. data/lib/cairo/region.rb +14 -0
  19. data/test/test_region.rb +26 -0
  20. data/vendor/local/bin/fc-cache.exe +0 -0
  21. data/vendor/local/bin/fc-cat.exe +0 -0
  22. data/vendor/local/bin/fc-list.exe +0 -0
  23. data/vendor/local/bin/fc-match.exe +0 -0
  24. data/vendor/local/bin/fc-pattern.exe +0 -0
  25. data/vendor/local/bin/fc-query.exe +0 -0
  26. data/vendor/local/bin/fc-scan.exe +0 -0
  27. data/vendor/local/bin/fc-validate.exe +0 -0
  28. data/vendor/local/bin/freetype-config +2 -2
  29. data/vendor/local/bin/libcairo-2.dll +0 -0
  30. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  31. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  32. data/vendor/local/bin/libfontconfig-1.dll +0 -0
  33. data/vendor/local/bin/libfreetype-6.dll +0 -0
  34. data/vendor/local/bin/libgcc_s_sjlj-1.dll +0 -0
  35. data/vendor/local/bin/libpixman-1-0.dll +0 -0
  36. data/vendor/local/bin/libpng-config +1 -1
  37. data/vendor/local/bin/libpng16-16.dll +0 -0
  38. data/vendor/local/bin/libpng16-config +1 -1
  39. data/vendor/local/bin/libstdc++-6.dll +0 -0
  40. data/vendor/local/bin/libwinpthread-1.dll +0 -0
  41. data/vendor/local/bin/libxml2-2.dll +0 -0
  42. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  43. data/vendor/local/bin/pngfix.exe +0 -0
  44. data/vendor/local/bin/xmlcatalog.exe +0 -0
  45. data/vendor/local/bin/xmllint.exe +0 -0
  46. data/vendor/local/bin/zlib1.dll +0 -0
  47. data/vendor/local/include/cairo/cairo-version.h +1 -1
  48. data/vendor/local/include/freetype2/config/ftconfig.h +19 -2
  49. data/vendor/local/include/freetype2/config/ftheader.h +7 -5
  50. data/vendor/local/include/freetype2/config/ftoption.h +9 -22
  51. data/vendor/local/include/freetype2/config/ftstdlib.h +2 -3
  52. data/vendor/local/include/freetype2/freetype.h +38 -17
  53. data/vendor/local/include/freetype2/ft2build.h +1 -1
  54. data/vendor/local/include/freetype2/ftadvanc.h +2 -2
  55. data/vendor/local/include/freetype2/ftautoh.h +50 -2
  56. data/vendor/local/include/freetype2/ftbbox.h +1 -1
  57. data/vendor/local/include/freetype2/ftbdf.h +1 -1
  58. data/vendor/local/include/freetype2/ftbitmap.h +11 -3
  59. data/vendor/local/include/freetype2/ftbzip2.h +1 -1
  60. data/vendor/local/include/freetype2/ftcache.h +3 -3
  61. data/vendor/local/include/freetype2/ftcffdrv.h +1 -1
  62. data/vendor/local/include/freetype2/ftcid.h +2 -1
  63. data/vendor/local/include/freetype2/fterrdef.h +1 -1
  64. data/vendor/local/include/freetype2/fterrors.h +1 -1
  65. data/vendor/local/include/freetype2/{ftxf86.h → ftfntfmt.h} +22 -14
  66. data/vendor/local/include/freetype2/ftgasp.h +1 -1
  67. data/vendor/local/include/freetype2/ftglyph.h +1 -1
  68. data/vendor/local/include/freetype2/ftgxval.h +1 -1
  69. data/vendor/local/include/freetype2/ftgzip.h +1 -1
  70. data/vendor/local/include/freetype2/ftimage.h +7 -13
  71. data/vendor/local/include/freetype2/ftincrem.h +1 -1
  72. data/vendor/local/include/freetype2/ftlcdfil.h +2 -2
  73. data/vendor/local/include/freetype2/ftlist.h +1 -1
  74. data/vendor/local/include/freetype2/ftlzw.h +1 -1
  75. data/vendor/local/include/freetype2/ftmac.h +1 -1
  76. data/vendor/local/include/freetype2/ftmm.h +17 -11
  77. data/vendor/local/include/freetype2/ftmodapi.h +4 -2
  78. data/vendor/local/include/freetype2/ftmoderr.h +1 -1
  79. data/vendor/local/include/freetype2/ftotval.h +1 -1
  80. data/vendor/local/include/freetype2/ftoutln.h +1 -1
  81. data/vendor/local/include/freetype2/ftpfr.h +1 -1
  82. data/vendor/local/include/freetype2/ftrender.h +3 -8
  83. data/vendor/local/include/freetype2/ftsizes.h +1 -1
  84. data/vendor/local/include/freetype2/ftsnames.h +1 -1
  85. data/vendor/local/include/freetype2/ftstroke.h +1 -1
  86. data/vendor/local/include/freetype2/ftsynth.h +5 -3
  87. data/vendor/local/include/freetype2/ftsystem.h +10 -1
  88. data/vendor/local/include/freetype2/fttrigon.h +1 -1
  89. data/vendor/local/include/freetype2/ftttdrv.h +85 -22
  90. data/vendor/local/include/freetype2/fttypes.h +1 -1
  91. data/vendor/local/include/freetype2/ftwinfnt.h +3 -3
  92. data/vendor/local/include/freetype2/t1tables.h +4 -3
  93. data/vendor/local/include/freetype2/ttnameid.h +116 -116
  94. data/vendor/local/include/freetype2/tttables.h +2 -2
  95. data/vendor/local/include/freetype2/tttags.h +1 -1
  96. data/vendor/local/include/freetype2/ttunpat.h +1 -1
  97. data/vendor/local/include/libpng16/png.h +63 -80
  98. data/vendor/local/include/libpng16/pngconf.h +8 -30
  99. data/vendor/local/include/libpng16/pnglibconf.h +10 -4
  100. data/vendor/local/include/png.h +63 -80
  101. data/vendor/local/include/pngconf.h +8 -30
  102. data/vendor/local/include/pnglibconf.h +10 -4
  103. data/vendor/local/lib/libcairo-gobject.a +0 -0
  104. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  105. data/vendor/local/lib/libcairo-gobject.la +2 -2
  106. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  107. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  108. data/vendor/local/lib/libcairo-script-interpreter.la +2 -2
  109. data/vendor/local/lib/libcairo.a +0 -0
  110. data/vendor/local/lib/libcairo.dll.a +0 -0
  111. data/vendor/local/lib/libcairo.la +2 -2
  112. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  113. data/vendor/local/lib/libfreetype.a +0 -0
  114. data/vendor/local/lib/libfreetype.dll.a +0 -0
  115. data/vendor/local/lib/libfreetype.la +4 -4
  116. data/vendor/local/lib/libpixman-1.a +0 -0
  117. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  118. data/vendor/local/lib/libpng.a +0 -0
  119. data/vendor/local/lib/libpng.dll.a +0 -0
  120. data/vendor/local/lib/libpng.la +4 -4
  121. data/vendor/local/lib/libpng16.a +0 -0
  122. data/vendor/local/lib/libpng16.dll.a +0 -0
  123. data/vendor/local/lib/libpng16.la +4 -4
  124. data/vendor/local/lib/libxml2.a +0 -0
  125. data/vendor/local/lib/libxml2.dll.a +0 -0
  126. data/vendor/local/lib/libz.a +0 -0
  127. data/vendor/local/lib/libz.dll.a +0 -0
  128. data/vendor/local/lib/pkgconfig/cairo-fc.pc +1 -1
  129. data/vendor/local/lib/pkgconfig/cairo-ft.pc +1 -1
  130. data/vendor/local/lib/pkgconfig/cairo-gobject.pc +1 -1
  131. data/vendor/local/lib/pkgconfig/cairo-pdf.pc +1 -1
  132. data/vendor/local/lib/pkgconfig/cairo-png.pc +1 -1
  133. data/vendor/local/lib/pkgconfig/cairo-ps.pc +1 -1
  134. data/vendor/local/lib/pkgconfig/cairo-script.pc +1 -1
  135. data/vendor/local/lib/pkgconfig/cairo-svg.pc +1 -1
  136. data/vendor/local/lib/pkgconfig/cairo-win32-font.pc +1 -1
  137. data/vendor/local/lib/pkgconfig/cairo-win32.pc +1 -1
  138. data/vendor/local/lib/pkgconfig/cairo.pc +1 -1
  139. data/vendor/local/lib/pkgconfig/freetype2.pc +1 -1
  140. data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
  141. data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
  142. data/vendor/local/share/aclocal/freetype2.m4 +1 -1
  143. data/vendor/local/share/gtk-doc/html/cairo/bindings-errors.html +12 -12
  144. data/vendor/local/share/gtk-doc/html/cairo/bindings-fonts.html +12 -12
  145. data/vendor/local/share/gtk-doc/html/cairo/bindings-memory.html +12 -12
  146. data/vendor/local/share/gtk-doc/html/cairo/bindings-overloading.html +13 -13
  147. data/vendor/local/share/gtk-doc/html/cairo/bindings-path.html +12 -12
  148. data/vendor/local/share/gtk-doc/html/cairo/bindings-patterns.html +35 -35
  149. data/vendor/local/share/gtk-doc/html/cairo/bindings-return-values.html +10 -10
  150. data/vendor/local/share/gtk-doc/html/cairo/bindings-streams.html +11 -11
  151. data/vendor/local/share/gtk-doc/html/cairo/bindings-surfaces.html +13 -13
  152. data/vendor/local/share/gtk-doc/html/cairo/cairo-Error-handling.html +294 -225
  153. data/vendor/local/share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html +387 -269
  154. data/vendor/local/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html +432 -302
  155. data/vendor/local/share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html +325 -217
  156. data/vendor/local/share/gtk-doc/html/cairo/cairo-PNG-Support.html +298 -193
  157. data/vendor/local/share/gtk-doc/html/cairo/cairo-Paths.html +1121 -812
  158. data/vendor/local/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html +513 -383
  159. data/vendor/local/share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html +126 -83
  160. data/vendor/local/share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html +172 -119
  161. data/vendor/local/share/gtk-doc/html/cairo/cairo-Raster-Sources.html +581 -372
  162. data/vendor/local/share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html +179 -130
  163. data/vendor/local/share/gtk-doc/html/cairo/cairo-Regions.html +888 -539
  164. data/vendor/local/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html +287 -192
  165. data/vendor/local/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html +374 -231
  166. data/vendor/local/share/gtk-doc/html/cairo/cairo-Transformations.html +395 -219
  167. data/vendor/local/share/gtk-doc/html/cairo/cairo-Types.html +125 -75
  168. data/vendor/local/share/gtk-doc/html/cairo/cairo-User-Fonts.html +630 -464
  169. data/vendor/local/share/gtk-doc/html/cairo/cairo-Version-Information.html +225 -200
  170. data/vendor/local/share/gtk-doc/html/cairo/cairo-Win32-Fonts.html +336 -214
  171. data/vendor/local/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html +277 -186
  172. data/vendor/local/share/gtk-doc/html/cairo/cairo-XCB-Surfaces.html +495 -350
  173. data/vendor/local/share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html +557 -362
  174. data/vendor/local/share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html +158 -111
  175. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-device-t.html +655 -441
  176. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html +389 -280
  177. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html +667 -451
  178. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html +579 -351
  179. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html +2006 -1545
  180. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html +892 -618
  181. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html +1624 -1188
  182. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-t.html +2903 -2104
  183. data/vendor/local/share/gtk-doc/html/cairo/cairo-drawing.html +13 -13
  184. data/vendor/local/share/gtk-doc/html/cairo/cairo-fonts.html +13 -13
  185. data/vendor/local/share/gtk-doc/html/cairo/cairo-support.html +13 -13
  186. data/vendor/local/share/gtk-doc/html/cairo/cairo-surfaces.html +13 -13
  187. data/vendor/local/share/gtk-doc/html/cairo/cairo-text.html +1115 -758
  188. data/vendor/local/share/gtk-doc/html/cairo/cairo.devhelp2 +419 -604
  189. data/vendor/local/share/gtk-doc/html/cairo/home.png +0 -0
  190. data/vendor/local/share/gtk-doc/html/cairo/index-1.10.html +56 -56
  191. data/vendor/local/share/gtk-doc/html/cairo/index-1.12.html +70 -70
  192. data/vendor/local/share/gtk-doc/html/cairo/index-1.2.html +58 -58
  193. data/vendor/local/share/gtk-doc/html/cairo/index-1.4.html +39 -39
  194. data/vendor/local/share/gtk-doc/html/cairo/index-1.6.html +30 -30
  195. data/vendor/local/share/gtk-doc/html/cairo/index-1.8.html +38 -38
  196. data/vendor/local/share/gtk-doc/html/cairo/index-all.html +426 -426
  197. data/vendor/local/share/gtk-doc/html/cairo/index.html +6 -6
  198. data/vendor/local/share/gtk-doc/html/cairo/index.sgml +234 -325
  199. data/vendor/local/share/gtk-doc/html/cairo/language-bindings.html +12 -12
  200. data/vendor/local/share/gtk-doc/html/cairo/left-insensitive.png +0 -0
  201. data/vendor/local/share/gtk-doc/html/cairo/left.png +0 -0
  202. data/vendor/local/share/gtk-doc/html/cairo/right-insensitive.png +0 -0
  203. data/vendor/local/share/gtk-doc/html/cairo/right.png +0 -0
  204. data/vendor/local/share/gtk-doc/html/cairo/style.css +221 -26
  205. data/vendor/local/share/gtk-doc/html/cairo/up-insensitive.png +0 -0
  206. data/vendor/local/share/gtk-doc/html/cairo/up.png +0 -0
  207. data/vendor/local/share/license/cairo/README +1 -1
  208. data/vendor/local/share/license/freetype/README +6 -6
  209. data/vendor/local/share/license/freetype/README.git +1 -1
  210. data/vendor/local/share/license/libpng/README +2 -2
  211. data/vendor/local/share/man/man1/freetype-config.1 +1 -1
  212. data/vendor/local/share/man/man3/libpng.3 +85 -92
  213. data/vendor/local/share/man/man3/libpngpf.3 +2 -2
  214. data/vendor/local/share/man/man5/png.5 +1 -1
  215. metadata +23 -19
Binary file
Binary file
Binary file
@@ -1,19 +1,19 @@
1
1
  # vim: filetype=ruby:expandtab:shiftwidth=2:tabstop=8:softtabstop=2 :
2
2
 
3
3
  if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
4
- require 'pathname'
4
+ require "pathname"
5
5
  base_dir = Pathname(File.dirname(__FILE__))
6
6
  base_dir = base_dir.parent + "vendor" + "local"
7
7
  if base_dir.exist?
8
8
  base_dir = base_dir.to_s.gsub(/\//, "\\")
9
- ENV['PATH'] = %w(bin lib).collect do |dir|
9
+ ENV["PATH"] = %w(bin lib).collect do |dir|
10
10
  "#{base_dir}\\#{dir};"
11
- end.join('') + ENV['PATH']
11
+ end.join("") + ENV["PATH"]
12
12
  else
13
- require 'rbconfig'
14
- ENV['PATH'] = %w(bin lib).collect do |dir|
13
+ require "rbconfig"
14
+ ENV["PATH"] = %w(bin lib).collect do |dir|
15
15
  "#{RbConfig::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
16
- end.join('') + ENV['PATH']
16
+ end.join("") + ENV["PATH"]
17
17
  end
18
18
  end
19
19
 
@@ -36,16 +36,16 @@ module Cairo
36
36
  end
37
37
  end
38
38
 
39
- require 'cairo/color'
40
- require 'cairo/paper'
39
+ require "cairo/color"
40
+ require "cairo/paper"
41
41
 
42
42
  begin
43
43
  major, minor, _ = RUBY_VERSION.split(/\./)
44
44
  require "#{major}.#{minor}/cairo.so"
45
45
  rescue LoadError
46
- require 'cairo.so'
46
+ require "cairo.so"
47
47
  end
48
- require 'cairo/constants'
48
+ require "cairo/constants"
49
49
 
50
50
  module Cairo
51
51
  class << self
@@ -53,7 +53,7 @@ module Cairo
53
53
 
54
54
  def bindings_version
55
55
  major, minor, micro, tag = BINDINGS_VERSION
56
- version = [major, minor, micro].join('.')
56
+ version = [major, minor, micro].join(".")
57
57
  version << "-#{tag}" if tag
58
58
  version
59
59
  end
@@ -138,14 +138,15 @@ module Cairo
138
138
  end
139
139
  end
140
140
 
141
- require 'cairo/point'
142
- require 'cairo/colors'
143
- require 'cairo/papers'
144
- require 'cairo/context'
145
- require 'cairo/device'
146
- require 'cairo/surface'
147
- require 'cairo/pattern'
148
- require 'cairo/path'
141
+ require "cairo/point"
142
+ require "cairo/colors"
143
+ require "cairo/papers"
144
+ require "cairo/context"
145
+ require "cairo/device"
146
+ require "cairo/surface"
147
+ require "cairo/pattern"
148
+ require "cairo/path"
149
+ require "cairo/region"
149
150
 
150
151
  module Cairo
151
152
  if const_defined?(:Win32Surface)
@@ -0,0 +1,14 @@
1
+ module Cairo
2
+ class Region
3
+ def each_rectangle
4
+ return to_enum(:each_rectangle) unless block_given?
5
+ num_rectangles.times.each do |i|
6
+ yield(self[i])
7
+ end
8
+ end
9
+
10
+ def rectangles
11
+ each_rectangle.to_a
12
+ end
13
+ end
14
+ end
@@ -25,6 +25,32 @@ class RegionTest < Test::Unit::TestCase
25
25
  assert_equal([0, 0, 10, 10], region[0])
26
26
  end
27
27
 
28
+ def test_each_rectangle
29
+ region = Cairo::Region.new
30
+ region.union!([0, 0, 10, 10])
31
+ region.union!([20, 20, 40, 40])
32
+ rectangles = []
33
+ region.each_rectangle do |rectangle|
34
+ rectangles << rectangle
35
+ end
36
+ assert_equal([
37
+ [0, 0, 10, 10],
38
+ [20, 20, 40, 40],
39
+ ],
40
+ rectangles)
41
+ end
42
+
43
+ def test_rectangles
44
+ region = Cairo::Region.new
45
+ region.union!([0, 0, 10, 10])
46
+ region.union!([20, 20, 40, 40])
47
+ assert_equal([
48
+ [0, 0, 10, 10],
49
+ [20, 20, 40, 40],
50
+ ],
51
+ region.rectangles)
52
+ end
53
+
28
54
  def test_dup
29
55
  region = Cairo::Region.new([0, 0, 10, 10])
30
56
  region.dup.subtract!([5, 5, 5, 5])
Binary file
Binary file
Binary file
@@ -1,6 +1,6 @@
1
1
  #! /bin/sh
2
2
  #
3
- # Copyright 2000-2005, 2008, 2009, 2013, 2014 by
3
+ # Copyright 2000-2015 by
4
4
  # David Turner, Robert Wilhelm, and Werner Lemberg.
5
5
  #
6
6
  # This file is part of the FreeType project, and may only be used, modified,
@@ -75,7 +75,7 @@ while test $# -gt 0 ; do
75
75
  echo_exec_prefix=yes
76
76
  ;;
77
77
  --version)
78
- echo 17.3.11
78
+ echo 18.0.12
79
79
  exit 0
80
80
  ;;
81
81
  --ftversion)
@@ -11,7 +11,7 @@
11
11
 
12
12
  # Modeled after libxml-config.
13
13
 
14
- version="1.6.16"
14
+ version="1.6.18"
15
15
  prefix="/home/vagrant/rcairo.win32/vendor/local"
16
16
  exec_prefix="${prefix}"
17
17
  libdir="${exec_prefix}/lib"
@@ -11,7 +11,7 @@
11
11
 
12
12
  # Modeled after libxml-config.
13
13
 
14
- version="1.6.16"
14
+ version="1.6.18"
15
15
  prefix="/home/vagrant/rcairo.win32/vendor/local"
16
16
  exec_prefix="${prefix}"
17
17
  libdir="${exec_prefix}/lib"
Binary file
Binary file
Binary file
@@ -3,6 +3,6 @@
3
3
 
4
4
  #define CAIRO_VERSION_MAJOR 1
5
5
  #define CAIRO_VERSION_MINOR 14
6
- #define CAIRO_VERSION_MICRO 0
6
+ #define CAIRO_VERSION_MICRO 2
7
7
 
8
8
  #endif
@@ -5,7 +5,7 @@
5
5
  /* */
6
6
  /* UNIX-specific configuration file (specification only). */
7
7
  /* */
8
- /* Copyright 1996-2004, 2006-2009, 2011, 2013, 2014 by */
8
+ /* Copyright 1996-2015 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, */
@@ -90,7 +90,7 @@ FT_BEGIN_HEADER
90
90
  /* is copied from default include/config/ftconfig.h. */
91
91
  /* If any improvement is required for this file, it should be */
92
92
  /* applied to the original header file for the builders that */
93
- /* does not use configure script. */
93
+ /* do not use configure script. */
94
94
 
95
95
  /* The size of an `int' type. */
96
96
  #if FT_UINT_MAX == 0xFFFFUL
@@ -350,11 +350,28 @@ FT_BEGIN_HEADER
350
350
  #endif
351
351
 
352
352
 
353
+ /*************************************************************************/
354
+ /* */
355
+ /* miscellaneous */
356
+ /* */
357
+ /*************************************************************************/
358
+
359
+
353
360
  #define FT_BEGIN_STMNT do {
354
361
  #define FT_END_STMNT } while ( 0 )
355
362
  #define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT
356
363
 
357
364
 
365
+ /* typeof condition taken from gnulib's `intprops.h' header file */
366
+ #if ( __GNUC__ >= 2 || \
367
+ defined( __IBM__TYPEOF__ ) || \
368
+ ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
369
+ #define TYPEOF( type ) (__typeof__ (type))
370
+ #else
371
+ #define TYPEOF( type ) /* empty */
372
+ #endif
373
+
374
+
358
375
  #ifdef FT_MAKE_OPTION_SINGLE_OBJECT
359
376
 
360
377
  #define FT_LOCAL( x ) static x
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* Build macros of the FreeType 2 library. */
6
6
  /* */
7
- /* Copyright 1996-2008, 2010, 2012, 2013 by */
7
+ /* Copyright 1996-2015 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, */
@@ -710,14 +710,16 @@
710
710
  /*************************************************************************
711
711
  *
712
712
  * @macro:
713
- * FT_XFREE86_H
713
+ * FT_FONT_FORMATS_H
714
714
  *
715
715
  * @description:
716
716
  * A macro used in #include statements to name the file containing the
717
- * FreeType~2 API which provides functions specific to the XFree86 and
718
- * X.Org X11 servers.
717
+ * FreeType~2 API which provides functions specific to font formats.
719
718
  */
720
- #define FT_XFREE86_H <ftxf86.h>
719
+ #define FT_FONT_FORMATS_H <ftfntfmt.h>
720
+
721
+ /* deprecated */
722
+ #define FT_XFREE86_H FT_FONT_FORMATS_H
721
723
 
722
724
 
723
725
  /*************************************************************************
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* User-selectable configuration macros (specification only). */
6
6
  /* */
7
- /* Copyright 1996-2014 by */
7
+ /* Copyright 1996-2015 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, */
@@ -378,10 +378,6 @@ FT_BEGIN_HEADER
378
378
  /* The size in bytes of the render pool used by the scan-line converter */
379
379
  /* to do all of its work. */
380
380
  /* */
381
- /* This must be greater than 4KByte if you use FreeType to rasterize */
382
- /* glyphs; otherwise, you may set it to zero to avoid unnecessary */
383
- /* allocation of the render pool. */
384
- /* */
385
381
  #define FT_RENDER_POOL_SIZE 16384L
386
382
 
387
383
 
@@ -435,6 +431,8 @@ FT_BEGIN_HEADER
435
431
  /* af_glyph_hints_dump_points */
436
432
  /* af_glyph_hints_dump_segments */
437
433
  /* af_glyph_hints_dump_edges */
434
+ /* af_glyph_hints_get_num_segments */
435
+ /* af_glyph_hints_get_segment_offset */
438
436
  /* */
439
437
  /* As an argument, they use another global variable: */
440
438
  /* */
@@ -657,19 +655,6 @@ FT_BEGIN_HEADER
657
655
  /* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
658
656
 
659
657
 
660
- /*************************************************************************/
661
- /* */
662
- /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */
663
- /* bytecode interpreter with a huge switch statement, rather than a call */
664
- /* table. This results in smaller and faster code for a number of */
665
- /* architectures. */
666
- /* */
667
- /* Note however that on some compiler/processor combinations, undefining */
668
- /* this macro will generate faster, though larger, code. */
669
- /* */
670
- #define TT_CONFIG_OPTION_INTERPRETER_SWITCH
671
-
672
-
673
658
  /*************************************************************************/
674
659
  /* */
675
660
  /* Define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED to compile the */
@@ -684,7 +669,7 @@ FT_BEGIN_HEADER
684
669
  /* fonts will not have them. */
685
670
  /* */
686
671
  /* http://www.microsoft.com/typography/otspec/glyf.htm */
687
- /* http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html */
672
+ /* https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6glyf.html */
688
673
  /* */
689
674
  #undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
690
675
 
@@ -835,10 +820,12 @@ FT_BEGIN_HEADER
835
820
  /* grid. To find out the optimal scaling and shifting value, various */
836
821
  /* parameter combinations are tried and scored. */
837
822
  /* */
838
- /* This experimental option is only active if the render mode is */
839
- /* FT_RENDER_MODE_LIGHT. */
823
+ /* This experimental option is active only if the rendering mode is */
824
+ /* FT_RENDER_MODE_LIGHT; you can switch warping on and off with the */
825
+ /* `warping' property of the auto-hinter (see file `ftautoh.h' for more */
826
+ /* information; by default it is switched off). */
840
827
  /* */
841
- /* #define AF_CONFIG_OPTION_USE_WARPER */
828
+ #define AF_CONFIG_OPTION_USE_WARPER
842
829
 
843
830
  /* */
844
831
 
@@ -5,7 +5,7 @@
5
5
  /* ANSI-specific library and header configuration file (specification */
6
6
  /* only). */
7
7
  /* */
8
- /* Copyright 2002-2007, 2009, 2011-2012 by */
8
+ /* Copyright 2002-2015 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, */
@@ -141,8 +141,7 @@
141
141
  /**********************************************************************/
142
142
 
143
143
 
144
- #define ft_atol atol
145
- #define ft_labs labs
144
+ #define ft_atol atol
146
145
 
147
146
 
148
147
  /**********************************************************************/
@@ -4,7 +4,7 @@
4
4
  /* */
5
5
  /* FreeType high-level API and common types (specification only). */
6
6
  /* */
7
- /* Copyright 1996-2014 by */
7
+ /* Copyright 1996-2015 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, */
@@ -394,8 +394,11 @@ FT_BEGIN_HEADER
394
394
  /* It also embeds a memory manager (see @FT_Memory), as well as a */
395
395
  /* scan-line converter object (see @FT_Raster). */
396
396
  /* */
397
- /* In multi-threaded applications, make sure that the same FT_Library */
398
- /* object or any of its children doesn't get accessed in parallel. */
397
+ /* In multi-threaded applications it is easiest to use one */
398
+ /* `FT_Library' object per thread. In case this is too cumbersome, */
399
+ /* a single `FT_Library' object across threads is possible also */
400
+ /* (since FreeType version 2.5.6), as long as a mutex lock is used */
401
+ /* around @FT_New_Face and @FT_Done_Face. */
399
402
  /* */
400
403
  /* <Note> */
401
404
  /* Library objects are normally created by @FT_Init_FreeType, and */
@@ -477,6 +480,14 @@ FT_BEGIN_HEADER
477
480
  /* */
478
481
  /* Use @FT_Done_Face to destroy it (along with its slot and sizes). */
479
482
  /* */
483
+ /* An `FT_Face' object can only be safely used from one thread at a */
484
+ /* time. Similarly, creation and destruction of `FT_Face' with the */
485
+ /* same @FT_Library object can only be done from one thread at a */
486
+ /* time. On the other hand, functions like @FT_Load_Glyph and its */
487
+ /* siblings are thread-safe and do not need the lock to be held as */
488
+ /* long as the same `FT_Face' object is not used from multiple */
489
+ /* threads at the same time. */
490
+ /* */
480
491
  /* <Also> */
481
492
  /* See @FT_FaceRec for the publicly accessible fields of a given face */
482
493
  /* object. */
@@ -631,9 +642,13 @@ FT_BEGIN_HEADER
631
642
  /* */
632
643
  /* FT_ENCODING_MS_SYMBOL :: */
633
644
  /* Corresponds to the Microsoft Symbol encoding, used to encode */
634
- /* mathematical symbols in the 32..255 character code range. For */
635
- /* more information, see */
636
- /* `http://www.kostis.net/charsets/symbol.htm'. */
645
+ /* mathematical symbols and wingdings. For more information, see */
646
+ /* `http://www.microsoft.com/typography/otspec/recom.htm', */
647
+ /* `http://www.kostis.net/charsets/symbol.htm', and */
648
+ /* `http://www.kostis.net/charsets/wingding.htm'. */
649
+ /* */
650
+ /* This encoding uses character codes from the PUA (Private Unicode */
651
+ /* Area) in the range U+F020-U+F0FF. */
637
652
  /* */
638
653
  /* FT_ENCODING_SJIS :: */
639
654
  /* Corresponds to Japanese SJIS encoding. More info at */
@@ -651,7 +666,7 @@ FT_BEGIN_HEADER
651
666
  /* FT_ENCODING_WANSUNG :: */
652
667
  /* Corresponds to the Korean encoding system known as Wansung. */
653
668
  /* For more information see */
654
- /* `http://msdn.microsoft.com/en-US/goglobal/cc305154'. */
669
+ /* `https://msdn.microsoft.com/en-US/goglobal/cc305154'. */
655
670
  /* */
656
671
  /* FT_ENCODING_JOHAB :: */
657
672
  /* The Korean standard character set (KS~C 5601-1992), which */
@@ -893,6 +908,11 @@ FT_BEGIN_HEADER
893
908
  /* Can be NULL (e.g., in fonts embedded in a */
894
909
  /* PDF file). */
895
910
  /* */
911
+ /* In case the font doesn't provide a specific */
912
+ /* family name entry, FreeType tries to */
913
+ /* synthesize one, deriving it from other name */
914
+ /* entries. */
915
+ /* */
896
916
  /* style_name :: The face's style name. This is an ASCII */
897
917
  /* string, usually in English, that describes */
898
918
  /* the typeface's style (like `Italic', */
@@ -1140,7 +1160,7 @@ FT_BEGIN_HEADER
1140
1160
  /* TrueType bytecode instructions to move and scale all of its */
1141
1161
  /* subglyphs. */
1142
1162
  /* */
1143
- /* It is not possible to autohint such fonts using */
1163
+ /* It is not possible to auto-hint such fonts using */
1144
1164
  /* @FT_LOAD_FORCE_AUTOHINT; it will also ignore */
1145
1165
  /* @FT_LOAD_NO_HINTING. You have to set both @FT_LOAD_NO_HINTING */
1146
1166
  /* and @FT_LOAD_NO_AUTOHINT to really disable hinting; however, you */
@@ -1649,11 +1669,11 @@ FT_BEGIN_HEADER
1649
1669
  /* needs to know about the image format. */
1650
1670
  /* */
1651
1671
  /* lsb_delta :: The difference between hinted and unhinted */
1652
- /* left side bearing while autohinting is */
1672
+ /* left side bearing while auto-hinting is */
1653
1673
  /* active. Zero otherwise. */
1654
1674
  /* */
1655
1675
  /* rsb_delta :: The difference between hinted and unhinted */
1656
- /* right side bearing while autohinting is */
1676
+ /* right side bearing while auto-hinting is */
1657
1677
  /* active. Zero otherwise. */
1658
1678
  /* */
1659
1679
  /* <Note> */
@@ -1676,7 +1696,7 @@ FT_BEGIN_HEADER
1676
1696
  /* `slot->format' is also changed to @FT_GLYPH_FORMAT_BITMAP. */
1677
1697
  /* */
1678
1698
  /* <Note> */
1679
- /* Here a small pseudo code fragment that shows how to use */
1699
+ /* Here is a small pseudo code fragment that shows how to use */
1680
1700
  /* `lsb_delta' and `rsb_delta': */
1681
1701
  /* */
1682
1702
  /* { */
@@ -1769,8 +1789,8 @@ FT_BEGIN_HEADER
1769
1789
  /* use @FT_New_Library instead, followed by a call to */
1770
1790
  /* @FT_Add_Default_Modules (or a series of calls to @FT_Add_Module). */
1771
1791
  /* */
1772
- /* For multi-threading applications each thread should have its own */
1773
- /* FT_Library object. */
1792
+ /* See the documentation of @FT_Library and @FT_Face for */
1793
+ /* multi-threading issues. */
1774
1794
  /* */
1775
1795
  /* If you need reference-counting (cf. @FT_Reference_Library), use */
1776
1796
  /* @FT_New_Library and @FT_Done_Library. */
@@ -3398,8 +3418,9 @@ FT_BEGIN_HEADER
3398
3418
  /* @FT_Get_FSType_Flags; they inform client applications of embedding */
3399
3419
  /* and subsetting restrictions associated with a font. */
3400
3420
  /* */
3401
- /* See http://www.adobe.com/devnet/acrobat/pdfs/FontPolicies.pdf for */
3402
- /* more details. */
3421
+ /* See */
3422
+ /* http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/pdfs/FontPolicies.pdf */
3423
+ /* for more details. */
3403
3424
  /* */
3404
3425
  /* <Values> */
3405
3426
  /* FT_FSTYPE_INSTALLABLE_EMBEDDING :: */
@@ -3936,8 +3957,8 @@ FT_BEGIN_HEADER
3936
3957
  *
3937
3958
  */
3938
3959
  #define FREETYPE_MAJOR 2
3939
- #define FREETYPE_MINOR 5
3940
- #define FREETYPE_PATCH 4
3960
+ #define FREETYPE_MINOR 6
3961
+ #define FREETYPE_PATCH 0
3941
3962
 
3942
3963
 
3943
3964
  /*************************************************************************/