cairo 1.14.0-x86-mingw32 → 1.14.1-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 (108) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS +12 -0
  3. data/Rakefile +14 -4
  4. data/ext/cairo/rb_cairo.h +1 -1
  5. data/lib/2.0/cairo.so +0 -0
  6. data/lib/2.1/cairo.so +0 -0
  7. data/lib/2.2/cairo.so +0 -0
  8. data/vendor/local/bin/fc-cache.exe +0 -0
  9. data/vendor/local/bin/fc-cat.exe +0 -0
  10. data/vendor/local/bin/fc-list.exe +0 -0
  11. data/vendor/local/bin/fc-match.exe +0 -0
  12. data/vendor/local/bin/fc-pattern.exe +0 -0
  13. data/vendor/local/bin/fc-query.exe +0 -0
  14. data/vendor/local/bin/fc-scan.exe +0 -0
  15. data/vendor/local/bin/fc-validate.exe +0 -0
  16. data/vendor/local/bin/freetype-config +2 -2
  17. data/vendor/local/bin/libcairo-2.dll +0 -0
  18. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  19. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  20. data/vendor/local/bin/libfontconfig-1.dll +0 -0
  21. data/vendor/local/bin/libfreetype-6.dll +0 -0
  22. data/vendor/local/bin/libpixman-1-0.dll +0 -0
  23. data/vendor/local/bin/libpng-config +1 -1
  24. data/vendor/local/bin/libpng16-16.dll +0 -0
  25. data/vendor/local/bin/libpng16-config +1 -1
  26. data/vendor/local/bin/libxml2-2.dll +0 -0
  27. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  28. data/vendor/local/bin/pngfix.exe +0 -0
  29. data/vendor/local/bin/xmlcatalog.exe +0 -0
  30. data/vendor/local/bin/xmllint.exe +0 -0
  31. data/vendor/local/bin/zlib1.dll +0 -0
  32. data/vendor/local/include/freetype2/config/ftconfig.h +12 -237
  33. data/vendor/local/include/freetype2/config/ftoption.h +59 -6
  34. data/vendor/local/include/freetype2/freetype.h +112 -140
  35. data/vendor/local/include/freetype2/ftadvanc.h +7 -2
  36. data/vendor/local/include/freetype2/ftautoh.h +11 -11
  37. data/vendor/local/include/freetype2/ftbbox.h +0 -1
  38. data/vendor/local/include/freetype2/ftbdf.h +2 -2
  39. data/vendor/local/include/freetype2/ftbitmap.h +7 -2
  40. data/vendor/local/include/freetype2/ftbzip2.h +1 -1
  41. data/vendor/local/include/freetype2/ftcache.h +4 -4
  42. data/vendor/local/include/freetype2/ftcffdrv.h +13 -5
  43. data/vendor/local/include/freetype2/ftcid.h +2 -1
  44. data/vendor/local/include/freetype2/fterrdef.h +91 -91
  45. data/vendor/local/include/freetype2/ftgasp.h +2 -1
  46. data/vendor/local/include/freetype2/ftglyph.h +3 -18
  47. data/vendor/local/include/freetype2/ftgxval.h +12 -13
  48. data/vendor/local/include/freetype2/ftgzip.h +1 -2
  49. data/vendor/local/include/freetype2/ftimage.h +51 -153
  50. data/vendor/local/include/freetype2/ftincrem.h +3 -2
  51. data/vendor/local/include/freetype2/ftlist.h +2 -3
  52. data/vendor/local/include/freetype2/ftlzw.h +1 -1
  53. data/vendor/local/include/freetype2/ftmm.h +0 -4
  54. data/vendor/local/include/freetype2/ftmodapi.h +28 -2
  55. data/vendor/local/include/freetype2/ftotval.h +8 -7
  56. data/vendor/local/include/freetype2/ftoutln.h +10 -8
  57. data/vendor/local/include/freetype2/ftpfr.h +1 -1
  58. data/vendor/local/include/freetype2/ftrender.h +0 -1
  59. data/vendor/local/include/freetype2/ftstroke.h +39 -5
  60. data/vendor/local/include/freetype2/ftsynth.h +1 -0
  61. data/vendor/local/include/freetype2/ftsystem.h +0 -1
  62. data/vendor/local/include/freetype2/fttrigon.h +2 -2
  63. data/vendor/local/include/freetype2/ftttdrv.h +1 -1
  64. data/vendor/local/include/freetype2/fttypes.h +6 -2
  65. data/vendor/local/include/freetype2/ftwinfnt.h +1 -1
  66. data/vendor/local/include/freetype2/ftxf86.h +2 -1
  67. data/vendor/local/include/freetype2/t1tables.h +109 -11
  68. data/vendor/local/include/freetype2/tttables.h +53 -11
  69. data/vendor/local/include/freetype2/ttunpat.h +2 -1
  70. data/vendor/local/include/libpng16/png.h +33 -27
  71. data/vendor/local/include/libpng16/pngconf.h +1 -1
  72. data/vendor/local/include/libpng16/pnglibconf.h +1 -1
  73. data/vendor/local/include/png.h +33 -27
  74. data/vendor/local/include/pngconf.h +1 -1
  75. data/vendor/local/include/pnglibconf.h +1 -1
  76. data/vendor/local/lib/libcairo-gobject.a +0 -0
  77. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  78. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  79. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  80. data/vendor/local/lib/libcairo.a +0 -0
  81. data/vendor/local/lib/libcairo.dll.a +0 -0
  82. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  83. data/vendor/local/lib/libfreetype.a +0 -0
  84. data/vendor/local/lib/libfreetype.dll.a +0 -0
  85. data/vendor/local/lib/libfreetype.la +1 -1
  86. data/vendor/local/lib/libpixman-1.a +0 -0
  87. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  88. data/vendor/local/lib/libpng.a +0 -0
  89. data/vendor/local/lib/libpng.dll.a +0 -0
  90. data/vendor/local/lib/libpng.la +2 -2
  91. data/vendor/local/lib/libpng16.a +0 -0
  92. data/vendor/local/lib/libpng16.dll.a +0 -0
  93. data/vendor/local/lib/libpng16.la +2 -2
  94. data/vendor/local/lib/libxml2.a +0 -0
  95. data/vendor/local/lib/libxml2.dll.a +0 -0
  96. data/vendor/local/lib/libz.a +0 -0
  97. data/vendor/local/lib/libz.dll.a +0 -0
  98. data/vendor/local/lib/pkgconfig/freetype2.pc +5 -5
  99. data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
  100. data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
  101. data/vendor/local/share/aclocal/freetype2.m4 +3 -3
  102. data/vendor/local/share/license/freetype/README +10 -10
  103. data/vendor/local/share/license/libpng/README +1 -1
  104. data/vendor/local/share/man/man1/freetype-config.1 +1 -1
  105. data/vendor/local/share/man/man3/libpng.3 +21 -18
  106. data/vendor/local/share/man/man3/libpngpf.3 +2 -2
  107. data/vendor/local/share/man/man5/png.5 +1 -1
  108. metadata +2 -2
