cairo 1.12.9-x86-mingw32 → 1.14.0-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 (317) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS +27 -0
  3. data/README.rdoc +7 -7
  4. data/Rakefile +72 -23
  5. data/ext/cairo/extconf.rb +3 -3
  6. data/ext/cairo/rb_cairo.h +3 -3
  7. data/ext/cairo/rb_cairo_constants.c +8 -0
  8. data/ext/cairo/rb_cairo_context.c +63 -1
  9. data/ext/cairo/rb_cairo_exception.c +17 -0
  10. data/ext/cairo/rb_cairo_font_face.c +13 -0
  11. data/ext/cairo/rb_cairo_private.c +14 -1
  12. data/ext/cairo/rb_cairo_private.h +12 -1
  13. data/ext/cairo/rb_cairo_surface.c +47 -23
  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/surface.rb +3 -1
  18. data/test/cairo-test-utils.rb +5 -0
  19. data/test/test_constants.rb +11 -0
  20. data/test/test_context.rb +1 -1
  21. data/test/test_exception.rb +9 -0
  22. data/test/test_font_face.rb +1 -1
  23. data/test/test_quartz_image_surface.rb +13 -0
  24. data/test/test_surface.rb +10 -0
  25. data/vendor/local/bin/fc-cache.exe +0 -0
  26. data/vendor/local/bin/fc-cat.exe +0 -0
  27. data/vendor/local/bin/fc-list.exe +0 -0
  28. data/vendor/local/bin/fc-match.exe +0 -0
  29. data/vendor/local/bin/fc-pattern.exe +0 -0
  30. data/vendor/local/bin/fc-query.exe +0 -0
  31. data/vendor/local/bin/fc-scan.exe +0 -0
  32. data/vendor/local/bin/fc-validate.exe +0 -0
  33. data/vendor/local/bin/freetype-config +6 -6
  34. data/vendor/local/bin/libcairo-2.dll +0 -0
  35. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  36. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  37. data/vendor/local/bin/libfontconfig-1.dll +0 -0
  38. data/vendor/local/bin/libfreetype-6.dll +0 -0
  39. data/vendor/local/bin/libgcc_s_sjlj-1.dll +0 -0
  40. data/vendor/local/bin/libpixman-1-0.dll +0 -0
  41. data/vendor/local/bin/libpng-config +2 -2
  42. data/vendor/local/bin/libpng16-16.dll +0 -0
  43. data/vendor/local/bin/libpng16-config +2 -2
  44. data/vendor/local/bin/libstdc++-6.dll +0 -0
  45. data/vendor/local/bin/libwinpthread-1.dll +0 -0
  46. data/vendor/local/bin/libxml2-2.dll +0 -0
  47. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  48. data/vendor/local/bin/pngfix.exe +0 -0
  49. data/vendor/local/bin/xml2-config +2 -2
  50. data/vendor/local/bin/xmlcatalog.exe +0 -0
  51. data/vendor/local/bin/xmllint.exe +0 -0
  52. data/vendor/local/bin/zlib1.dll +0 -0
  53. data/vendor/local/include/cairo/cairo-version.h +2 -2
  54. data/vendor/local/include/cairo/cairo.h +36 -0
  55. data/vendor/local/include/libpng16/png.h +38 -24
  56. data/vendor/local/include/libpng16/pngconf.h +3 -3
  57. data/vendor/local/include/libpng16/pnglibconf.h +2 -3
  58. data/vendor/local/include/libxml2/libxml/SAX2.h +4 -2
  59. data/vendor/local/include/libxml2/libxml/entities.h +3 -3
  60. data/vendor/local/include/libxml2/libxml/globals.h +12 -5
  61. data/vendor/local/include/libxml2/libxml/relaxng.h +6 -2
  62. data/vendor/local/include/libxml2/libxml/tree.h +49 -42
  63. data/vendor/local/include/libxml2/libxml/xmlIO.h +1 -1
  64. data/vendor/local/include/libxml2/libxml/xmlerror.h +1 -1
  65. data/vendor/local/include/libxml2/libxml/xmlversion.h +4 -4
  66. data/vendor/local/include/pixman-1/pixman-version.h +2 -2
  67. data/vendor/local/include/png.h +38 -24
  68. data/vendor/local/include/pngconf.h +3 -3
  69. data/vendor/local/include/pnglibconf.h +2 -3
  70. data/vendor/local/lib/cmake/libxml2/libxml2-config.cmake +50 -0
  71. data/vendor/local/lib/libcairo-gobject.a +0 -0
  72. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  73. data/vendor/local/lib/libcairo-gobject.la +6 -6
  74. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  75. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  76. data/vendor/local/lib/libcairo-script-interpreter.la +6 -6
  77. data/vendor/local/lib/libcairo.a +0 -0
  78. data/vendor/local/lib/libcairo.dll.a +0 -0
  79. data/vendor/local/lib/libcairo.la +6 -6
  80. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  81. data/vendor/local/lib/libfontconfig.la +2 -2
  82. data/vendor/local/lib/libfreetype.a +0 -0
  83. data/vendor/local/lib/libfreetype.dll.a +0 -0
  84. data/vendor/local/lib/libfreetype.la +2 -2
  85. data/vendor/local/lib/libpixman-1.a +0 -0
  86. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  87. data/vendor/local/lib/libpixman-1.la +3 -3
  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 +4 -4
  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 +4 -4
  94. data/vendor/local/lib/libxml2.a +0 -0
  95. data/vendor/local/lib/libxml2.dll.a +0 -0
  96. data/vendor/local/lib/libxml2.la +3 -3
  97. data/vendor/local/lib/libz.a +0 -0
  98. data/vendor/local/lib/libz.dll.a +0 -0
  99. data/vendor/local/lib/pkgconfig/cairo-fc.pc +2 -2
  100. data/vendor/local/lib/pkgconfig/cairo-ft.pc +2 -2
  101. data/vendor/local/lib/pkgconfig/cairo-gobject.pc +3 -3
  102. data/vendor/local/lib/pkgconfig/cairo-pdf.pc +2 -2
  103. data/vendor/local/lib/pkgconfig/cairo-png.pc +2 -2
  104. data/vendor/local/lib/pkgconfig/cairo-ps.pc +2 -2
  105. data/vendor/local/lib/pkgconfig/cairo-script.pc +2 -2
  106. data/vendor/local/lib/pkgconfig/cairo-svg.pc +2 -2
  107. data/vendor/local/lib/pkgconfig/cairo-win32-font.pc +2 -2
  108. data/vendor/local/lib/pkgconfig/cairo-win32.pc +2 -2
  109. data/vendor/local/lib/pkgconfig/cairo.pc +3 -3
  110. data/vendor/local/lib/pkgconfig/fontconfig.pc +3 -3
  111. data/vendor/local/lib/pkgconfig/freetype2.pc +4 -4
  112. data/vendor/local/lib/pkgconfig/libpng.pc +2 -2
  113. data/vendor/local/lib/pkgconfig/libpng16.pc +2 -2
  114. data/vendor/local/lib/pkgconfig/libxml-2.0.pc +3 -3
  115. data/vendor/local/lib/pkgconfig/pixman-1.pc +2 -2
  116. data/vendor/local/lib/pkgconfig/zlib.pc +3 -3
  117. data/vendor/local/lib/xml2Conf.sh +3 -3
  118. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/Copyright +0 -0
  119. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/examples/testHTML.c +0 -0
  120. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/examples/testSAX.c +0 -0
  121. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/examples/testXPath.c +0 -0
  122. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/examples/xmllint.c +35 -10
  123. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/DOM.gif +0 -0
  124. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/FAQ.html +34 -17
  125. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/Libxml2-Logo-180x168.gif +0 -0
  126. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/Libxml2-Logo-90x34.gif +0 -0
  127. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/encoding.html +20 -10
  128. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/examples.xml +0 -0
  129. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/examples.xsl +0 -0
  130. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/book1.html +0 -0
  131. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/home.png +0 -0
  132. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/index.html +0 -0
  133. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/left.png +0 -0
  134. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-DOCBparser.html +0 -0
  135. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-HTMLparser.html +0 -0
  136. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-HTMLtree.html +0 -0
  137. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-SAX.html +0 -0
  138. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-SAX2.html +0 -0
  139. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-c14n.html +0 -0
  140. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-catalog.html +0 -0
  141. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-chvalid.html +0 -0
  142. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-debugXML.html +0 -0
  143. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-dict.html +0 -0
  144. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-encoding.html +0 -0
  145. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-entities.html +4 -4
  146. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-globals.html +0 -0
  147. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-hash.html +0 -0
  148. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-lib.html +0 -0
  149. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-list.html +0 -0
  150. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-nanoftp.html +0 -0
  151. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-nanohttp.html +0 -0
  152. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-parser.html +0 -0
  153. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-parserInternals.html +0 -0
  154. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-pattern.html +0 -0
  155. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-relaxng.html +0 -0
  156. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-schemasInternals.html +0 -0
  157. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-schematron.html +0 -0
  158. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-threads.html +0 -0
  159. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-tree.html +72 -72
  160. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-uri.html +0 -0
  161. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-valid.html +0 -0
  162. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xinclude.html +0 -0
  163. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xlink.html +0 -0
  164. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlIO.html +0 -0
  165. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlautomata.html +0 -0
  166. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlerror.html +1 -1
  167. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlexports.html +0 -0
  168. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlmemory.html +0 -0
  169. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlmodule.html +0 -0
  170. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlreader.html +0 -0
  171. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlregexp.html +0 -0
  172. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlsave.html +0 -0
  173. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlschemas.html +0 -0
  174. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlschemastypes.html +2 -2
  175. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlstring.html +0 -0
  176. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlunicode.html +0 -0
  177. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlversion.html +0 -0
  178. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xmlwriter.html +0 -0
  179. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xpath.html +0 -0
  180. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xpathInternals.html +0 -0
  181. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xpointer.html +0 -0
  182. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/libxml-xzlib.html +0 -0
  183. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/right.png +0 -0
  184. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/html/up.png +0 -0
  185. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/index.html +0 -0
  186. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/io1.c +0 -0
  187. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/io1.res +0 -0
  188. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/io2.c +0 -0
  189. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/io2.res +0 -0
  190. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/libxml.gif +0 -0
  191. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/parse1.c +0 -0
  192. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/parse2.c +0 -0
  193. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/parse3.c +0 -0
  194. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/parse4.c +0 -0
  195. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/reader1.c +0 -0
  196. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/reader1.res +0 -0
  197. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/reader2.c +0 -0
  198. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/reader3.c +0 -0
  199. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/reader3.res +0 -0
  200. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/reader4.c +0 -0
  201. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/reader4.res +0 -0
  202. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/redhat.gif +0 -0
  203. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/smallfootonly.gif +0 -0
  204. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/structure.gif +0 -0
  205. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/test1.xml +0 -0
  206. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/test2.xml +0 -0
  207. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/test3.xml +0 -0
  208. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/testWriter.c +0 -0
  209. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tree1.c +0 -0
  210. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tree1.res +0 -0
  211. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tree2.c +0 -0
  212. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tree2.res +0 -0
  213. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tst.xml +0 -0
  214. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/apa.html +0 -0
  215. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/apb.html +0 -0
  216. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/apc.html +0 -0
  217. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/apd.html +0 -0
  218. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ape.html +0 -0
  219. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/apf.html +0 -0
  220. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/apg.html +0 -0
  221. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/aph.html +0 -0
  222. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/api.html +0 -0
  223. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ar01s02.html +0 -0
  224. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ar01s03.html +0 -0
  225. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ar01s04.html +0 -0
  226. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ar01s05.html +0 -0
  227. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ar01s06.html +0 -0
  228. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ar01s07.html +0 -0
  229. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ar01s08.html +0 -0
  230. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ar01s09.html +0 -0
  231. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/blank.png +0 -0
  232. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/1.png +0 -0
  233. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/10.png +0 -0
  234. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/2.png +0 -0
  235. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/3.png +0 -0
  236. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/4.png +0 -0
  237. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/5.png +0 -0
  238. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/6.png +0 -0
  239. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/7.png +0 -0
  240. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/8.png +0 -0
  241. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/callouts/9.png +0 -0
  242. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/caution.png +0 -0
  243. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/draft.png +0 -0
  244. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/home.png +0 -0
  245. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/important.png +0 -0
  246. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/next.png +0 -0
  247. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/note.png +0 -0
  248. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/prev.png +0 -0
  249. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/tip.png +0 -0
  250. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/toc-blank.png +0 -0
  251. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/toc-minus.png +0 -0
  252. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/toc-plus.png +0 -0
  253. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/up.png +0 -0
  254. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/images/warning.png +0 -0
  255. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/includeaddattribute.c +0 -0
  256. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/includeaddkeyword.c +0 -0
  257. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/includeconvert.c +0 -0
  258. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/includegetattribute.c +0 -0
  259. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/includekeyword.c +0 -0
  260. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/includexpath.c +0 -0
  261. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/index.html +0 -0
  262. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/ix01.html +0 -0
  263. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/tutorial/xmltutorial.pdf +0 -0
  264. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/w3c.png +0 -0
  265. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/writer.xml +0 -0
  266. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/xml.html +284 -4
  267. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/xpath1.c +0 -0
  268. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/xpath1.res +0 -0
  269. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/xpath2.c +0 -0
  270. data/vendor/local/share/doc/{libxml2-2.9.1 → libxml2-2.9.2}/html/xpath2.res +0 -0
  271. data/vendor/local/share/gtk-doc/html/cairo/cairo-Error-handling.html +11 -3
  272. data/vendor/local/share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html +12 -29
  273. data/vendor/local/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html +11 -27
  274. data/vendor/local/share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html +22 -3
  275. data/vendor/local/share/gtk-doc/html/cairo/cairo-Paths.html +43 -100
  276. data/vendor/local/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html +26 -51
  277. data/vendor/local/share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html +4 -13
  278. data/vendor/local/share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html +10 -23
  279. data/vendor/local/share/gtk-doc/html/cairo/cairo-Regions.html +8 -8
  280. data/vendor/local/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html +3 -3
  281. data/vendor/local/share/gtk-doc/html/cairo/cairo-Types.html +7 -17
  282. data/vendor/local/share/gtk-doc/html/cairo/cairo-User-Fonts.html +14 -14
  283. data/vendor/local/share/gtk-doc/html/cairo/cairo-Version-Information.html +342 -0
  284. data/vendor/local/share/gtk-doc/html/cairo/cairo-Win32-Fonts.html +1 -1
  285. data/vendor/local/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html +5 -5
  286. data/vendor/local/share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html +2 -2
  287. data/vendor/local/share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html +1 -1
  288. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-device-t.html +86 -49
  289. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html +4 -4
  290. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html +2 -2
  291. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html +71 -119
  292. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html +72 -159
  293. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html +146 -58
  294. data/vendor/local/share/gtk-doc/html/cairo/cairo-cairo-t.html +22 -46
  295. data/vendor/local/share/gtk-doc/html/cairo/cairo-support.html +3 -1
  296. data/vendor/local/share/gtk-doc/html/cairo/cairo-text.html +11 -11
  297. data/vendor/local/share/gtk-doc/html/cairo/cairo.devhelp2 +25 -0
  298. data/vendor/local/share/gtk-doc/html/cairo/home.png +0 -0
  299. data/vendor/local/share/gtk-doc/html/cairo/index-1.8.html +9 -0
  300. data/vendor/local/share/gtk-doc/html/cairo/index-all.html +47 -0
  301. data/vendor/local/share/gtk-doc/html/cairo/index.html +4 -1
  302. data/vendor/local/share/gtk-doc/html/cairo/index.sgml +26 -0
  303. data/vendor/local/share/gtk-doc/html/cairo/left.png +0 -0
  304. data/vendor/local/share/gtk-doc/html/cairo/right.png +0 -0
  305. data/vendor/local/share/gtk-doc/html/cairo/up.png +0 -0
  306. data/vendor/local/share/gtk-doc/html/libxml2/libxml2-entities.html +4 -4
  307. data/vendor/local/share/gtk-doc/html/libxml2/libxml2-tree.html +73 -73
  308. data/vendor/local/share/gtk-doc/html/libxml2/libxml2-xmlerror.html +1 -1
  309. data/vendor/local/share/gtk-doc/html/libxml2/libxml2-xmlschemastypes.html +2 -2
  310. data/vendor/local/share/license/cairo/AUTHORS +5 -1
  311. data/vendor/local/share/license/cairo/README +20 -10
  312. data/vendor/local/share/license/libpng/README +20 -7
  313. data/vendor/local/share/man/man1/xmllint.1 +2 -5
  314. data/vendor/local/share/man/man3/libpng.3 +92 -220
  315. data/vendor/local/share/man/man3/libpngpf.3 +2 -2
  316. data/vendor/local/share/man/man5/png.5 +1 -1
  317. metadata +254 -248
