cairo 1.14.3-x86-mingw32 → 1.14.6-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 (173) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS +11 -0
  3. data/Rakefile +11 -9
  4. data/ext/cairo/rb_cairo.h +2 -2
  5. data/ext/cairo/rb_cairo_font_options.c +5 -1
  6. data/ext/cairo/rb_cairo_surface.c +28 -5
  7. data/lib/2.2/cairo.so +0 -0
  8. data/lib/2.3/cairo.so +0 -0
  9. data/test/test_font_options.rb +47 -2
  10. data/vendor/local/bin/fc-cache.exe +0 -0
  11. data/vendor/local/bin/fc-cat.exe +0 -0
  12. data/vendor/local/bin/fc-list.exe +0 -0
  13. data/vendor/local/bin/fc-match.exe +0 -0
  14. data/vendor/local/bin/fc-pattern.exe +0 -0
  15. data/vendor/local/bin/fc-query.exe +0 -0
  16. data/vendor/local/bin/fc-scan.exe +0 -0
  17. data/vendor/local/bin/fc-validate.exe +0 -0
  18. data/vendor/local/bin/freetype-config +6 -8
  19. data/vendor/local/bin/libcairo-2.dll +0 -0
  20. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  21. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  22. data/vendor/local/bin/libfontconfig-1.dll +0 -0
  23. data/vendor/local/bin/libfreetype-6.dll +0 -0
  24. data/vendor/local/bin/libgcc_s_sjlj-1.dll +0 -0
  25. data/vendor/local/bin/libpixman-1-0.dll +0 -0
  26. data/vendor/local/bin/libpng-config +1 -1
  27. data/vendor/local/bin/libpng16-16.dll +0 -0
  28. data/vendor/local/bin/libpng16-config +1 -1
  29. data/vendor/local/bin/libstdc++-6.dll +0 -0
  30. data/vendor/local/bin/libwinpthread-1.dll +0 -0
  31. data/vendor/local/bin/libxml2-2.dll +0 -0
  32. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  33. data/vendor/local/bin/pngfix.exe +0 -0
  34. data/vendor/local/bin/xmlcatalog.exe +0 -0
  35. data/vendor/local/bin/xmllint.exe +0 -0
  36. data/vendor/local/bin/zlib1.dll +0 -0
  37. data/vendor/local/include/cairo/cairo-features.h +15 -0
  38. data/vendor/local/include/cairo/cairo-version.h +1 -1
  39. data/vendor/local/include/freetype2/{config → freetype/config}/ftconfig.h +15 -9
  40. data/vendor/local/include/freetype2/{config → freetype/config}/ftheader.h +64 -65
  41. data/vendor/local/include/freetype2/{config → freetype/config}/ftmodule.h +0 -0
  42. data/vendor/local/include/freetype2/{config → freetype/config}/ftoption.h +29 -64
  43. data/vendor/local/include/freetype2/{config → freetype/config}/ftstdlib.h +6 -6
  44. data/vendor/local/include/freetype2/{freetype.h → freetype/freetype.h} +270 -67
  45. data/vendor/local/include/freetype2/{ftadvanc.h → freetype/ftadvanc.h} +4 -4
  46. data/vendor/local/include/freetype2/{ftautoh.h → freetype/ftautoh.h} +59 -6
  47. data/vendor/local/include/freetype2/{ftbbox.h → freetype/ftbbox.h} +4 -4
  48. data/vendor/local/include/freetype2/{ftbdf.h → freetype/ftbdf.h} +4 -4
  49. data/vendor/local/include/freetype2/{ftbitmap.h → freetype/ftbitmap.h} +4 -4
  50. data/vendor/local/include/freetype2/{ftbzip2.h → freetype/ftbzip2.h} +4 -4
  51. data/vendor/local/include/freetype2/{ftcache.h → freetype/ftcache.h} +4 -4
  52. data/vendor/local/include/freetype2/{ftcffdrv.h → freetype/ftcffdrv.h} +8 -8
  53. data/vendor/local/include/freetype2/{ftchapters.h → freetype/ftchapters.h} +14 -0
  54. data/vendor/local/include/freetype2/{ftcid.h → freetype/ftcid.h} +4 -4
  55. data/vendor/local/include/freetype2/{fterrdef.h → freetype/fterrdef.h} +39 -12
  56. data/vendor/local/include/freetype2/{fterrors.h → freetype/fterrors.h} +73 -45
  57. data/vendor/local/include/freetype2/{ftfntfmt.h → freetype/ftfntfmt.h} +7 -4
  58. data/vendor/local/include/freetype2/{ftgasp.h → freetype/ftgasp.h} +4 -4
  59. data/vendor/local/include/freetype2/{ftglyph.h → freetype/ftglyph.h} +4 -4
  60. data/vendor/local/include/freetype2/{ftgxval.h → freetype/ftgxval.h} +4 -4
  61. data/vendor/local/include/freetype2/{ftgzip.h → freetype/ftgzip.h} +4 -4
  62. data/vendor/local/include/freetype2/{ftimage.h → freetype/ftimage.h} +6 -6
  63. data/vendor/local/include/freetype2/{ftincrem.h → freetype/ftincrem.h} +4 -4
  64. data/vendor/local/include/freetype2/{ftlcdfil.h → freetype/ftlcdfil.h} +111 -76
  65. data/vendor/local/include/freetype2/{ftlist.h → freetype/ftlist.h} +4 -4
  66. data/vendor/local/include/freetype2/{ftlzw.h → freetype/ftlzw.h} +4 -4
  67. data/vendor/local/include/freetype2/{ftmac.h → freetype/ftmac.h} +4 -4
  68. data/vendor/local/include/freetype2/{ftmm.h → freetype/ftmm.h} +10 -5
  69. data/vendor/local/include/freetype2/{ftmodapi.h → freetype/ftmodapi.h} +15 -17
  70. data/vendor/local/include/freetype2/{ftmoderr.h → freetype/ftmoderr.h} +5 -5
  71. data/vendor/local/include/freetype2/{ftotval.h → freetype/ftotval.h} +4 -4
  72. data/vendor/local/include/freetype2/{ftoutln.h → freetype/ftoutln.h} +6 -6
  73. data/vendor/local/include/freetype2/{ftpfr.h → freetype/ftpfr.h} +4 -4
  74. data/vendor/local/include/freetype2/{ftrender.h → freetype/ftrender.h} +4 -4
  75. data/vendor/local/include/freetype2/{ftsizes.h → freetype/ftsizes.h} +4 -4
  76. data/vendor/local/include/freetype2/{ftsnames.h → freetype/ftsnames.h} +4 -4
  77. data/vendor/local/include/freetype2/{ftstroke.h → freetype/ftstroke.h} +4 -4
  78. data/vendor/local/include/freetype2/{ftsynth.h → freetype/ftsynth.h} +4 -4
  79. data/vendor/local/include/freetype2/{ftsystem.h → freetype/ftsystem.h} +4 -4
  80. data/vendor/local/include/freetype2/{fttrigon.h → freetype/fttrigon.h} +6 -6
  81. data/vendor/local/include/freetype2/{ftttdrv.h → freetype/ftttdrv.h} +81 -4
  82. data/vendor/local/include/freetype2/{fttypes.h → freetype/fttypes.h} +4 -4
  83. data/vendor/local/include/freetype2/{ftwinfnt.h → freetype/ftwinfnt.h} +4 -4
  84. data/vendor/local/include/freetype2/{t1tables.h → freetype/t1tables.h} +4 -4
  85. data/vendor/local/include/freetype2/{ttnameid.h → freetype/ttnameid.h} +4 -4
  86. data/vendor/local/include/freetype2/{tttables.h → freetype/tttables.h} +4 -4
  87. data/vendor/local/include/freetype2/{tttags.h → freetype/tttags.h} +4 -4
  88. data/vendor/local/include/freetype2/{ttunpat.h → freetype/ttunpat.h} +11 -8
  89. data/vendor/local/include/freetype2/ft2build.h +5 -5
  90. data/vendor/local/include/libpng16/png.h +310 -318
  91. data/vendor/local/include/libpng16/pngconf.h +8 -8
  92. data/vendor/local/include/libpng16/pnglibconf.h +3 -4
  93. data/vendor/local/include/png.h +310 -318
  94. data/vendor/local/include/pngconf.h +8 -8
  95. data/vendor/local/include/pnglibconf.h +3 -4
  96. data/vendor/local/lib/libcairo-gobject.a +0 -0
  97. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  98. data/vendor/local/lib/libcairo-gobject.la +2 -2
  99. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  100. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  101. data/vendor/local/lib/libcairo-script-interpreter.la +1 -1
  102. data/vendor/local/lib/libcairo.a +0 -0
  103. data/vendor/local/lib/libcairo.dll.a +0 -0
  104. data/vendor/local/lib/libcairo.la +1 -1
  105. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  106. data/vendor/local/lib/libfreetype.a +0 -0
  107. data/vendor/local/lib/libfreetype.dll.a +0 -0
  108. data/vendor/local/lib/libfreetype.la +1 -1
  109. data/vendor/local/lib/libpixman-1.a +0 -0
  110. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  111. data/vendor/local/lib/libpng.a +0 -0
  112. data/vendor/local/lib/libpng.dll.a +0 -0
  113. data/vendor/local/lib/libpng.la +2 -2
  114. data/vendor/local/lib/libpng16.a +0 -0
  115. data/vendor/local/lib/libpng16.dll.a +0 -0
  116. data/vendor/local/lib/libpng16.la +2 -2
  117. data/vendor/local/lib/libxml2.a +0 -0
  118. data/vendor/local/lib/libxml2.dll.a +0 -0
  119. data/vendor/local/lib/libz.a +0 -0
  120. data/vendor/local/lib/libz.dll.a +0 -0
  121. data/vendor/local/lib/pkgconfig/cairo-fc.pc +1 -1
  122. data/vendor/local/lib/pkgconfig/cairo-ft.pc +1 -1
  123. data/vendor/local/lib/pkgconfig/cairo-gobject.pc +1 -1
  124. data/vendor/local/lib/pkgconfig/cairo-pdf.pc +1 -1
  125. data/vendor/local/lib/pkgconfig/cairo-png.pc +1 -1
  126. data/vendor/local/lib/pkgconfig/cairo-ps.pc +1 -1
  127. data/vendor/local/lib/pkgconfig/cairo-script.pc +1 -1
  128. data/vendor/local/lib/pkgconfig/cairo-svg.pc +1 -1
  129. data/vendor/local/lib/pkgconfig/cairo-win32-font.pc +1 -1
  130. data/vendor/local/lib/pkgconfig/cairo-win32.pc +1 -1
  131. data/vendor/local/lib/pkgconfig/cairo.pc +1 -1
  132. data/vendor/local/lib/pkgconfig/freetype2.pc +3 -3
  133. data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
  134. data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
  135. data/vendor/local/share/aclocal/freetype2.m4 +1 -1
  136. data/vendor/local/share/gtk-doc/html/cairo/cairo-Error-handling.html +1 -1
  137. data/vendor/local/share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html +1 -1
  138. data/vendor/local/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html +1 -1
  139. data/vendor/local/share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html +4 -4
  140. data/vendor/local/share/gtk-doc/html/cairo/cairo-Paths.html +3 -3
  141. data/vendor/local/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html +6 -6
  142. data/vendor/local/share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html +3 -3
  143. data/vendor/local/share/gtk-doc/html/cairo/cairo-Regions.html +10 -10
  144. data/vendor/local/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html +3 -3
  145. data/vendor/local/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html +1 -1
  146. data/vendor/local/share/gtk-doc/html/cairo/cairo-User-Fonts.html +14 -14
  147. data/vendor/local/share/gtk-doc/html/cairo/cairo-Win32-Fonts.html +1 -1
  148. data/vendor/local/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html +5 -5
  149. data/vendor/local/share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html +1 -1
  150. data/vendor/local/share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html +1 -1
  151. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-device-t.html +3 -3
  152. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html +4 -4
  153. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html +2 -2
  154. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html +31 -31
  155. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html +12 -12
  156. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html +18 -18
  157. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-t.html +8 -8
  158. data/vendor/local/share/gtk-doc/html/cairo/cairo-text.html +11 -11
  159. data/vendor/local/share/gtk-doc/html/cairo/cairo.devhelp2 +1 -0
  160. data/vendor/local/share/gtk-doc/html/cairo/index-1.12.html +2 -2
  161. data/vendor/local/share/gtk-doc/html/cairo/index-1.14.html +52 -0
  162. data/vendor/local/share/gtk-doc/html/cairo/index.html +2 -1
  163. data/vendor/local/share/gtk-doc/html/cairo/language-bindings.html +2 -2
  164. data/vendor/local/share/license/freetype/README +7 -6
  165. data/vendor/local/share/license/freetype/README.git +1 -1
  166. data/vendor/local/share/license/libpng/README +1 -1
  167. data/vendor/local/share/man/man1/freetype-config.1 +1 -1
  168. data/vendor/local/share/man/man3/libpng.3 +308 -352
  169. data/vendor/local/share/man/man3/libpngpf.3 +2 -2
  170. data/vendor/local/share/man/man5/png.5 +4 -4
  171. metadata +72 -72
  172. data/lib/2.0/cairo.so +0 -0
  173. data/lib/2.1/cairo.so +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4ad768336f2e4d8865a9711dcc301a17fcd06ed7