@@ -5,7 +5,7 @@
5
5
  /* Basic SFNT/TrueType tables definitions and interface */
6
6
  /* (specification only). */
7
7
  /* */
8
- /* Copyright 1996-2005, 2008-2013 by */
8
+ /* Copyright 1996-2005, 2008-2014 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, */
@@ -48,6 +48,25 @@ FT_BEGIN_HEADER
48
48
  /* This section contains the definition of TrueType-specific tables */
49
49
  /* as well as some routines used to access and process them. */
50
50
  /* */
51
+ /* <Order> */
52
+ /* TT_Header */
53
+ /* TT_HoriHeader */
54
+ /* TT_VertHeader */
55
+ /* TT_OS2 */
56
+ /* TT_Postscript */
57
+ /* TT_PCLT */
58
+ /* TT_MaxProfile */
59
+ /* */
60
+ /* FT_Sfnt_Tag */
61
+ /* FT_Get_Sfnt_Table */
62
+ /* FT_Load_Sfnt_Table */
63
+ /* FT_Sfnt_Table_Info */
64
+ /* */
65
+ /* FT_Get_CMap_Language_ID */
66
+ /* FT_Get_CMap_Format */
67
+ /* */
68
+ /* FT_PARAM_TAG_UNPATENTED_HINTING */
69
+ /* */
51
70
  /*************************************************************************/
52
71
 
53
72
 
@@ -559,21 +578,44 @@ FT_BEGIN_HEADER
559
578
  /* An enumeration used to specify the index of an SFNT table. */
560
579
  /* Used in the @FT_Get_Sfnt_Table API function. */
561
580
  /* */