Binary file
@@ -1,6 +1,6 @@
1
1
  #! /bin/sh
2
2
 
3
- prefix=/home/kou/work/ruby/rcairo.win32/vendor/local
3
+ prefix=/home/vagrant/rcairo.win32/vendor/local
4
4
  exec_prefix=${prefix}
5
5
  includedir=${prefix}/include
6
6
  libdir=${exec_prefix}/lib
@@ -58,7 +58,7 @@ while test $# -gt 0; do
58
58
  ;;
59
59
 
60
60
  --version)
61
- echo 2.9.1
61
+ echo 2.9.2
62
62
  exit 0
63
63
  ;;
64
64
 
Binary file
Binary file
@@ -2,7 +2,7 @@
2
2
  #define CAIRO_VERSION_H
3
3
 
4
4
  #define CAIRO_VERSION_MAJOR 1
5
- #define CAIRO_VERSION_MINOR 12
6
- #define CAIRO_VERSION_MICRO 16
5
+ #define CAIRO_VERSION_MINOR 14
6
+ #define CAIRO_VERSION_MICRO 0
7
7
 
8
8
  #endif
@@ -290,6 +290,8 @@ typedef struct _cairo_user_data_key {
290
290
  * cairo_mesh_pattern_begin_patch()/cairo_mesh_pattern_end_patch()
291
291
  * pair (Since 1.12)
292
292
  * @CAIRO_STATUS_DEVICE_FINISHED: target device has been finished (Since 1.12)
293
+ * @CAIRO_STATUS_JBIG2_GLOBAL_MISSING: %CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID has been used on at least one image
294
+ * but no image provided %CAIRO_MIME_TYPE_JBIG2_GLOBAL (Since 1.14)
293
295
  * @CAIRO_STATUS_LAST_STATUS: this is a special value indicating the number of
294
296
  * status values defined in this enumeration. When using this value, note
295
297
  * that the version of cairo at run-time may have additional status values
@@ -345,6 +347,7 @@ typedef enum _cairo_status {
345
347
  CAIRO_STATUS_DEVICE_ERROR,
346
348
  CAIRO_STATUS_INVALID_MESH_CONSTRUCTION,
347
349
  CAIRO_STATUS_DEVICE_FINISHED,
350
+ CAIRO_STATUS_JBIG2_GLOBAL_MISSING,
348
351
 
349
352
  CAIRO_STATUS_LAST_STATUS
350
353
  } cairo_status_t;
@@ -2208,6 +2211,15 @@ cairo_surface_create_for_rectangle (cairo_surface_t *target,
2208
2211
  double width,
2209
2212
  double height);
2210
2213
 
2214
+ /**
2215
+ * cairo_surface_observer_mode_t:
2216
+ * @CAIRO_SURFACE_OBSERVER_NORMAL: no recording is done
2217
+ * @CAIRO_SURFACE_OBSERVER_RECORD_OPERATIONS: operations are recorded
2218
+ *
2219
+ * Whether operations should be recorded.
2220
+ *
2221
+ * Since: 1.12
2222
+ **/
2211
2223
  typedef enum {
2212
2224
  CAIRO_SURFACE_OBSERVER_NORMAL = 0,
2213
2225
  CAIRO_SURFACE_OBSERVER_RECORD_OPERATIONS = 0x1
@@ -2419,6 +2431,9 @@ cairo_surface_set_user_data (cairo_surface_t *surface,
2419
2431
  #define CAIRO_MIME_TYPE_JP2 "image/jp2"
2420
2432
  #define CAIRO_MIME_TYPE_URI "text/x-uri"
2421
2433
  #define CAIRO_MIME_TYPE_UNIQUE_ID "application/x-cairo.uuid"
2434
+ #define CAIRO_MIME_TYPE_JBIG2 "application/x-cairo.jbig2"
2435
+ #define CAIRO_MIME_TYPE_JBIG2_GLOBAL "application/x-cairo.jbig2-global"
2436
+ #define CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID "application/x-cairo.jbig2-global-id"
2422
2437
 
2423
2438
  cairo_public void
2424
2439
  cairo_surface_get_mime_data (cairo_surface_t *surface,
@@ -2455,6 +2470,16 @@ cairo_surface_mark_dirty_rectangle (cairo_surface_t *surface,
2455
2470
  int width,
2456
2471
  int height);
2457
2472
 
2473
+ cairo_public void
2474
+ cairo_surface_set_device_scale (cairo_surface_t *surface,
2475
+ double x_scale,
2476
+ double y_scale);
2477
+
2478
+ cairo_public void
2479
+ cairo_surface_get_device_scale (cairo_surface_t *surface,
2480
+ double *x_scale,
2481
+ double *y_scale);
2482
+
2458
2483
  cairo_public void
2459
2484
  cairo_surface_set_device_offset (cairo_surface_t *surface,
2460
2485
  double x_offset,
@@ -3023,6 +3048,17 @@ cairo_matrix_transform_point (const cairo_matrix_t *matrix,
3023
3048
  **/
3024
3049
  typedef struct _cairo_region cairo_region_t;
3025
3050
 
3051
+ /**
3052
+ * cairo_region_overlap_t:
3053
+ * @CAIRO_REGION_OVERLAP_IN: The contents are entirely inside the region. (Since 1.10)
3054
+ * @CAIRO_REGION_OVERLAP_OUT: The contents are entirely outside the region. (Since 1.10)
3055
+ * @CAIRO_REGION_OVERLAP_PART: The contents are partially inside and
3056
+ * partially outside the region. (Since 1.10)
3057
+ *
3058
+ * Used as the return value for cairo_region_contains_rectangle().
3059
+ *
3060
+ * Since: 1.10
3061
+ **/
3026
3062
  typedef enum _cairo_region_overlap {
3027
3063
  CAIRO_REGION_OVERLAP_IN, /* completely inside region */
3028
3064
  CAIRO_REGION_OVERLAP_OUT, /* completely outside region */
@@ -1,7 +1,7 @@
1
1
 
2
2
  /* png.h - header file for PNG reference library
3
3
  *
4
- * libpng version 1.6.10 - March 6, 2014
4
+ * libpng version 1.6.14 - October 23, 2014
5
5
  * Copyright (c) 1998-2014 Glenn Randers-Pehrson
6
6
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
7
7
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
11
11
  * Authors and maintainers:
12
12
  * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
13
13
  * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
14
- * libpng versions 0.97, January 1998, through 1.6.10 - March 6, 2014: Glenn
14
+ * libpng versions 0.97, January 1998, through 1.6.14 - October 23, 2014: Glenn
15
15
  * See also "Contributing Authors", below.
16
16
  *
17
17
  * Note about libpng version numbers:
@@ -193,8 +193,19 @@
193
193
  * 1.6.9rc01-02 16 10609 16.so.16.9[.0]
194
194
  * 1.6.9 16 10609 16.so.16.9[.0]
195
195
  * 1.6.10beta01-03 16 10610 16.so.16.10[.0]
196
- * 1.6.10betarc01-04 16 10610 16.so.16.10[.0]
197
- * 1.6.10beta 16 10610 16.so.16.10[.0]
196
+ * 1.6.10rc01-03 16 10610 16.so.16.10[.0]
197
+ * 1.6.10 16 10610 16.so.16.10[.0]
198
+ * 1.6.11beta01-06 16 10611 16.so.16.11[.0]
199
+ * 1.6.11rc01-02 16 10611 16.so.16.11[.0]
200
+ * 1.6.11 16 10611 16.so.16.11[.0]
201
+ * 1.6.12rc01-03 16 10612 16.so.16.12[.0]
202
+ * 1.6.12 16 10612 16.so.16.12[.0]
203
+ * 1.6.13beta01-04 16 10613 16.so.16.13[.0]
204
+ * 1.6.13rc01-02 16 10613 16.so.16.13[.0]
205
+ * 1.6.13 16 10613 16.so.16.13[.0]
206
+ * 1.6.14beta01-07 16 10614 16.so.16.14[.0]
207
+ * 1.6.14rc01-02 16 10614 16.so.16.14[.0]
208
+ * 1.6.14 16 10614 16.so.16.14[.0]
198
209
  *
199
210
  * Henceforth the source version will match the shared-library major
200
211
  * and minor numbers; the shared-library major version number will be
@@ -226,8 +237,8 @@
226
237
  *
227
238
  * This code is released under the libpng license.
228
239
  *
229
- * libpng versions 1.2.6, August 15, 2004, through 1.6.10, March 6, 2014, are
230
- * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
240
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.14, October 23, 2014, are
241
+ * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
231
242
  * distributed according to the same disclaimer and license as libpng-1.2.5
232
243
  * with the following individual added to the list of Contributing Authors:
233
244
  *
@@ -338,13 +349,13 @@
338
349
  * Y2K compliance in libpng:
339
350
  * =========================
340
351
  *
341
- * March 6, 2014
352
+ * October 23, 2014
342
353
  *
343
354
  * Since the PNG Development group is an ad-hoc body, we can't make
344
355
  * an official declaration.
345
356
  *
346
357
  * This is your unofficial assurance that libpng from version 0.71 and
347
- * upward through 1.6.10 are Y2K compliant. It is my belief that
358
+ * upward through 1.6.14 are Y2K compliant. It is my belief that
348
359
  * earlier versions were also Y2K compliant.
349
360
  *
350
361
  * Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -397,16 +408,18 @@
397
408
  /* This is not the place to learn how to use libpng. The file libpng-manual.txt
398
409
  * describes how to use libpng, and the file example.c summarizes it
399
410
  * with some code on which to build. This file is useful for looking
400
- * at the actual function definitions and structure components.
411
+ * at the actual function definitions and structure components. If that
412
+ * file has been stripped from your copy of libpng, you can find it at
413
+ * <http://www.libpng.org/pub/png/libpng-manual.txt>
401
414
  *
402
415
  * If you just need to read a PNG file and don't want to read the documentation
403
416
  * skip to the end of this file and read the section entitled 'simplified API'.
404
417
  */
405
418
 
406
419
  /* Version information for png.h - this should match the version in png.c */
407
- #define PNG_LIBPNG_VER_STRING "1.6.10"
420
+ #define PNG_LIBPNG_VER_STRING "1.6.14"
408
421
  #define PNG_HEADER_VERSION_STRING \
409
- " libpng version 1.6.10 - March 6, 2014\n"
422
+ " libpng version 1.6.14 - October 23, 2014\n"
410
423
 
411
424
  #define PNG_LIBPNG_VER_SONUM 16
412
425
  #define PNG_LIBPNG_VER_DLLNUM 16
@@ -414,7 +427,7 @@
414
427
  /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
415
428
  #define PNG_LIBPNG_VER_MAJOR 1
416
429
  #define PNG_LIBPNG_VER_MINOR 6
417
- #define PNG_LIBPNG_VER_RELEASE 10
430
+ #define PNG_LIBPNG_VER_RELEASE 14
418
431
 
419
432
  /* This should match the numeric part of the final component of
420
433
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -445,7 +458,7 @@
445
458
  * version 1.0.0 was mis-numbered 100 instead of 10000). From
446
459
  * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
447
460
  */
448
- #define PNG_LIBPNG_VER 10610 /* 1.6.10 */
461
+ #define PNG_LIBPNG_VER 10614 /* 1.6.14 */
449
462
 
450
463
  /* Library configuration: these options cannot be changed after
451
464
  * the library has been built.
@@ -550,7 +563,7 @@ extern "C" {
550
563
  /* This triggers a compiler error in png.c, if png.c and png.h
551
564
  * do not agree upon the version number.
552
565
  */
553
- typedef char* png_libpng_version_1_6_10;
566
+ typedef char* png_libpng_version_1_6_14;
554
567
 
555
568
  /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
556
569
  *
@@ -1849,7 +1862,6 @@ PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save));
1849
1862
  */
1850
1863
  PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
1851
1864
 
1852
- #ifdef PNG_READ_INTERLACING_SUPPORTED
1853
1865
  /* Function that combines rows. 'new_row' is a flag that should come from
1854
1866
  * the callback and be non-NULL if anything needs to be done; the library
1855
1867
  * stores its own version of the new data internally and ignores the passed
@@ -1857,7 +1869,6 @@ PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
1857
1869
  */
1858
1870
  PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
1859
1871
  png_bytep old_row, png_const_bytep new_row));
1860
- #endif /* PNG_READ_INTERLACING_SUPPORTED */
1861
1872
  #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
1862
1873
 
1863
1874
  PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
@@ -2737,6 +2748,8 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
2737
2748
  # endif
2738
2749
  #endif
2739
2750
 
2751
+ #if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \
2752
+ defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
2740
2753
  /*******************************************************************************
2741
2754
  * SIMPLIFIED API
2742
2755
  *******************************************************************************
@@ -2808,7 +2821,7 @@ typedef struct
2808
2821
  # define PNG_IMAGE_WARNING 1
2809
2822
  # define PNG_IMAGE_ERROR 2
2810
2823
  /*
2811
- * The result is a two bit code such that a value more than 1 indicates
2824
+ * The result is a two-bit code such that a value more than 1 indicates
2812
2825
  * a failure in the API just called:
2813
2826
  *
2814
2827
  * 0 - no warning or error
@@ -3189,6 +3202,7 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
3189
3202
  /*******************************************************************************
3190
3203
  * END OF SIMPLIFIED API
3191
3204
  ******************************************************************************/
3205
+ #endif /* PNG_SIMPLIFIED_{READ|WRITE}_SUPPORTED */
3192
3206
 
3193
3207
  #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
3194
3208
  PNG_EXPORT(242, void, png_set_check_for_invalid_index,
@@ -3225,7 +3239,8 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
3225
3239
  # define PNG_ARM_NEON 0 /* HARDWARE: ARM Neon SIMD instructions supported */
3226
3240
  #endif
3227
3241
  #define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
3228
- #define PNG_OPTION_NEXT 4 /* Next option - numbers must be even */
3242
+ #define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
3243
+ #define PNG_OPTION_NEXT 6 /* Next option - numbers must be even */
3229
3244
 
3230
3245
  /* Return values: NOTE: there are four values and 'off' is *not* zero */
3231
3246
  #define PNG_OPTION_UNSET 0 /* Unset - defaults to off */
@@ -3235,19 +3250,18 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
3235
3250
 
3236
3251
  PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
3237
3252
  int onoff));
3238
- #endif
3253
+ #endif /* PNG_SET_OPTION_SUPPORTED */
3239
3254
 
3240
3255
  /*******************************************************************************
3241
- * END OF HARDWARE OPTIONS
3256
+ * END OF HARDWARE AND SOFTWARE OPTIONS
3242
3257
  ******************************************************************************/
3243
3258
 
3244
- /* Maintainer: Put new public prototypes here ^, in libpng.3, and project
3245
- * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt
3259
+ /* Maintainer: Put new public prototypes here ^, in libpng.3, in project
3260
+ * defs, and in scripts/symbols.def.
3246
3261
  */
3247
3262
 
3248
3263
  /* The last ordinal number (this is the *last* one already used; the next
3249
- * one to use is one more than this.) Maintainer, remember to add an entry to
3250
- * scripts/symbols.def as well.
3264
+ * one to use is one more than this.)
3251
3265
  */
3252
3266
  #ifdef PNG_EXPORT_LAST_ORDINAL
3253
3267
  PNG_EXPORT_LAST_ORDINAL(244);
@@ -1,9 +1,9 @@
1
1
 
2
2
  /* pngconf.h - machine configurable file for libpng
3
3
  *
4
- * libpng version 1.6.10 - March 6, 2014
4
+ * libpng version 1.6.14 - October 23, 2014
5
5
  *
6
- * Copyright (c) 1998-2013 Glenn Randers-Pehrson
6
+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
7
7
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
8
8
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
9
9
  *
@@ -361,7 +361,7 @@
361
361
  * version 1.2.41. Disabling these removes the warnings but may also produce
362
362
  * less efficient code.
363
363
  */
364
- # if defined(__clang__)
364
+ # if defined(__clang__) && defined(__has_attribute)
365
365
  /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */
366
366
  # if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)
367
367
  # define PNG_USE_RESULT __attribute__((__warn_unused_result__))
@@ -1,8 +1,8 @@
1
1
  /* pnglibconf.h - library build configuration */
2
2
 
3
- /* libpng version 1.6.10 - March 6, 2014 */
3
+ /* libpng version 1.6.14 - October 23, 2014 */
4
4
 
5
- /* Copyright (c) 1998-2012 Glenn Randers-Pehrson */
5
+ /* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
6
6
 
7
7
  /* This code is released under the libpng license. */
8
8
  /* For conditions of distribution and use, see the disclaimer */
@@ -185,7 +185,6 @@
185
185
  /* end of options */
186
186
  /* settings */
187
187
  #define PNG_API_RULE 0
188
- #define PNG_CALLOC_SUPPORTED
189
188
  #define PNG_COST_SHIFT 3
190
189
  #define PNG_DEFAULT_READ_MACROS 1
191
190
  #define PNG_GAMMA_THRESHOLD_FIXED 5000
@@ -98,7 +98,9 @@ XMLPUBFUN void XMLCALL
98
98
  xmlSAX2StartDocument (void *ctx);
99
99
  XMLPUBFUN void XMLCALL
100
100
  xmlSAX2EndDocument (void *ctx);
101
- #if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED)
101
+ #if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
102
+ defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || \
103
+ defined(LIBXML_LEGACY_ENABLED)
102
104
  XMLPUBFUN void XMLCALL
103
105
  xmlSAX2StartElement (void *ctx,
104
106
  const xmlChar *fullname,
@@ -106,7 +108,7 @@ XMLPUBFUN void XMLCALL
106
108
  XMLPUBFUN void XMLCALL
107
109
  xmlSAX2EndElement (void *ctx,
108
110
  const xmlChar *name);
109
- #endif /* LIBXML_SAX1_ENABLED or LIBXML_HTML_ENABLED */
111
+ #endif /* LIBXML_SAX1_ENABLED or LIBXML_HTML_ENABLED or LIBXML_LEGACY_ENABLED */
110
112
  XMLPUBFUN void XMLCALL
111
113
  xmlSAX2StartElementNs (void *ctx,
112
114
  const xmlChar *localname,
@@ -57,7 +57,7 @@ struct _xmlEntity {
57
57
  const xmlChar *URI; /* the full URI as computed */
58
58
  int owner; /* does the entity own the childrens */
59
59
  int checked; /* was the entity content checked */
60
- /* this is also used to count entites
60
+ /* this is also used to count entities
61
61
  * references done from that entity
62
62
  * and if it contains '<' */
63
63
  };
@@ -103,7 +103,7 @@ XMLPUBFUN xmlEntityPtr XMLCALL
103
103
  XMLPUBFUN xmlEntityPtr XMLCALL
104
104
  xmlGetPredefinedEntity (const xmlChar *name);
105
105
  XMLPUBFUN xmlEntityPtr XMLCALL
106
- xmlGetDocEntity (xmlDocPtr doc,
106
+ xmlGetDocEntity (const xmlDoc *doc,
107
107
  const xmlChar *name);
108
108
  XMLPUBFUN xmlEntityPtr XMLCALL
109
109
  xmlGetDtdEntity (xmlDocPtr doc,
@@ -120,7 +120,7 @@ XMLPUBFUN xmlChar * XMLCALL
120
120
  xmlEncodeEntitiesReentrant(xmlDocPtr doc,
121
121
  const xmlChar *input);
122
122
  XMLPUBFUN xmlChar * XMLCALL
123
- xmlEncodeSpecialChars (xmlDocPtr doc,
123
+ xmlEncodeSpecialChars (const xmlDoc *doc,
124
124
  const xmlChar *input);
125
125
  XMLPUBFUN xmlEntitiesTablePtr XMLCALL
126
126
  xmlCreateEntitiesTable (void);
@@ -39,7 +39,9 @@ XMLPUBFUN void XMLCALL xmlCleanupGlobals(void);
39
39
  * Returns the new xmlParserInputBufferPtr in case of success or NULL if no
40
40
  * method was found.
41
41
  */
42
- typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI, xmlCharEncoding enc);
42
+ typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI,
43
+ xmlCharEncoding enc);
44
+
43
45
 
44
46
  /**
45
47
  * xmlOutputBufferCreateFilenameFunc:
@@ -52,7 +54,9 @@ typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const
52
54
  * Returns the new xmlOutputBufferPtr in case of success or NULL if no
53
55
  * method was found.
54
56
  */
55
- typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI, xmlCharEncodingHandlerPtr encoder, int compression);
57
+ typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI,
58
+ xmlCharEncodingHandlerPtr encoder,
59
+ int compression);
56
60
 
57
61
  XMLPUBFUN xmlParserInputBufferCreateFilenameFunc
58
62
  XMLCALL xmlParserInputBufferCreateFilenameDefault (xmlParserInputBufferCreateFilenameFunc func);
@@ -185,7 +189,8 @@ XMLPUBFUN xmlDeregisterNodeFunc XMLCALL xmlThrDefDeregisterNodeDefault(xmlDeregi
185
189
  XMLPUBFUN xmlOutputBufferCreateFilenameFunc XMLCALL
186
190
  xmlThrDefOutputBufferCreateFilenameDefault(xmlOutputBufferCreateFilenameFunc func);
187
191
  XMLPUBFUN xmlParserInputBufferCreateFilenameFunc XMLCALL
188
- xmlThrDefParserInputBufferCreateFilenameDefault(xmlParserInputBufferCreateFilenameFunc func);
192
+ xmlThrDefParserInputBufferCreateFilenameDefault(
193
+ xmlParserInputBufferCreateFilenameFunc func);
189
194
 
190
195
  /** DOC_DISABLE */
191
196
  /*
@@ -297,7 +302,8 @@ XMLPUBFUN xmlBufferAllocationScheme * XMLCALL __xmlBufferAllocScheme(void);
297
302
  #else
298
303
  XMLPUBVAR xmlBufferAllocationScheme xmlBufferAllocScheme;
299
304
  #endif
300
- XMLPUBFUN xmlBufferAllocationScheme XMLCALL xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v);
305
+ XMLPUBFUN xmlBufferAllocationScheme XMLCALL
306
+ xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v);
301
307
 
302
308
  XMLPUBFUN int * XMLCALL __xmlDefaultBufferSize(void);
303
309
  #ifdef LIBXML_THREAD_ENABLED
@@ -479,7 +485,8 @@ XMLPUBFUN xmlDeregisterNodeFunc * XMLCALL __xmlDeregisterNodeDefaultValue(void);
479
485
  XMLPUBVAR xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue;
480
486
  #endif
481
487
 
482
- XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL __xmlParserInputBufferCreateFilenameValue(void);
488
+ XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL \
489
+ __xmlParserInputBufferCreateFilenameValue(void);
483
490
  #ifdef LIBXML_THREAD_ENABLED
484
491
  #define xmlParserInputBufferCreateFilenameValue \
485
492
  (*(__xmlParserInputBufferCreateFilenameValue()))
@@ -32,7 +32,9 @@ typedef xmlRelaxNG *xmlRelaxNGPtr;
32
32
  *
33
33
  * Signature of an error callback from a Relax-NG validation
34
34
  */
35
- typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
35
+ typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx,
36
+ const char *msg,
37
+ ...) LIBXML_ATTR_FORMAT(2,3);
36
38
 
37
39
  /**
38
40
  * xmlRelaxNGValidityWarningFunc:
@@ -42,7 +44,9 @@ typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg
42
44
  *
43
45
  * Signature of a warning callback from a Relax-NG validation
44
46
  */
45
- typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
47
+ typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx,
48
+ const char *msg,
49
+ ...) LIBXML_ATTR_FORMAT(2,3);
46
50
 
47
51
  /**
48
52
  * A schemas validation context