4
- data.tar.gz: 018eaec3a0ef493ffd9ef37660bfdfc6fb71ea78
3
+ metadata.gz: 98713bc121cd3b2352852b3f5f25f1fc8f5d16b5
4
+ data.tar.gz: bad6927da858ac1581554450783d06bad4f1758e
5
5
  SHA512:
6
- metadata.gz: cc6a76e9e170d2582123aef2d46afbd9c7c22cdc9e0fa2891b5b351090dc955b97ce030e46c3098463193ff64416312d937a9e49b4aad2fb0f486837497baa61
7
- data.tar.gz: 295913f5eb26fdc74287613592395861fc7ffe70bc733cb4ddec8e007a1c511232bcd2c98ca88652015da112a1abb6706c94fbb612d721f6d0c5e057011f11e1
6
+ metadata.gz: b51c4b36036885541b056c593ec518b459b44bfd474eec067cf216a4d306b64a4d6ec203d57ee7a85efc4ef4aa9099fa13d829ecb41e889deecfb931eadeab64
7
+ data.tar.gz: 4c846a9d460028088013366e95fa76e212367dd5bd77cba3f7eda6b12363c58d2cec2a040bc07a70ec69c0d27cc9cd3950c9a4ca34d7598e1e3b88d4178cee1e
data/NEWS CHANGED
@@ -1,3 +1,14 @@
1
+ Release 1.15.2 (2016-04-02) Kouhei Sutou <kou@cozmixng.org>
2
+ ===========================================================
3
+
4
+ Improvements
5
+ ------------
6
+
7
+ * Supported cairo 1.15.2.
8
+ * Cairo::Win32Surface.new(hdc, format): Added.
9
+ * Dropped Ruby 2.0 support.
10
+ * Windows: Supported Ruby 2.3.
11
+
1
12
  Release 1.14.3 (2015-09-08) Kouhei Sutou <kou@cozmixng.org>