581
+ /* <Values> */
582
+ /* FT_SFNT_HEAD :: To access the font's @TT_Header structure. */
583
+ /* */
584
+ /* FT_SFNT_MAXP :: To access the font's @TT_MaxProfile structure. */
585
+ /* */
586
+ /* FT_SFNT_OS2 :: To access the font's @TT_OS2 structure. */
587
+ /* */
588
+ /* FT_SFNT_HHEA :: To access the font's @TT_HoriHeader structure. */
589
+ /* */
590
+ /* FT_SFNT_VHEA :: To access the font's @TT_VertHeader struture. */
591
+ /* */
592
+ /* FT_SFNT_POST :: To access the font's @TT_Postscript structure. */
593
+ /* */
594
+ /* FT_SFNT_PCLT :: To access the font's @TT_PCLT structure. */
595
+ /* */
562
596
  typedef enum FT_Sfnt_Tag_
563
597
  {
564
- ft_sfnt_head = 0, /* TT_Header */
565
- ft_sfnt_maxp = 1, /* TT_MaxProfile */
566
- ft_sfnt_os2 = 2, /* TT_OS2 */
567
- ft_sfnt_hhea = 3, /* TT_HoriHeader */
568
- ft_sfnt_vhea = 4, /* TT_VertHeader */
569
- ft_sfnt_post = 5, /* TT_Postscript */
570
- ft_sfnt_pclt = 6, /* TT_PCLT */
598
+ FT_SFNT_HEAD,
599
+ FT_SFNT_MAXP,
600
+ FT_SFNT_OS2,
601
+ FT_SFNT_HHEA,
602
+ FT_SFNT_VHEA,
603
+ FT_SFNT_POST,
604
+ FT_SFNT_PCLT,
571
605
 
572
- sfnt_max /* internal end mark */
606
+ FT_SFNT_MAX
573
607
 
574
608
  } FT_Sfnt_Tag;
575
609
 
576
- /* */
610
+ /* these constants are deprecated; use the corresponding `FT_Sfnt_Tag' */
611
+ /* values instead */
612
+ #define ft_sfnt_head FT_SFNT_HEAD
613
+ #define ft_sfnt_maxp FT_SFNT_MAXP
614
+ #define ft_sfnt_os2 FT_SFNT_OS2
615
+ #define ft_sfnt_hhea FT_SFNT_HHEA
616
+ #define ft_sfnt_vhea FT_SFNT_VHEA
617
+ #define ft_sfnt_post FT_SFNT_POST
618
+ #define ft_sfnt_pclt FT_SFNT_PCLT
577
619
 
578
620
 
579
621
  /*************************************************************************/
@@ -611,7 +653,7 @@ FT_BEGIN_HEADER
611
653
  /* */
612
654
  /* */
613
655
  /* vert_header = */
614
- /* (TT_VertHeader*)FT_Get_Sfnt_Table( face, ft_sfnt_vhea ); */
656
+ /* (TT_VertHeader*)FT_Get_Sfnt_Table( face, FT_SFNT_VHEA ); */
615
657
  /* } */
616
658
  /* */
617
659
  FT_EXPORT( void* )
@@ -48,7 +48,8 @@ FT_BEGIN_HEADER
48
48
  */
49
49
  #define FT_PARAM_TAG_UNPATENTED_HINTING FT_MAKE_TAG( 'u', 'n', 'p', 'a' )
50
50
 
51
- /* */
51
+ /* */
52
+
52
53
 
53
54
  FT_END_HEADER
54
55
 
@@ -1,7 +1,7 @@
1
1
 
