cairo 1.15.5-x86-mingw32 → 1.15.6-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/NEWS +13 -0
- data/Rakefile +6 -6
- data/ext/cairo/extconf.rb +3 -120
- data/ext/cairo/rb_cairo.h +2 -2
- data/ext/cairo/rb_cairo_constants.c +2 -2
- data/ext/cairo/rb_cairo_context.c +14 -0
- data/ext/cairo/rb_cairo_surface.c +14 -0
- data/lib/2.2/cairo.so +0 -0
- data/lib/2.3/cairo.so +0 -0
- data/lib/2.4/cairo.so +0 -0
- data/vendor/local/bin/fc-cache.exe +0 -0
- data/vendor/local/bin/fc-cat.exe +0 -0
- data/vendor/local/bin/fc-list.exe +0 -0
- data/vendor/local/bin/fc-match.exe +0 -0
- data/vendor/local/bin/fc-pattern.exe +0 -0
- data/vendor/local/bin/fc-query.exe +0 -0
- data/vendor/local/bin/fc-scan.exe +0 -0
- data/vendor/local/bin/fc-validate.exe +0 -0
- data/vendor/local/bin/freetype-config +1 -1
- data/vendor/local/bin/libcairo-2.dll +0 -0
- data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
- data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
- data/vendor/local/bin/libfontconfig-1.dll +0 -0
- data/vendor/local/bin/libfreetype-6.dll +0 -0
- data/vendor/local/bin/libpixman-1-0.dll +0 -0
- data/vendor/local/bin/libpng-config +1 -1
- data/vendor/local/bin/libpng16-16.dll +0 -0
- data/vendor/local/bin/libpng16-config +1 -1
- data/vendor/local/bin/libxml2-2.dll +0 -0
- data/vendor/local/bin/png-fix-itxt.exe +0 -0
- data/vendor/local/bin/pngfix.exe +0 -0
- data/vendor/local/bin/xmlcatalog.exe +0 -0
- data/vendor/local/bin/xmllint.exe +0 -0
- data/vendor/local/bin/zlib1.dll +0 -0
- data/vendor/local/include/freetype2/freetype/config/ftconfig.h +17 -6
- data/vendor/local/include/freetype2/freetype/freetype.h +38 -3
- data/vendor/local/include/freetype2/freetype/ftimage.h +1 -0
- data/vendor/local/include/freetype2/freetype/ftmm.h +74 -1
- data/vendor/local/include/freetype2/freetype/ftrender.h +1 -0
- data/vendor/local/include/freetype2/freetype/tttags.h +4 -0
- data/vendor/local/include/libpng16/png.h +23 -25
- data/vendor/local/include/libpng16/pngconf.h +1 -1
- data/vendor/local/include/libpng16/pnglibconf.h +4 -2
- data/vendor/local/include/png.h +23 -25
- data/vendor/local/include/pngconf.h +1 -1
- data/vendor/local/include/pnglibconf.h +4 -2
- data/vendor/local/include/zlib.h +9 -8
- data/vendor/local/lib/libcairo-gobject.a +0 -0
- data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
- data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
- data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
- data/vendor/local/lib/libcairo.a +0 -0
- data/vendor/local/lib/libcairo.dll.a +0 -0
- data/vendor/local/lib/libfontconfig.dll.a +0 -0
- data/vendor/local/lib/libfreetype.a +0 -0
- data/vendor/local/lib/libfreetype.dll.a +0 -0
- data/vendor/local/lib/libfreetype.la +3 -3
- data/vendor/local/lib/libpixman-1.dll.a +0 -0
- data/vendor/local/lib/libpng.a +0 -0
- data/vendor/local/lib/libpng.dll.a +0 -0
- data/vendor/local/lib/libpng.la +2 -2
- data/vendor/local/lib/libpng16.a +0 -0
- data/vendor/local/lib/libpng16.dll.a +0 -0
- data/vendor/local/lib/libpng16.la +2 -2
- data/vendor/local/lib/libxml2.a +0 -0
- data/vendor/local/lib/libxml2.dll.a +0 -0
- data/vendor/local/lib/libz.a +0 -0
- data/vendor/local/lib/libz.dll.a +0 -0
- data/vendor/local/lib/pkgconfig/freetype2.pc +1 -1
- data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
- data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
- data/vendor/local/lib/pkgconfig/zlib.pc +1 -1
- data/vendor/local/share/license/freetype/README +5 -5
- data/vendor/local/share/license/libpng/README +6 -2
- data/vendor/local/share/license/zlib/README +2 -2
- data/vendor/local/share/man/man1/freetype-config.1 +1 -1
- data/vendor/local/share/man/man3/libpng.3 +15 -12
- data/vendor/local/share/man/man3/libpngpf.3 +2 -2
- data/vendor/local/share/man/man5/png.5 +1 -1
- metadata +16 -2
@@ -171,6 +171,7 @@ FT_BEGIN_HEADER
|
|
171
171
|
{
|
172
172
|
FT_Fixed* coords;
|
173
173
|
FT_UInt strid;
|
174
|
+
FT_UInt psid; /* since 2.7.1 */
|
174
175
|
|
175
176
|
} FT_Var_Named_Style;
|
176
177
|
|
@@ -334,6 +335,34 @@ FT_BEGIN_HEADER
|
|
334
335
|
FT_Fixed* coords );
|
335
336
|
|
336
337
|
|
338
|
+
/*************************************************************************/
|
339
|
+
/* */
|
340
|
+
/* <Function> */
|
341
|
+
/* FT_Get_Var_Design_Coordinates */
|
342
|
+
/* */
|
343
|
+
/* <Description> */
|
344
|
+
/* For Multiple Master and GX Var fonts, get the design coordinates */
|
345
|
+
/* of the currently selected interpolated font. */
|
346
|
+
/* */
|
347
|
+
/* <Input> */
|
348
|
+
/* face :: A handle to the source face. */
|
349
|
+
/* */
|
350
|
+
/* num_coords :: The number of design coordinates to retrieve. If it */
|
351
|
+
/* is larger than the number of axes, set the excess */
|
352
|
+
/* values to~0. */
|
353
|
+
/* */
|
354
|
+
/* <Output> */
|
355
|
+
/* coords :: The design coordinates array. */
|
356
|
+
/* */
|
357
|
+
/* <Return> */
|
358
|
+
/* FreeType error code. 0~means success. */
|
359
|
+
/* */
|
360
|
+
FT_EXPORT( FT_Error )
|
361
|
+
FT_Get_Var_Design_Coordinates( FT_Face face,
|
362
|
+
FT_UInt num_coords,
|
363
|
+
FT_Fixed* coords );
|
364
|
+
|
365
|
+
|
337
366
|
/*************************************************************************/
|
338
367
|
/* */
|
339
368
|
/* <Function> */
|
@@ -353,7 +382,8 @@ FT_BEGIN_HEADER
|
|
353
382
|
/* use default values for the remaining axes. */
|
354
383
|
/* */
|
355
384
|
/* coords :: The design coordinates array (each element must be */
|
356
|
-
/* between 0 and 1.0
|
385
|
+
/* between 0 and 1.0 for MM fonts, and between -1.0 and */
|
386
|
+
/* 1.0 for GX var fonts). */
|
357
387
|
/* */
|
358
388
|
/* <Return> */
|
359
389
|
/* FreeType error code. 0~means success. */
|
@@ -364,6 +394,35 @@ FT_BEGIN_HEADER
|
|
364
394
|
FT_Fixed* coords );
|
365
395
|
|
366
396
|
|
397
|
+
/*************************************************************************/
|
398
|
+
/* */
|
399
|
+
/* <Function> */
|
400
|
+
/* FT_Get_MM_Blend_Coordinates */
|
401
|
+
/* */
|
402
|
+
/* <Description> */
|
403
|
+
/* For Multiple Masters and GX var fonts, get the normalized blend */
|
404
|
+
/* coordinates of the currently selected interpolated font. */
|
405
|
+
/* */
|
406
|
+
/* <Input> */
|
407
|
+
/* face :: A handle to the source face. */
|
408
|
+
/* */
|
409
|
+
/* num_coords :: The number of normalized blend coordinates to */
|
410
|
+
/* retrieve. If it is larger than the number of axes, */
|
411
|
+
/* set the excess values to~0.5 for MM fonts, and to~0 */
|
412
|
+
/* for GX var fonts. */
|
413
|
+
/* */
|
414
|
+
/* <Output> */
|
415
|
+
/* coords :: The normalized blend coordinates array. */
|
416
|
+
/* */
|
417
|
+
/* <Return> */
|
418
|
+
/* FreeType error code. 0~means success. */
|
419
|
+
/* */
|
420
|
+
FT_EXPORT( FT_Error )
|
421
|
+
FT_Get_MM_Blend_Coordinates( FT_Face face,
|
422
|
+
FT_UInt num_coords,
|
423
|
+
FT_Fixed* coords );
|
424
|
+
|
425
|
+
|
367
426
|
/*************************************************************************/
|
368
427
|
/* */
|
369
428
|
/* <Function> */
|
@@ -377,6 +436,20 @@ FT_BEGIN_HEADER
|
|
377
436
|
FT_UInt num_coords,
|
378
437
|
FT_Fixed* coords );
|
379
438
|
|
439
|
+
|
440
|
+
/*************************************************************************/
|
441
|
+
/* */
|
442
|
+
/* <Function> */
|
443
|
+
/* FT_Get_Var_Blend_Coordinates */
|
444
|
+
/* */
|
445
|
+
/* <Description> */
|
446
|
+
/* This is another name of @FT_Get_MM_Blend_Coordinates. */
|
447
|
+
/* */
|
448
|
+
FT_EXPORT( FT_Error )
|
449
|
+
FT_Get_Var_Blend_Coordinates( FT_Face face,
|
450
|
+
FT_UInt num_coords,
|
451
|
+
FT_Fixed* coords );
|
452
|
+
|
380
453
|
/* */
|
381
454
|
|
382
455
|
|
@@ -43,6 +43,7 @@ FT_BEGIN_HEADER
|
|
43
43
|
#define TTAG_CBDT FT_MAKE_TAG( 'C', 'B', 'D', 'T' )
|
44
44
|
#define TTAG_CBLC FT_MAKE_TAG( 'C', 'B', 'L', 'C' )
|
45
45
|
#define TTAG_CFF FT_MAKE_TAG( 'C', 'F', 'F', ' ' )
|
46
|
+
#define TTAG_CFF2 FT_MAKE_TAG( 'C', 'F', 'F', '2' )
|
46
47
|
#define TTAG_CID FT_MAKE_TAG( 'C', 'I', 'D', ' ' )
|
47
48
|
#define TTAG_cmap FT_MAKE_TAG( 'c', 'm', 'a', 'p' )
|
48
49
|
#define TTAG_cvar FT_MAKE_TAG( 'c', 'v', 'a', 'r' )
|
@@ -61,6 +62,7 @@ FT_BEGIN_HEADER
|
|
61
62
|
#define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
|
62
63
|
#define TTAG_GSUB FT_MAKE_TAG( 'G', 'S', 'U', 'B' )
|
63
64
|
#define TTAG_gvar FT_MAKE_TAG( 'g', 'v', 'a', 'r' )
|
65
|
+
#define TTAG_HVAR FT_MAKE_TAG( 'H', 'V', 'A', 'R' )
|
64
66
|
#define TTAG_hdmx FT_MAKE_TAG( 'h', 'd', 'm', 'x' )
|
65
67
|
#define TTAG_head FT_MAKE_TAG( 'h', 'e', 'a', 'd' )
|
66
68
|
#define TTAG_hhea FT_MAKE_TAG( 'h', 'h', 'e', 'a' )
|
@@ -79,6 +81,7 @@ FT_BEGIN_HEADER
|
|
79
81
|
#define TTAG_MMSD FT_MAKE_TAG( 'M', 'M', 'S', 'D' )
|
80
82
|
#define TTAG_mort FT_MAKE_TAG( 'm', 'o', 'r', 't' )
|
81
83
|
#define TTAG_morx FT_MAKE_TAG( 'm', 'o', 'r', 'x' )
|
84
|
+
#define TTAG_MVAR FT_MAKE_TAG( 'M', 'V', 'A', 'R' )
|
82
85
|
#define TTAG_name FT_MAKE_TAG( 'n', 'a', 'm', 'e' )
|
83
86
|
#define TTAG_opbd FT_MAKE_TAG( 'o', 'p', 'b', 'd' )
|
84
87
|
#define TTAG_OS2 FT_MAKE_TAG( 'O', 'S', '/', '2' )
|
@@ -100,6 +103,7 @@ FT_BEGIN_HEADER
|
|
100
103
|
#define TTAG_VDMX FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
|
101
104
|
#define TTAG_vhea FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
|
102
105
|
#define TTAG_vmtx FT_MAKE_TAG( 'v', 'm', 't', 'x' )
|
106
|
+
#define TTAG_VVAR FT_MAKE_TAG( 'V', 'V', 'A', 'R' )
|
103
107
|
#define TTAG_wOFF FT_MAKE_TAG( 'w', 'O', 'F', 'F' )
|
104
108
|
|
105
109
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
|
2
2
|
/* png.h - header file for PNG reference library
|
3
3
|
*
|
4
|
-
* libpng version 1.6.
|
4
|
+
* libpng version 1.6.29, March 16, 2017
|
5
5
|
*
|
6
|
-
* Copyright (c) 1998-2002,2004,2006-
|
6
|
+
* Copyright (c) 1998-2002,2004,2006-2017 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
|
*
|
@@ -12,7 +12,7 @@
|
|
12
12
|
* Authors and maintainers:
|
13
13
|
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
|
14
14
|
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
|
15
|
-
* libpng versions 0.97, January 1998, through 1.6.
|
15
|
+
* libpng versions 0.97, January 1998, through 1.6.29, March 16, 2017:
|
16
16
|
* Glenn Randers-Pehrson.
|
17
17
|
* See also "Contributing Authors", below.
|
18
18
|
*/
|
@@ -25,12 +25,8 @@
|
|
25
25
|
*
|
26
26
|
* This code is released under the libpng license.
|
27
27
|
*
|
28
|
-
*
|
29
|
-
*
|
30
|
-
* are released under other open source licenses.
|
31
|
-
*
|
32
|
-
* libpng versions 1.0.7, July 1, 2000 through 1.6.27, December 29, 2016 are
|
33
|
-
* Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
|
28
|
+
* libpng versions 1.0.7, July 1, 2000 through 1.6.29, March 16, 2017 are
|
29
|
+
* Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
|
34
30
|
* derived from libpng-1.0.6, and are distributed according to the same
|
35
31
|
* disclaimer and license as libpng-1.0.6 with the following individuals
|
36
32
|
* added to the list of Contributing Authors:
|
@@ -42,6 +38,8 @@
|
|
42
38
|
* Gilles Vollant
|
43
39
|
* James Yu
|
44
40
|
* Mandar Sahastrabuddhe
|
41
|
+
* Google Inc.
|
42
|
+
* Vadim Barkov
|
45
43
|
*
|
46
44
|
* and with the following additions to the disclaimer:
|
47
45
|
*
|
@@ -52,10 +50,10 @@
|
|
52
50
|
* risk of satisfactory quality, performance, accuracy, and effort is with
|
53
51
|
* the user.
|
54
52
|
*
|
55
|
-
* Some files in the "contrib" directory
|
53
|
+
* Some files in the "contrib" directory and some configure-generated
|
54
|
+
* files that are distributed with libpng have other copyright owners and
|
56
55
|
* are released under other open source licenses.
|
57
56
|
*
|
58
|
-
*
|
59
57
|
* libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
|
60
58
|
* Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
|
61
59
|
* libpng-0.96, and are distributed according to the same disclaimer and
|
@@ -66,9 +64,6 @@
|
|
66
64
|
* Glenn Randers-Pehrson
|
67
65
|
* Willem van Schaik
|
68
66
|
*
|
69
|
-
* Some files in the "scripts" directory have different copyright owners
|
70
|
-
* but are also released under this license.
|
71
|
-
*
|
72
67
|
* libpng versions 0.89, June 1996, through 0.96, May 1997, are
|
73
68
|
* Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
|
74
69
|
* and are distributed according to the same disclaimer and license as
|
@@ -214,11 +209,11 @@
|
|
214
209
|
* ...
|
215
210
|
* 1.0.19 10 10019 10.so.0.19[.0]
|
216
211
|
* ...
|
217
|
-
* 1.2.
|
212
|
+
* 1.2.57 13 10257 12.so.0.57[.0]
|
218
213
|
* ...
|
219
|
-
* 1.5.
|
214
|
+
* 1.5.28 15 10527 15.so.15.28[.0]
|
220
215
|
* ...
|
221
|
-
* 1.6.
|
216
|
+
* 1.6.29 16 10629 16.so.16.29[.0]
|
222
217
|
*
|
223
218
|
* Henceforth the source version will match the shared-library major
|
224
219
|
* and minor numbers; the shared-library major version number will be
|
@@ -246,13 +241,13 @@
|
|
246
241
|
* Y2K compliance in libpng:
|
247
242
|
* =========================
|
248
243
|
*
|
249
|
-
*
|
244
|
+
* March 16, 2017
|
250
245
|
*
|
251
246
|
* Since the PNG Development group is an ad-hoc body, we can't make
|
252
247
|
* an official declaration.
|
253
248
|
*
|
254
249
|
* This is your unofficial assurance that libpng from version 0.71 and
|
255
|
-
* upward through 1.6.
|
250
|
+
* upward through 1.6.29 are Y2K compliant. It is my belief that
|
256
251
|
* earlier versions were also Y2K compliant.
|
257
252
|
*
|
258
253
|
* Libpng only has two year fields. One is a 2-byte unsigned integer
|
@@ -314,8 +309,8 @@
|
|
314
309
|
*/
|
315
310
|
|
316
311
|
/* Version information for png.h - this should match the version in png.c */
|
317
|
-
#define PNG_LIBPNG_VER_STRING "1.6.
|
318
|
-
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.
|
312
|
+
#define PNG_LIBPNG_VER_STRING "1.6.29"
|
313
|
+
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.29 - March 16, 2017\n"
|
319
314
|
|
320
315
|
#define PNG_LIBPNG_VER_SONUM 16
|
321
316
|
#define PNG_LIBPNG_VER_DLLNUM 16
|
@@ -323,7 +318,7 @@
|
|
323
318
|
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
|
324
319
|
#define PNG_LIBPNG_VER_MAJOR 1
|
325
320
|
#define PNG_LIBPNG_VER_MINOR 6
|
326
|
-
#define PNG_LIBPNG_VER_RELEASE
|
321
|
+
#define PNG_LIBPNG_VER_RELEASE 29
|
327
322
|
|
328
323
|
/* This should match the numeric part of the final component of
|
329
324
|
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
|
@@ -354,7 +349,7 @@
|
|
354
349
|
* version 1.0.0 was mis-numbered 100 instead of 10000). From
|
355
350
|
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
|
356
351
|
*/
|
357
|
-
#define PNG_LIBPNG_VER
|
352
|
+
#define PNG_LIBPNG_VER 10629 /* 1.6.29 */
|
358
353
|
|
359
354
|
/* Library configuration: these options cannot be changed after
|
360
355
|
* the library has been built.
|
@@ -464,7 +459,7 @@ extern "C" {
|
|
464
459
|
/* This triggers a compiler error in png.c, if png.c and png.h
|
465
460
|
* do not agree upon the version number.
|
466
461
|
*/
|
467
|
-
typedef char*
|
462
|
+
typedef char* png_libpng_version_1_6_29;
|
468
463
|
|
469
464
|
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
|
470
465
|
*
|
@@ -3231,7 +3226,10 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
|
|
3231
3226
|
# define PNG_MIPS_MSA 6 /* HARDWARE: MIPS Msa SIMD instructions supported */
|
3232
3227
|
#endif
|
3233
3228
|
#define PNG_IGNORE_ADLER32 8
|
3234
|
-
#
|
3229
|
+
#ifdef PNG_POWERPC_VSX_API_SUPPORTED
|
3230
|
+
# define PNG_POWERPC_VSX 10 /* HARDWARE: PowerPC VSX SIMD instructions supported */
|
3231
|
+
#endif
|
3232
|
+
#define PNG_OPTION_NEXT 12 /* Next option - numbers must be even */
|
3235
3233
|
|
3236
3234
|
/* Return values: NOTE: there are four values and 'off' is *not* zero */
|
3237
3235
|
#define PNG_OPTION_UNSET 0 /* Unset - defaults to off */
|
@@ -1,7 +1,7 @@
|
|
1
1
|
|
2
2
|
/* pngconf.h - machine configurable file for libpng
|
3
3
|
*
|
4
|
-
* libpng version 1.6.
|
4
|
+
* libpng version 1.6.29, March 16, 2017
|
5
5
|
*
|
6
6
|
* Copyright (c) 1998-2002,2004,2006-2016 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.
|
3
|
+
/* libpng version 1.6.29, March 16, 2017 */
|
4
4
|
|
5
5
|
/* Copyright (c) 1998-2016 Glenn Randers-Pehrson */
|
6
6
|
|
@@ -42,6 +42,8 @@
|
|
42
42
|
#define PNG_IO_STATE_SUPPORTED
|
43
43
|
#define PNG_MNG_FEATURES_SUPPORTED
|
44
44
|
#define PNG_POINTER_INDEXING_SUPPORTED
|
45
|
+
/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
|
46
|
+
/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/
|
45
47
|
#define PNG_PROGRESSIVE_READ_SUPPORTED
|
46
48
|
#define PNG_READ_16BIT_SUPPORTED
|
47
49
|
#define PNG_READ_ALPHA_MODE_SUPPORTED
|
@@ -203,7 +205,7 @@
|
|
203
205
|
#define PNG_USER_HEIGHT_MAX 1000000
|
204
206
|
#define PNG_USER_WIDTH_MAX 1000000
|
205
207
|
#define PNG_ZBUF_SIZE 8192
|
206
|
-
#define PNG_ZLIB_VERNUM
|
208
|
+
#define PNG_ZLIB_VERNUM 0x12b0
|
207
209
|
#define PNG_Z_DEFAULT_COMPRESSION (-1)
|
208
210
|
#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
|
209
211
|
#define PNG_Z_DEFAULT_STRATEGY 1
|
data/vendor/local/include/png.h
CHANGED
@@ -1,9 +1,9 @@
|
|
1
1
|
|
2
2
|
/* png.h - header file for PNG reference library
|
3
3
|
*
|
4
|
-
* libpng version 1.6.
|
4
|
+
* libpng version 1.6.29, March 16, 2017
|
5
5
|
*
|
6
|
-
* Copyright (c) 1998-2002,2004,2006-
|
6
|
+
* Copyright (c) 1998-2002,2004,2006-2017 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
|
*
|
@@ -12,7 +12,7 @@
|
|
12
12
|
* Authors and maintainers:
|
13
13
|
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
|
14
14
|
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
|
15
|
-
* libpng versions 0.97, January 1998, through 1.6.
|
15
|
+
* libpng versions 0.97, January 1998, through 1.6.29, March 16, 2017:
|
16
16
|
* Glenn Randers-Pehrson.
|
17
17
|
* See also "Contributing Authors", below.
|
18
18
|
*/
|
@@ -25,12 +25,8 @@
|
|
25
25
|
*
|
26
26
|
* This code is released under the libpng license.
|
27
27
|
*
|
28
|
-
*
|
29
|
-
*
|
30
|
-
* are released under other open source licenses.
|
31
|
-
*
|
32
|
-
* libpng versions 1.0.7, July 1, 2000 through 1.6.27, December 29, 2016 are
|
33
|
-
* Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
|
28
|
+
* libpng versions 1.0.7, July 1, 2000 through 1.6.29, March 16, 2017 are
|
29
|
+
* Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
|
34
30
|
* derived from libpng-1.0.6, and are distributed according to the same
|
35
31
|
* disclaimer and license as libpng-1.0.6 with the following individuals
|
36
32
|
* added to the list of Contributing Authors:
|
@@ -42,6 +38,8 @@
|
|
42
38
|
* Gilles Vollant
|
43
39
|
* James Yu
|
44
40
|
* Mandar Sahastrabuddhe
|
41
|
+
* Google Inc.
|
42
|
+
* Vadim Barkov
|
45
43
|
*
|
46
44
|
* and with the following additions to the disclaimer:
|
47
45
|
*
|
@@ -52,10 +50,10 @@
|
|
52
50
|
* risk of satisfactory quality, performance, accuracy, and effort is with
|
53
51
|
* the user.
|
54
52
|
*
|
55
|
-
* Some files in the "contrib" directory
|
53
|
+
* Some files in the "contrib" directory and some configure-generated
|
54
|
+
* files that are distributed with libpng have other copyright owners and
|
56
55
|
* are released under other open source licenses.
|
57
56
|
*
|
58
|
-
*
|
59
57
|
* libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
|
60
58
|
* Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
|
61
59
|
* libpng-0.96, and are distributed according to the same disclaimer and
|
@@ -66,9 +64,6 @@
|
|
66
64
|
* Glenn Randers-Pehrson
|
67
65
|
* Willem van Schaik
|
68
66
|
*
|
69
|
-
* Some files in the "scripts" directory have different copyright owners
|
70
|
-
* but are also released under this license.
|
71
|
-
*
|
72
67
|
* libpng versions 0.89, June 1996, through 0.96, May 1997, are
|
73
68
|
* Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
|
74
69
|
* and are distributed according to the same disclaimer and license as
|
@@ -214,11 +209,11 @@
|
|
214
209
|
* ...
|
215
210
|
* 1.0.19 10 10019 10.so.0.19[.0]
|
216
211
|
* ...
|
217
|
-
* 1.2.
|
212
|
+
* 1.2.57 13 10257 12.so.0.57[.0]
|
218
213
|
* ...
|
219
|
-
* 1.5.
|
214
|
+
* 1.5.28 15 10527 15.so.15.28[.0]
|
220
215
|
* ...
|
221
|
-
* 1.6.
|
216
|
+
* 1.6.29 16 10629 16.so.16.29[.0]
|
222
217
|
*
|
223
218
|
* Henceforth the source version will match the shared-library major
|
224
219
|
* and minor numbers; the shared-library major version number will be
|
@@ -246,13 +241,13 @@
|
|
246
241
|
* Y2K compliance in libpng:
|
247
242
|
* =========================
|
248
243
|
*
|
249
|
-
*
|
244
|
+
* March 16, 2017
|
250
245
|
*
|
251
246
|
* Since the PNG Development group is an ad-hoc body, we can't make
|
252
247
|
* an official declaration.
|
253
248
|
*
|
254
249
|
* This is your unofficial assurance that libpng from version 0.71 and
|
255
|
-
* upward through 1.6.
|
250
|
+
* upward through 1.6.29 are Y2K compliant. It is my belief that
|
256
251
|
* earlier versions were also Y2K compliant.
|
257
252
|
*
|
258
253
|
* Libpng only has two year fields. One is a 2-byte unsigned integer
|
@@ -314,8 +309,8 @@
|
|
314
309
|
*/
|
315
310
|
|
316
311
|
/* Version information for png.h - this should match the version in png.c */
|
317
|
-
#define PNG_LIBPNG_VER_STRING "1.6.
|
318
|
-
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.
|
312
|
+
#define PNG_LIBPNG_VER_STRING "1.6.29"
|
313
|
+
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.29 - March 16, 2017\n"
|
319
314
|
|
320
315
|
#define PNG_LIBPNG_VER_SONUM 16
|
321
316
|
#define PNG_LIBPNG_VER_DLLNUM 16
|
@@ -323,7 +318,7 @@
|
|
323
318
|
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
|
324
319
|
#define PNG_LIBPNG_VER_MAJOR 1
|
325
320
|
#define PNG_LIBPNG_VER_MINOR 6
|
326
|
-
#define PNG_LIBPNG_VER_RELEASE
|
321
|
+
#define PNG_LIBPNG_VER_RELEASE 29
|
327
322
|
|
328
323
|
/* This should match the numeric part of the final component of
|
329
324
|
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
|
@@ -354,7 +349,7 @@
|
|
354
349
|
* version 1.0.0 was mis-numbered 100 instead of 10000). From
|
355
350
|
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
|
356
351
|
*/
|
357
|
-
#define PNG_LIBPNG_VER
|
352
|
+
#define PNG_LIBPNG_VER 10629 /* 1.6.29 */
|
358
353
|
|
359
354
|
/* Library configuration: these options cannot be changed after
|
360
355
|
* the library has been built.
|
@@ -464,7 +459,7 @@ extern "C" {
|
|
464
459
|
/* This triggers a compiler error in png.c, if png.c and png.h
|
465
460
|
* do not agree upon the version number.
|
466
461
|
*/
|
467
|
-
typedef char*
|
462
|
+
typedef char* png_libpng_version_1_6_29;
|
468
463
|
|
469
464
|
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
|
470
465
|
*
|
@@ -3231,7 +3226,10 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
|
|
3231
3226
|
# define PNG_MIPS_MSA 6 /* HARDWARE: MIPS Msa SIMD instructions supported */
|
3232
3227
|
#endif
|
3233
3228
|
#define PNG_IGNORE_ADLER32 8
|
3234
|
-
#
|
3229
|
+
#ifdef PNG_POWERPC_VSX_API_SUPPORTED
|
3230
|
+
# define PNG_POWERPC_VSX 10 /* HARDWARE: PowerPC VSX SIMD instructions supported */
|
3231
|
+
#endif
|
3232
|
+
#define PNG_OPTION_NEXT 12 /* Next option - numbers must be even */
|
3235
3233
|
|
3236
3234
|
/* Return values: NOTE: there are four values and 'off' is *not* zero */
|
3237
3235
|
#define PNG_OPTION_UNSET 0 /* Unset - defaults to off */
|