2
13
  ===========================================================
3
14
 
data/Rakefile CHANGED
@@ -116,7 +116,9 @@ class Package < Struct.new(:name,
116
116
  def download_site_base_url
117
117
  case download_site
118
118
  when :cairo
119
- base_url = "http://cairographics.org/releases"
119
+ base_url = "https://cairographics.org/releases"
120
+ when :cairo_snapshots
121
+ base_url = "https://cairographics.org/snapshots"
120
122
  when :gnome
121
123
  base_url = "http://ftp.gnome.org/pub/gnome/sources"
122
124
  release_series = version.gsub(/\A(\d+\.\d+).+\z/, '\1')
@@ -441,7 +443,7 @@ windows_task = WindowsTask.new(spec) do |task|
441
443
  {
442
444
  :name => "zlib",
443
445
  :version => "1.2.8",
444
- :download_base_url => "http://sourceforge.net/projects/libpng/files/zlib/1.2.8",
446
+ :download_base_url => "http://downloads.sourceforge.net/project/libpng/zlib/1.2.8",
445
447
  :compression_method => "gz",
446
448
  :windows => {
447
449
  :builder => ZlibBuilder.new,
@@ -450,16 +452,16 @@ windows_task = WindowsTask.new(spec) do |task|
450
452
  },
451
453
  {
452
454
  :name => "libpng",
453
- :version => "1.6.18",
454
- :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.18",
455
+ :version => "1.6.23",
456
+ :download_base_url => "http://downloads.sourceforge.net/project/libpng/libpng16/1.6.23",
455
457
  :windows => {
456
458
  :built_file => "bin/libpng16-16.dll",
457
459
  },
458
460
  },
459
461
  {
460
462
  :name => "freetype",
461
- :version => "2.6",
462
- :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.6",
463
+ :version => "2.6.3",
464
+ :download_base_url => "http://downloads.sourceforge.net/project/freetype/freetype2/2.6.3",
463
465
  :compression_method => "bz2",
464
466
  :windows => {
465
467
  :built_file => "bin/libfreetype-6.dll",
@@ -484,7 +486,7 @@ windows_task = WindowsTask.new(spec) do |task|
484
486
  {
485
487
  :name => "fontconfig",
486
488
  :version => "2.11.1",
487
- :download_base_url => "http://www.freedesktop.org/software/fontconfig/release",
489
+ :download_base_url => "https://www.freedesktop.org/software/fontconfig/release",
488
490
  :compression_method => "bz2",
489
491
  :windows => {
490
492
  :built_file => "bin/libfontconfig-1.dll",
@@ -509,7 +511,7 @@ windows_task = WindowsTask.new(spec) do |task|
509
511
  },
510
512
  {
511
513
  :name => "cairo",
512
- :version => "1.14.2",
514
+ :version => "1.14.6",
513
515
  :download_site => :cairo,
514
516
  :windows => {
515
517
  :built_file => "bin/libcairo-2.dll",
@@ -534,7 +536,7 @@ namespace :vm do
534
536
  architectures.each do |architecture|
535
537
  desc "Build all packages for Windows #{architecture}"
536
538
  task_name = "win#{architecture}"
537
- build_tasks << task_name
539
+ build_tasks << "vm:windows:build:#{task_name}"
538
540
  task task_name do
539
541
  cd("build") do
540
542
  sh("vagrant", "destroy", "--force", task_name)
data/ext/cairo/rb_cairo.h CHANGED
@@ -5,7 +5,7 @@
5
5
  * $Author: kou $
6
6
  * $Date: 2008-09-19 12:56:27 $
7
7
  *
8
- * Copyright 2006-2015 Kouhei Sutou <kou@cozmixng.org>
8
+ * Copyright 2006-2016 Kouhei Sutou <kou@cozmixng.org>
9
9
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
10
10
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
11
11
  *
@@ -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 3
76
+ #define RB_CAIRO_VERSION_MICRO 6
77
77
 
78
78
  RB_CAIRO_VAR VALUE rb_mCairo;
79
79
  RB_CAIRO_VAR VALUE rb_cCairo_Context;
@@ -96,6 +96,9 @@ cr_options_merge (VALUE self, VALUE other)
96
96
  static VALUE
97
97
  cr_options_equal (VALUE self, VALUE other)
98
98
  {
99
+ if (!rb_cairo__is_kind_of (other, rb_cCairo_FontOptions))
100
+ return Qfalse;
101
+
99
102
  return CBOOL2RVAL (cairo_font_options_equal (_SELF (self), _SELF (other)));
100
103
  }
101
104
 
@@ -168,12 +171,13 @@ Init_cairo_font_options (void)
168
171
  rb_define_class_under (rb_mCairo, "FontOptions", rb_cObject);
169
172
 
170
173
  rb_define_alloc_func (rb_cCairo_FontOptions, cr_options_allocate);
171
-
174
+
172
175
  rb_define_method (rb_cCairo_FontOptions, "initialize", cr_options_create, 0);
173
176
 
174
177
  rb_define_method (rb_cCairo_FontOptions, "dup", cr_options_copy, 0);
175
178
  rb_define_method (rb_cCairo_FontOptions, "merge!", cr_options_merge, 1);
176
179
  rb_define_alias (rb_cCairo_FontOptions, "update", "merge!");
180
+ rb_define_method (rb_cCairo_FontOptions, "==", cr_options_equal, 1);
177
181
  rb_define_method (rb_cCairo_FontOptions, "eql?", cr_options_equal, 1);
178
182
  rb_define_method (rb_cCairo_FontOptions, "hash", cr_options_hash, 0);
179
183
  rb_define_method (rb_cCairo_FontOptions, "set_antialias",
@@ -1232,11 +1232,34 @@ cr_win32_surface_initialize (int argc, VALUE *argv, VALUE self)
1232
1232
  surface = cairo_win32_surface_create (NUM2PTR (hdc));
1233
1233
  break;
1234
1234
  case 2:
1235
- width = arg1;
1236
- height = arg2;
1237
- surface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32,
1238
- NUM2INT (width),
1239
- NUM2INT (height));
1235
+ # if CAIRO_CHECK_VERSION(1, 11, 4)
1236
+ # define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB30
1237
+ # else
1238
+ # define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB16_565
1239
+ # endif
1240
+ if (CAIRO_FORMAT_ARGB32 <= NUM2INT (arg2) &&
1241
+ NUM2INT (arg2) <= CAIRO_FORMAT_MAX)
1242
+ {
1243
+ # if CAIRO_CHECK_VERSION(1, 15, 2)
1244
+ hdc = arg1;
1245
+ format = arg2;
1246
+ surface =
1247
+ cairo_win32_surface_create_with_format (NUM2PTR (hdc),
1248
+ RVAL2CRFORMAT (format));
1249
+ # else
1250
+ rb_raise (rb_eArgError,
1251
+ "Cairo::Win32Surface.new(hdc, format) "
1252
+ "is available since cairo >= 1.15.2");
1253
+ # endif
1254
+ }
1255
+ else
1256
+ {
1257
+ width = arg1;
1258
+ height = arg2;
1259
+ surface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32,
1260
+ NUM2INT (width),
1261
+ NUM2INT (height));
1262
+ }
1240
1263
  break;
1241
1264
  case 3:
1242
1265
  if (NIL_P (arg1) ||
data/lib/2.2/cairo.so CHANGED
Binary file
data/lib/2.3/cairo.so ADDED
Binary file
@@ -7,7 +7,52 @@ class FontOptionsTest < Test::Unit::TestCase
7
7
  @options = Cairo::FontOptions.new
8
8
  end
9
9
 
10
- def test_something
11
- # WRITE ME!
10
+ sub_test_case "#==" do
11
+ test "not FontOptions" do
12
+ assert do
13
+ !(@options == nil)
14
+ end
15
+ end
16
+
17
+ test "same object" do
18
+ assert do
19
+ @options == @options
20
+ end
21
+ end
22
+
23
+ test "same content" do
24
+ assert do
25
+ @options == @options.dup
26
+ end
27
+ end
28
+ end
29
+
30
+ sub_test_case "#eql? and #hash" do
31
+ test "not FontOptions" do
32
+ object = Object.new
33
+ options = @options
34
+ object.singleton_class.__send__(:define_method, :hash) do
35
+ options.hash
36
+ end
37
+
38
+ hash = {
39
+ object => :value,
40
+ }
41
+ assert_nil(hash[@options])
42
+ end
43
+
44
+ test "same object" do
45
+ hash = {
46
+ @options => :value,
47
+ }
48
+ assert_equal(:value, hash[@options])
49
+ end
50
+
51
+ test "same content" do
52
+ hash = {
53
+ @options => :value,
54
+ }
55
+ assert_equal(:value, hash[@options.dup])
56
+ end
12
57
  end
13
58
  end
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
@@ -1,6 +1,6 @@
1
1
  #! /bin/sh
2
2
  #
3
- # Copyright 2000-2015 by
3
+ # Copyright 2000-2016 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,
@@ -17,7 +17,6 @@ exec_prefix="/home/vagrant/rcairo.win32/vendor/local"
17
17
  exec_prefix_set="no"
18
18
  includedir="/home/vagrant/rcairo.win32/vendor/local/include"
19
19
  libdir="/home/vagrant/rcairo.win32/vendor/local/lib"
20
- enable_shared=""
21
20
 
22
21
  usage()
23
22
  {
@@ -75,7 +74,7 @@ while test $# -gt 0 ; do
75
74
  echo_exec_prefix=yes
76
75
  ;;
77
76
  --version)
78
- echo 18.0.12
77
+ echo 18.3.12
79
78
  exit 0
80
79
  ;;
81
80
  --ftversion)
@@ -124,21 +123,20 @@ else
124
123
  fi
125
124
 
126
125
  if test "$echo_ft_version" = "yes" ; then
127
- major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
126
+ major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
128
127
  | grep FREETYPE_MAJOR \
129
128
  | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
130
- minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
129
+ minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
131
130
  | grep FREETYPE_MINOR \
132
131
  | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
133
- patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
132
+ patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
134
133
  | grep FREETYPE_PATCH \
135
134
  | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
136
135
  echo $major.$minor.$patch
137
136
  fi
138
137
 
139
138
  if test "$echo_cflags" = "yes" ; then
140
- cflags="-I${SYSROOT}$includedir/freetype2"
141
- echo $cflags
139
+ echo -I${SYSROOT}$includedir/freetype2
142
140
  fi
143
141
 
144
142
  if test "$echo_libs" = "yes" ; then
Binary file
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.18"
14
+ version="1.6.23"
15
15
  prefix="/home/vagrant/rcairo.win32/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.18"
14
+ version="1.6.23"
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
Binary file
Binary file
Binary file
Binary file
Binary file
@@ -18,14 +18,29 @@
18
18
  #define CAIRO_HAS_WIN32_FONT 1
19
19
  #define CAIRO_HAS_WIN32_SURFACE 1
20
20
 
21
+ /*#undef CAIRO_HAS_BEOS_SURFACE */
22
+ /*#undef CAIRO_HAS_COGL_SURFACE */
23
+ /*#undef CAIRO_HAS_DIRECTFB_SURFACE */
24
+ /*#undef CAIRO_HAS_DRM_SURFACE */
21
25
  /*#undef CAIRO_HAS_EGL_FUNCTIONS */
26
+ /*#undef CAIRO_HAS_GALLIUM_SURFACE */
27
+ /*#undef CAIRO_HAS_GLESV2_SURFACE */
22
28
  /*#undef CAIRO_HAS_GLX_FUNCTIONS */
29
+ /*#undef CAIRO_HAS_GL_SURFACE */
30
+ /*#undef CAIRO_HAS_OS2_SURFACE */
31
+ /*#undef CAIRO_HAS_QT_SURFACE */
23
32
  /*#undef CAIRO_HAS_QUARTZ_FONT */
33
+ /*#undef CAIRO_HAS_QUARTZ_IMAGE_SURFACE */
24
34
  /*#undef CAIRO_HAS_QUARTZ_SURFACE */
35
+ /*#undef CAIRO_HAS_SKIA_SURFACE */
36
+ /*#undef CAIRO_HAS_TEE_SURFACE */
37
+ /*#undef CAIRO_HAS_VG_SURFACE */
25
38
  /*#undef CAIRO_HAS_WGL_FUNCTIONS */
26
39
  /*#undef CAIRO_HAS_XCB_SHM_FUNCTIONS */
27
40
  /*#undef CAIRO_HAS_XCB_SURFACE */
28
41
  /*#undef CAIRO_HAS_XLIB_SURFACE */
42
+ /*#undef CAIRO_HAS_XLIB_XCB_FUNCTIONS */
29
43
  /*#undef CAIRO_HAS_XLIB_XRENDER_SURFACE */
44
+ /*#undef CAIRO_HAS_XML_SURFACE */
30
45
 
31
46
  #endif
@@ -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 2
6
+ #define CAIRO_VERSION_MICRO 6
7
7
 
8
8
  #endif
@@ -5,7 +5,7 @@
5
5
  /* */
6
6
  /* UNIX-specific configuration file (specification only). */
7
7
  /* */
8
- /* Copyright 1996-2015 by */
8
+ /* Copyright 1996-2016 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, */
@@ -35,8 +35,8 @@
35
35
  /*************************************************************************/
36
36
 
37
37
 
38
- #ifndef __FTCONFIG_H__
39
- #define __FTCONFIG_H__
38
+ #ifndef FTCONFIG_H_
39
+ #define FTCONFIG_H_
40
40
 
41
41
  #include <ft2build.h>
42
42
  #include FT_CONFIG_OPTIONS_H
@@ -87,7 +87,7 @@ FT_BEGIN_HEADER
87
87
  #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
88
88
 
89
89
  /* Following cpp computation of the bit length of int and long */
90
- /* is copied from default include/config/ftconfig.h. */
90
+ /* is copied from default include/freetype/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
93
  /* do not use configure script. */
@@ -306,7 +306,13 @@ FT_BEGIN_HEADER
306
306
  /* */
307
307
  #elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 )
308
308
 
309
- #if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
309
+ #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
310
+
311
+ #define FT_LONG64
312
+ #define FT_INT64 long long int
313
+ #define FT_UINT64 unsigned long long int
314
+
315
+ #elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */
310
316
 
311
317
  /* this compiler provides the __int64 type */
312
318
  #define FT_LONG64
@@ -340,7 +346,7 @@ FT_BEGIN_HEADER
340
346
  #define FT_INT64 long long int
341
347
  #define FT_UINT64 unsigned long long int
342
348
 
343
- #endif /* _MSC_VER */
349
+ #endif /* __STDC_VERSION__ >= 199901L */
344
350
 
345
351
  #endif /* FT_SIZEOF_LONG == 8 */
346
352
 
@@ -366,9 +372,9 @@ FT_BEGIN_HEADER
366
372
  #if ( __GNUC__ >= 2 || \
367
373
  defined( __IBM__TYPEOF__ ) || \
368
374
  ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
369
- #define TYPEOF( type ) (__typeof__ (type))
375
+ #define FT_TYPEOF( type ) (__typeof__ (type))
370
376
  #else
371
- #define TYPEOF( type ) /* empty */
377
+ #define FT_TYPEOF( type ) /* empty */
372
378
  #endif
373
379
 
374
380
 
@@ -492,7 +498,7 @@ FT_BEGIN_HEADER
492
498
  FT_END_HEADER
493
499
 
494
500
 
495
- #endif /* __FTCONFIG_H__ */
501
+ #endif /* FTCONFIG_H_ */
496
502
 
497
503
 
498
504
  /* END */