2
2
  /* png.h - header file for PNG reference library
3
3
  *
4
- * libpng version 1.6.14 - October 23, 2014
4
+ * libpng version 1.6.16, December 22, 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.14 - October 23, 2014: Glenn
14
+ * libpng versions 0.97, January 1998, through 1.6.16, December 22, 2014: Glenn
15
15
  * See also "Contributing Authors", below.
16
16
  *
17
17
  * Note about libpng version numbers:
@@ -206,6 +206,12 @@
206
206
  * 1.6.14beta01-07 16 10614 16.so.16.14[.0]
207
207
  * 1.6.14rc01-02 16 10614 16.so.16.14[.0]
208
208
  * 1.6.14 16 10614 16.so.16.14[.0]
209
+ * 1.6.15beta01-08 16 10615 16.so.16.15[.0]
210
+ * 1.6.15rc01-03 16 10615 16.so.16.15[.0]
211
+ * 1.6.15 16 10615 16.so.16.15[.0]
212
+ * 1.6.16beta01-03 16 10616 16.so.16.16[.0]
213
+ * 1.6.16rc01-02 16 10616 16.so.16.16[.0]
214
+ * 1.6.16 16 10616 16.so.16.16[.0]
209
215
  *
210
216
  * Henceforth the source version will match the shared-library major
211
217
  * and minor numbers; the shared-library major version number will be
@@ -237,7 +243,7 @@
237
243
  *
238
244
  * This code is released under the libpng license.
239
245
  *
240
- * libpng versions 1.2.6, August 15, 2004, through 1.6.14, October 23, 2014, are
246
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
241
247
  * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
242
248
  * distributed according to the same disclaimer and license as libpng-1.2.5
243
249
  * with the following individual added to the list of Contributing Authors:
@@ -349,13 +355,13 @@
349
355
  * Y2K compliance in libpng:
350
356
  * =========================
351
357
  *
352
- * October 23, 2014
358
+ * December 22, 2014
353
359
  *
354
360
  * Since the PNG Development group is an ad-hoc body, we can't make
355
361
  * an official declaration.
356
362
  *
357
363
  * This is your unofficial assurance that libpng from version 0.71 and
358
- * upward through 1.6.14 are Y2K compliant. It is my belief that
364
+ * upward through 1.6.16 are Y2K compliant. It is my belief that
359
365
  * earlier versions were also Y2K compliant.
360
366
  *
361
367
  * Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -417,9 +423,9 @@
417
423
  */
418
424
 
419
425
  /* Version information for png.h - this should match the version in png.c */
420
- #define PNG_LIBPNG_VER_STRING "1.6.14"
426
+ #define PNG_LIBPNG_VER_STRING "1.6.16"
421
427
  #define PNG_HEADER_VERSION_STRING \
422
- " libpng version 1.6.14 - October 23, 2014\n"
428
+ " libpng version 1.6.16 - December 22, 2014\n"
423
429
 
424
430
  #define PNG_LIBPNG_VER_SONUM 16
425
431
  #define PNG_LIBPNG_VER_DLLNUM 16
@@ -427,7 +433,7 @@
427
433
  /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
428
434
  #define PNG_LIBPNG_VER_MAJOR 1
429
435
  #define PNG_LIBPNG_VER_MINOR 6
430
- #define PNG_LIBPNG_VER_RELEASE 14
436
+ #define PNG_LIBPNG_VER_RELEASE 16
431
437
 
432
438
  /* This should match the numeric part of the final component of
433
439
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -458,7 +464,7 @@
458
464
  * version 1.0.0 was mis-numbered 100 instead of 10000). From
459
465
  * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
460
466
  */
461
- #define PNG_LIBPNG_VER 10614 /* 1.6.14 */
467
+ #define PNG_LIBPNG_VER 10616 /* 1.6.16 */
462
468
 
463
469
  /* Library configuration: these options cannot be changed after
464
470
  * the library has been built.
@@ -563,7 +569,7 @@ extern "C" {
563
569
  /* This triggers a compiler error in png.c, if png.c and png.h
564
570
  * do not agree upon the version number.
565
571
  */
566
- typedef char* png_libpng_version_1_6_14;
572
+ typedef char* png_libpng_version_1_6_16;
567
573
 
568
574
  /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
569
575
  *
@@ -1176,7 +1182,7 @@ PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
1176
1182
 
1177
1183
  /* Convert from time_t to png_time. Uses gmtime() */
1178
1184
  PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
1179
- #endif /* PNG_CONVERT_tIME_SUPPORTED */
1185
+ #endif /* CONVERT_tIME */
1180
1186
 
1181
1187
  #ifdef PNG_READ_EXPAND_SUPPORTED
1182
1188
  /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
@@ -1382,7 +1388,7 @@ PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
1382
1388
  /* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
1383
1389
  PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
1384
1390
  png_uint_32 filler, int flags));
1385
- #endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
1391
+ #endif /* READ_FILLER || WRITE_FILLER */
1386
1392
 
1387
1393
  #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
1388
1394
  /* Swap bytes in 16-bit depth files. */
@@ -1646,7 +1652,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
1646
1652
  (png_structrp png_ptr, int heuristic_method, int num_weights,
1647
1653
  png_const_fixed_point_p filter_weights,
1648
1654
  png_const_fixed_point_p filter_costs))
1649
- #endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
1655
+ #endif /* WRITE_WEIGHTED_FILTER */
1650
1656
 
1651
1657
  /* Heuristic used for row filter selection. These defines should NOT be
1652
1658
  * changed.
@@ -1702,7 +1708,7 @@ PNG_EXPORT(225, void, png_set_text_compression_window_bits,
1702
1708
 
1703
1709
  PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
1704
1710
  int method));
1705
- #endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
1711
+ #endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
1706
1712
 
1707
1713
  /* These next functions are called for input/output, memory, and error
1708
1714
  * handling. They are in the file pngrio.c, pngwio.c, and pngerror.c,
@@ -1869,7 +1875,7 @@ PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
1869
1875
  */
1870
1876
  PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
1871
1877
  png_bytep old_row, png_const_bytep new_row));
1872
- #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
1878
+ #endif /* PROGRESSIVE_READ */
1873
1879
 
1874
1880
  PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
1875
1881
  png_alloc_size_t size), PNG_ALLOCATED);
@@ -2070,7 +2076,7 @@ PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
2070
2076
  PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
2071
2077
  (png_const_structrp png_ptr, png_const_inforp info_ptr));
2072
2078
 
2073
- #endif /* PNG_EASY_ACCESS_SUPPORTED */
2079
+ #endif /* EASY_ACCESS */
2074
2080
 
2075
2081
  #ifdef PNG_READ_SUPPORTED
2076
2082
  /* Returns pointer to signature string read from PNG header */
@@ -2322,7 +2328,7 @@ PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
2322
2328
  PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
2323
2329
  png_inforp info_ptr, int unit,
2324
2330
  png_const_charp swidth, png_const_charp sheight));
2325
- #endif /* PNG_sCAL_SUPPORTED */
2331
+ #endif /* sCAL */
2326
2332
 
2327
2333
  #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
2328
2334
  /* Provide the default handling for all unknown chunks or, optionally, for
@@ -2550,8 +2556,8 @@ PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
2550
2556
  PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
2551
2557
  png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
2552
2558
  int *unit_type));
2553
- # endif /* PNG_pHYs_SUPPORTED */
2554
- #endif /* PNG_INCH_CONVERSIONS_SUPPORTED */
2559
+ # endif /* pHYs */
2560
+ #endif /* INCH_CONVERSIONS */
2555
2561
 
2556
2562
  /* Added in libpng-1.4.0 */
2557
2563
  #ifdef PNG_IO_STATE_SUPPORTED
@@ -2574,7 +2580,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
2574
2580
  # define PNG_IO_CHUNK_CRC 0x0080 /* currently at the chunk crc */
2575
2581
  # define PNG_IO_MASK_OP 0x000f /* current operation: reading/writing */
2576
2582
  # define PNG_IO_MASK_LOC 0x00f0 /* current location: sig/hdr/data/crc */
2577
- #endif /* ?PNG_IO_STATE_SUPPORTED */
2583
+ #endif /* IO_STATE */
2578
2584
 
2579
2585
  /* Interlace support. The following macros are always defined so that if
2580
2586
  * libpng interlace handling is turned off the macros may be used to handle
@@ -2678,7 +2684,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
2678
2684
  (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
2679
2685
  (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \
2680
2686
  32767) / 65535)
2681
- #endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
2687
+ #endif /* READ_COMPOSITE_NODIV */
2682
2688
 
2683
2689
  #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
2684
2690
  PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
@@ -3106,7 +3112,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
3106
3112
  PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
3107
3113
  FILE* file));
3108
3114
  /* The PNG header is read from the stdio FILE object. */
3109
- #endif /* PNG_STDIO_SUPPORTED */
3115
+ #endif /* STDIO */
3110
3116
 
3111
3117
  PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
3112
3118
  png_const_voidp memory, png_size_t size));
@@ -3151,7 +3157,7 @@ PNG_EXPORT(238, void, png_image_free, (png_imagep image));
3151
3157
  /* Free any data allocated by libpng in image->opaque, setting the pointer to
3152
3158
  * NULL. May be called at any time after the structure is initialized.
3153
3159
  */
3154
- #endif /* PNG_SIMPLIFIED_READ_SUPPORTED */
3160
+ #endif /* SIMPLIFIED_READ */
3155
3161
 
3156
3162
  #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
3157
3163
  #ifdef PNG_STDIO_SUPPORTED
@@ -3197,12 +3203,12 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
3197
3203
  *
3198
3204
  * Note that the write API does not support interlacing or sub-8-bit pixels.
3199
3205
  */
3200
- #endif /* PNG_STDIO_SUPPORTED */
3201
- #endif /* PNG_SIMPLIFIED_WRITE_SUPPORTED */
3206
+ #endif /* STDIO */
3207
+ #endif /* SIMPLIFIED_WRITE */
3202
3208
  /*******************************************************************************
3203
3209
  * END OF SIMPLIFIED API
3204
3210
  ******************************************************************************/
3205
- #endif /* PNG_SIMPLIFIED_{READ|WRITE}_SUPPORTED */
3211
+ #endif /* SIMPLIFIED_{READ|WRITE} */
3206
3212
 
3207
3213
  #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
3208
3214
  PNG_EXPORT(242, void, png_set_check_for_invalid_index,
@@ -3250,7 +3256,7 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
3250
3256
 
3251
3257
  PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
3252
3258
  int onoff));
3253
- #endif /* PNG_SET_OPTION_SUPPORTED */
3259
+ #endif /* SET_OPTION */
3254
3260
 
3255
3261
  /*******************************************************************************
3256
3262
  * END OF HARDWARE AND SOFTWARE OPTIONS
@@ -1,7 +1,7 @@
1
1
 
2
2
  /* pngconf.h - machine configurable file for libpng
3
3
  *
4
- * libpng version 1.6.14 - October 23, 2014
4
+ * libpng version 1.6.16,December 22, 2014
5
5
  *
6
6
  * Copyright (c) 1998-2014 Glenn Randers-Pehrson
7
7
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1,6 +1,6 @@
1
1
  /* pnglibconf.h - library build configuration */
2
2
 
3
- /* libpng version 1.6.14 - October 23, 2014 */
3
+ /* libpng version 1.6.16,December 22, 2014 */
4
4
 
5
5
  /* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
6
6
 
@@ -1,7 +1,7 @@
1
1
 
2
2
  /* png.h - header file for PNG reference library
3
3
  *
4
- * libpng version 1.6.14 - October 23, 2014
4
+ * libpng version 1.6.16, December 22, 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.14 - October 23, 2014: Glenn
14
+ * libpng versions 0.97, January 1998, through 1.6.16, December 22, 2014: Glenn
15
15
  * See also "Contributing Authors", below.
16
16
  *
17
17
  * Note about libpng version numbers:
@@ -206,6 +206,12 @@
206
206
  * 1.6.14beta01-07 16 10614 16.so.16.14[.0]
207
207
  * 1.6.14rc01-02 16 10614 16.so.16.14[.0]
208
208
  * 1.6.14 16 10614 16.so.16.14[.0]
209
+ * 1.6.15beta01-08 16 10615 16.so.16.15[.0]
210
+ * 1.6.15rc01-03 16 10615 16.so.16.15[.0]
211
+ * 1.6.15 16 10615 16.so.16.15[.0]
212
+ * 1.6.16beta01-03 16 10616 16.so.16.16[.0]
213
+ * 1.6.16rc01-02 16 10616 16.so.16.16[.0]
214
+ * 1.6.16 16 10616 16.so.16.16[.0]
209
215
  *
210
216
  * Henceforth the source version will match the shared-library major
211
217
  * and minor numbers; the shared-library major version number will be
@@ -237,7 +243,7 @@
237
243
  *
238
244
  * This code is released under the libpng license.
239
245
  *
240
- * libpng versions 1.2.6, August 15, 2004, through 1.6.14, October 23, 2014, are
246
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
241
247
  * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
242
248
  * distributed according to the same disclaimer and license as libpng-1.2.5
243
249
  * with the following individual added to the list of Contributing Authors:
@@ -349,13 +355,13 @@
349
355
  * Y2K compliance in libpng:
350
356
  * =========================
351
357
  *
352
- * October 23, 2014
358
+ * December 22, 2014
353
359
  *
354
360
  * Since the PNG Development group is an ad-hoc body, we can't make
355
361
  * an official declaration.
356
362
  *
357
363
  * This is your unofficial assurance that libpng from version 0.71 and
358
- * upward through 1.6.14 are Y2K compliant. It is my belief that
364
+ * upward through 1.6.16 are Y2K compliant. It is my belief that
359
365
  * earlier versions were also Y2K compliant.
360
366
  *
361
367
  * Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -417,9 +423,9 @@
417
423
  */
418
424
 
419
425
  /* Version information for png.h - this should match the version in png.c */
420
- #define PNG_LIBPNG_VER_STRING "1.6.14"
426
+ #define PNG_LIBPNG_VER_STRING "1.6.16"
421
427
  #define PNG_HEADER_VERSION_STRING \
422
- " libpng version 1.6.14 - October 23, 2014\n"
428
+ " libpng version 1.6.16 - December 22, 2014\n"
423
429
 
424
430
  #define PNG_LIBPNG_VER_SONUM 16
425
431
  #define PNG_LIBPNG_VER_DLLNUM 16
@@ -427,7 +433,7 @@
427
433
  /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
428
434
  #define PNG_LIBPNG_VER_MAJOR 1
429
435
  #define PNG_LIBPNG_VER_MINOR 6
430
- #define PNG_LIBPNG_VER_RELEASE 14
436
+ #define PNG_LIBPNG_VER_RELEASE 16
431
437
 
432
438
  /* This should match the numeric part of the final component of
433
439
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -458,7 +464,7 @@
458
464
  * version 1.0.0 was mis-numbered 100 instead of 10000). From
459
465
  * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
460
466
  */
461
- #define PNG_LIBPNG_VER 10614 /* 1.6.14 */
467
+ #define PNG_LIBPNG_VER 10616 /* 1.6.16 */
462
468
 
463
469
  /* Library configuration: these options cannot be changed after
464
470
  * the library has been built.
@@ -563,7 +569,7 @@ extern "C" {
563
569
  /* This triggers a compiler error in png.c, if png.c and png.h
564
570
  * do not agree upon the version number.
565
571
  */
566
- typedef char* png_libpng_version_1_6_14;
572
+ typedef char* png_libpng_version_1_6_16;
567
573
 
568
574
  /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
569
575
  *
@@ -1176,7 +1182,7 @@ PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
1176
1182
 
1177
1183
  /* Convert from time_t to png_time. Uses gmtime() */
1178
1184
  PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
1179
- #endif /* PNG_CONVERT_tIME_SUPPORTED */
1185
+ #endif /* CONVERT_tIME */
1180
1186
 
1181
1187
  #ifdef PNG_READ_EXPAND_SUPPORTED
1182
1188
  /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
@@ -1382,7 +1388,7 @@ PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
1382
1388
  /* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
1383
1389
  PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
1384
1390
  png_uint_32 filler, int flags));
1385
- #endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
1391
+ #endif /* READ_FILLER || WRITE_FILLER */
1386
1392
 
1387
1393
  #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
1388
1394
  /* Swap bytes in 16-bit depth files. */
@@ -1646,7 +1652,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
1646
1652
  (png_structrp png_ptr, int heuristic_method, int num_weights,
1647
1653
  png_const_fixed_point_p filter_weights,
1648
1654
  png_const_fixed_point_p filter_costs))
1649
- #endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
1655
+ #endif /* WRITE_WEIGHTED_FILTER */
1650
1656
 
1651
1657
  /* Heuristic used for row filter selection. These defines should NOT be
1652
1658
  * changed.
@@ -1702,7 +1708,7 @@ PNG_EXPORT(225, void, png_set_text_compression_window_bits,
1702
1708
 
1703
1709
  PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
1704
1710
  int method));
1705
- #endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
1711
+ #endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
1706
1712
 
1707
1713
  /* These next functions are called for input/output, memory, and error
1708
1714
  * handling. They are in the file pngrio.c, pngwio.c, and pngerror.c,
@@ -1869,7 +1875,7 @@ PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
1869
1875
  */
1870
1876
  PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
1871
1877
  png_bytep old_row, png_const_bytep new_row));
1872
- #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
1878
+ #endif /* PROGRESSIVE_READ */
1873
1879
 
1874
1880
  PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
1875
1881
  png_alloc_size_t size), PNG_ALLOCATED);
@@ -2070,7 +2076,7 @@ PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
2070
2076
  PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
2071
2077
  (png_const_structrp png_ptr, png_const_inforp info_ptr));
2072
2078
 
2073
- #endif /* PNG_EASY_ACCESS_SUPPORTED */
2079
+ #endif /* EASY_ACCESS */
2074
2080
 
2075
2081
  #ifdef PNG_READ_SUPPORTED
2076
2082
  /* Returns pointer to signature string read from PNG header */
@@ -2322,7 +2328,7 @@ PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
2322
2328
  PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
2323
2329
  png_inforp info_ptr, int unit,
2324
2330
  png_const_charp swidth, png_const_charp sheight));
2325
- #endif /* PNG_sCAL_SUPPORTED */
2331
+ #endif /* sCAL */
2326
2332
 
2327
2333
  #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
2328
2334
  /* Provide the default handling for all unknown chunks or, optionally, for
@@ -2550,8 +2556,8 @@ PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
2550
2556
  PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
2551
2557
  png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
2552
2558
  int *unit_type));
2553
- # endif /* PNG_pHYs_SUPPORTED */
2554
- #endif /* PNG_INCH_CONVERSIONS_SUPPORTED */
2559
+ # endif /* pHYs */
2560
+ #endif /* INCH_CONVERSIONS */
2555
2561
 
2556
2562
  /* Added in libpng-1.4.0 */
2557
2563
  #ifdef PNG_IO_STATE_SUPPORTED
@@ -2574,7 +2580,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
2574
2580
  # define PNG_IO_CHUNK_CRC 0x0080 /* currently at the chunk crc */
2575
2581
  # define PNG_IO_MASK_OP 0x000f /* current operation: reading/writing */
2576
2582
  # define PNG_IO_MASK_LOC 0x00f0 /* current location: sig/hdr/data/crc */
2577
- #endif /* ?PNG_IO_STATE_SUPPORTED */
2583
+ #endif /* IO_STATE */
2578
2584
 
2579
2585
  /* Interlace support. The following macros are always defined so that if
2580
2586
  * libpng interlace handling is turned off the macros may be used to handle
@@ -2678,7 +2684,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
2678
2684
  (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
2679
2685
  (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \
2680
2686
  32767) / 65535)
2681
- #endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
2687
+ #endif /* READ_COMPOSITE_NODIV */
2682
2688
 
2683
2689
  #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
2684
2690
  PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
@@ -3106,7 +3112,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
3106
3112
  PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
3107
3113
  FILE* file));
3108
3114
  /* The PNG header is read from the stdio FILE object. */
3109
- #endif /* PNG_STDIO_SUPPORTED */
3115
+ #endif /* STDIO */
3110
3116
 
3111
3117
  PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
3112
3118
  png_const_voidp memory, png_size_t size));
@@ -3151,7 +3157,7 @@ PNG_EXPORT(238, void, png_image_free, (png_imagep image));
3151
3157
  /* Free any data allocated by libpng in image->opaque, setting the pointer to
3152
3158
  * NULL. May be called at any time after the structure is initialized.
3153
3159
  */
3154
- #endif /* PNG_SIMPLIFIED_READ_SUPPORTED */
3160
+ #endif /* SIMPLIFIED_READ */
3155
3161
 
3156
3162
  #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
3157
3163
  #ifdef PNG_STDIO_SUPPORTED
@@ -3197,12 +3203,12 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
3197
3203
  *
3198
3204
  * Note that the write API does not support interlacing or sub-8-bit pixels.
3199
3205
  */
3200
- #endif /* PNG_STDIO_SUPPORTED */
3201
- #endif /* PNG_SIMPLIFIED_WRITE_SUPPORTED */
3206
+ #endif /* STDIO */
3207
+ #endif /* SIMPLIFIED_WRITE */
3202
3208
  /*******************************************************************************
3203
3209
  * END OF SIMPLIFIED API
3204
3210
  ******************************************************************************/
3205
- #endif /* PNG_SIMPLIFIED_{READ|WRITE}_SUPPORTED */
3211
+ #endif /* SIMPLIFIED_{READ|WRITE} */
3206
3212
 
3207
3213
  #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
3208
3214
  PNG_EXPORT(242, void, png_set_check_for_invalid_index,
@@ -3250,7 +3256,7 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
3250
3256
 
3251
3257
  PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
3252
3258
  int onoff));
3253
- #endif /* PNG_SET_OPTION_SUPPORTED */
3259
+ #endif /* SET_OPTION */
3254
3260
 
3255
3261
  /*******************************************************************************
3256
3262
  * END OF HARDWARE AND SOFTWARE OPTIONS