cairo 1.15.13-x86-mingw32 → 1.15.14-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 +24 -0
- data/README.rdoc +11 -40
- data/Rakefile +4 -2
- data/ext/cairo/rb_cairo.h +1 -1
- data/ext/cairo/rb_cairo_context.c +35 -3
- data/ext/cairo/rb_cairo_font_options.c +5 -6
- data/ext/cairo/rb_cairo_private.h +2 -2
- data/ext/cairo/rb_cairo_scaled_font.c +11 -2
- data/ext/cairo/rb_cairo_surface.c +89 -48
- 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/lib/2.5/cairo.so +0 -0
- data/test/{cairo-test-utils.rb → helper.rb} +4 -5
- data/test/run-test.rb +3 -10
- data/test/test_context.rb +6 -6
- data/test/test_font_extents.rb +1 -1
- data/test/test_font_face.rb +1 -1
- data/test/test_font_options.rb +1 -1
- data/test/test_image_surface.rb +2 -2
- data/test/test_pdf_surface.rb +1 -1
- data/test/test_quartz_image_surface.rb +1 -1
- data/test/test_raster_source_pattern.rb +13 -13
- data/test/test_recording_surface.rb +2 -2
- data/test/test_region.rb +1 -1
- data/test/test_scaled_font.rb +1 -1
- data/test/test_script_device.rb +1 -1
- data/test/test_script_surface.rb +1 -1
- data/test/test_surface.rb +5 -5
- data/test/test_svg_surface.rb +1 -1
- data/test/test_tee_surface.rb +2 -2
- data/test/test_text_cluster.rb +1 -1
- data/test/test_text_extents.rb +1 -1
- data/test/test_text_to_glyphs_data.rb +1 -1
- data/test/test_xml_device.rb +1 -1
- data/test/test_xml_surface.rb +2 -2
- data/vendor/local/bin/fc-cache.exe +0 -0
- data/vendor/local/bin/fc-cat.exe +0 -0
- data/vendor/local/bin/fc-conflist.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/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/zlib1211.dll +0 -0
- data/vendor/local/include/freetype2/freetype/config/ftconfig.h +82 -3
- data/vendor/local/include/freetype2/freetype/config/ftheader.h +43 -85
- data/vendor/local/include/freetype2/freetype/config/ftoption.h +43 -56
- data/vendor/local/include/freetype2/freetype/config/ftstdlib.h +1 -1
- data/vendor/local/include/freetype2/freetype/freetype.h +185 -85
- data/vendor/local/include/freetype2/freetype/ftadvanc.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftbbox.h +2 -2
- data/vendor/local/include/freetype2/freetype/ftbdf.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftbitmap.h +2 -2
- data/vendor/local/include/freetype2/freetype/ftbzip2.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftcache.h +1 -16
- data/vendor/local/include/freetype2/freetype/ftchapters.h +3 -0
- data/vendor/local/include/freetype2/freetype/ftcid.h +2 -2
- data/vendor/local/include/freetype2/freetype/ftdriver.h +1225 -0
- data/vendor/local/include/freetype2/freetype/fterrdef.h +1 -1
- data/vendor/local/include/freetype2/freetype/fterrors.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftfntfmt.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftgasp.h +6 -1
- data/vendor/local/include/freetype2/freetype/ftglyph.h +3 -3
- data/vendor/local/include/freetype2/freetype/ftgxval.h +5 -5
- data/vendor/local/include/freetype2/freetype/ftgzip.h +4 -1
- data/vendor/local/include/freetype2/freetype/ftimage.h +18 -18
- data/vendor/local/include/freetype2/freetype/ftincrem.h +2 -13
- data/vendor/local/include/freetype2/freetype/ftlcdfil.h +5 -18
- data/vendor/local/include/freetype2/freetype/ftlist.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftlzw.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftmac.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftmm.h +99 -11
- data/vendor/local/include/freetype2/freetype/ftmodapi.h +12 -11
- data/vendor/local/include/freetype2/freetype/ftmoderr.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftotval.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftoutln.h +4 -7
- data/vendor/local/include/freetype2/freetype/ftparams.h +205 -0
- data/vendor/local/include/freetype2/freetype/ftpfr.h +4 -4
- data/vendor/local/include/freetype2/freetype/ftrender.h +2 -2
- data/vendor/local/include/freetype2/freetype/ftsizes.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftsnames.h +8 -42
- data/vendor/local/include/freetype2/freetype/ftstroke.h +6 -6
- data/vendor/local/include/freetype2/freetype/ftsynth.h +1 -1
- data/vendor/local/include/freetype2/freetype/ftsystem.h +1 -1
- data/vendor/local/include/freetype2/freetype/fttrigon.h +1 -1
- data/vendor/local/include/freetype2/freetype/fttypes.h +2 -2
- data/vendor/local/include/freetype2/freetype/ftwinfnt.h +2 -2
- data/vendor/local/include/freetype2/freetype/t1tables.h +10 -1
- data/vendor/local/include/freetype2/freetype/ttnameid.h +2 -2
- data/vendor/local/include/freetype2/freetype/tttables.h +1 -1
- data/vendor/local/include/freetype2/freetype/tttags.h +1 -1
- data/vendor/local/include/freetype2/ft2build.h +1 -1
- data/vendor/local/include/libpng16/png.h +40 -40
- data/vendor/local/include/libpng16/pngconf.h +15 -14
- data/vendor/local/include/libpng16/pnglibconf.h +1 -1
- data/vendor/local/include/png.h +40 -40
- data/vendor/local/include/pngconf.h +15 -14
- data/vendor/local/include/pnglibconf.h +1 -1
- data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
- data/vendor/local/lib/libcairo-gobject.la +1 -1
- 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.dll.a +0 -0
- data/vendor/local/lib/libz.dll.a +0 -0
- data/vendor/local/lib/pkgconfig/freetype2.pc +2 -2
- data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
- data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
- data/vendor/local/share/aclocal/freetype2.m4 +1 -1
- data/vendor/local/share/license/freetype/README +9 -9
- data/vendor/local/share/license/freetype/README.git +1 -1
- data/vendor/local/share/license/libpng/README +2 -2
- data/vendor/local/share/man/man3/libpng.3 +50 -54
- data/vendor/local/share/man/man3/libpngpf.3 +8 -4
- metadata +9 -14
- data/vendor/local/bin/freetype-config +0 -211
- data/vendor/local/include/freetype2/freetype/ftautoh.h +0 -533
- data/vendor/local/include/freetype2/freetype/ftcffdrv.h +0 -321
- data/vendor/local/include/freetype2/freetype/ftpcfdrv.h +0 -105
- data/vendor/local/include/freetype2/freetype/ftttdrv.h +0 -328
- data/vendor/local/include/freetype2/freetype/ttunpat.h +0 -63
- data/vendor/local/share/man/man1/freetype-config.1 +0 -146
@@ -4,7 +4,7 @@
|
|
4
4
|
/* */
|
5
5
|
/* FreeType path stroker (specification). */
|
6
6
|
/* */
|
7
|
-
/* Copyright 2002-
|
7
|
+
/* Copyright 2002-2018 by */
|
8
8
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
9
9
|
/* */
|
10
10
|
/* This file is part of the FreeType project, and may only be used, */
|
@@ -466,7 +466,7 @@ FT_BEGIN_HEADER
|
|
466
466
|
* FT_Stroker_ConicTo
|
467
467
|
*
|
468
468
|
* @description:
|
469
|
-
* `Draw' a single quadratic
|
469
|
+
* `Draw' a single quadratic Bezier in the stroker's current sub-path,
|
470
470
|
* from the last position.
|
471
471
|
*
|
472
472
|
* @input:
|
@@ -474,7 +474,7 @@ FT_BEGIN_HEADER
|
|
474
474
|
* The target stroker handle.
|
475
475
|
*
|
476
476
|
* control ::
|
477
|
-
* A pointer to a
|
477
|
+
* A pointer to a Bezier control point.
|
478
478
|
*
|
479
479
|
* to ::
|
480
480
|
* A pointer to the destination point.
|
@@ -498,7 +498,7 @@ FT_BEGIN_HEADER
|
|
498
498
|
* FT_Stroker_CubicTo
|
499
499
|
*
|
500
500
|
* @description:
|
501
|
-
* `Draw' a single cubic
|
501
|
+
* `Draw' a single cubic Bezier in the stroker's current sub-path,
|
502
502
|
* from the last position.
|
503
503
|
*
|
504
504
|
* @input:
|
@@ -506,10 +506,10 @@ FT_BEGIN_HEADER
|
|
506
506
|
* The target stroker handle.
|
507
507
|
*
|
508
508
|
* control1 ::
|
509
|
-
* A pointer to the first
|
509
|
+
* A pointer to the first Bezier control point.
|
510
510
|
*
|
511
511
|
* control2 ::
|
512
|
-
* A pointer to second
|
512
|
+
* A pointer to second Bezier control point.
|
513
513
|
*
|
514
514
|
* to ::
|
515
515
|
* A pointer to the destination point.
|
@@ -5,7 +5,7 @@
|
|
5
5
|
/* FreeType synthesizing code for emboldening and slanting */
|
6
6
|
/* (specification). */
|
7
7
|
/* */
|
8
|
-
/* Copyright 2000-
|
8
|
+
/* Copyright 2000-2018 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, */
|
@@ -4,7 +4,7 @@
|
|
4
4
|
/* */
|
5
5
|
/* FreeType low-level system interface definition (specification). */
|
6
6
|
/* */
|
7
|
-
/* Copyright 1996-
|
7
|
+
/* Copyright 1996-2018 by */
|
8
8
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
9
9
|
/* */
|
10
10
|
/* This file is part of the FreeType project, and may only be used, */
|
@@ -4,7 +4,7 @@
|
|
4
4
|
/* */
|
5
5
|
/* FreeType trigonometric functions (specification). */
|
6
6
|
/* */
|
7
|
-
/* Copyright 2001-
|
7
|
+
/* Copyright 2001-2018 by */
|
8
8
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
9
9
|
/* */
|
10
10
|
/* This file is part of the FreeType project, and may only be used, */
|
@@ -4,7 +4,7 @@
|
|
4
4
|
/* */
|
5
5
|
/* FreeType simple types definitions (specification only). */
|
6
6
|
/* */
|
7
|
-
/* Copyright 1996-
|
7
|
+
/* Copyright 1996-2018 by */
|
8
8
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
9
9
|
/* */
|
10
10
|
/* This file is part of the FreeType project, and may only be used, */
|
@@ -425,7 +425,7 @@ FT_BEGIN_HEADER
|
|
425
425
|
/* The address of the FreeType object that is under finalization. */
|
426
426
|
/* Its client data is accessed through its `generic' field. */
|
427
427
|
/* */
|
428
|
-
typedef void (*FT_Generic_Finalizer)(void* object);
|
428
|
+
typedef void (*FT_Generic_Finalizer)( void* object );
|
429
429
|
|
430
430
|
|
431
431
|
/*************************************************************************/
|
@@ -4,7 +4,7 @@
|
|
4
4
|
/* */
|
5
5
|
/* FreeType API for accessing Windows fnt-specific data. */
|
6
6
|
/* */
|
7
|
-
/* Copyright 2003-
|
7
|
+
/* Copyright 2003-2018 by */
|
8
8
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
9
9
|
/* */
|
10
10
|
/* This file is part of the FreeType project, and may only be used, */
|
@@ -78,7 +78,7 @@ FT_BEGIN_HEADER
|
|
78
78
|
* Mac Roman encoding.
|
79
79
|
*
|
80
80
|
* FT_WinFNT_ID_OEM ::
|
81
|
-
* From Michael
|
81
|
+
* From Michael Poettgen <michael@poettgen.de>:
|
82
82
|
*
|
83
83
|
* The `Windows Font Mapping' article says that FT_WinFNT_ID_OEM
|
84
84
|
* is used for the charset of vector fonts, like `modern.fon',
|
@@ -5,7 +5,7 @@
|
|
5
5
|
/* Basic Type 1/Type 2 tables definitions and interface (specification */
|
6
6
|
/* only). */
|
7
7
|
/* */
|
8
|
-
/* Copyright 1996-
|
8
|
+
/* Copyright 1996-2018 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, */
|
@@ -554,6 +554,9 @@ FT_BEGIN_HEADER
|
|
554
554
|
/* T1_ENCODING_TYPE_ISOLATIN1 :: */
|
555
555
|
/* T1_ENCODING_TYPE_EXPERT :: */
|
556
556
|
/* */
|
557
|
+
/* <Since> */
|
558
|
+
/* 2.4.8 */
|
559
|
+
/* */
|
557
560
|
typedef enum T1_EncodingType_
|
558
561
|
{
|
559
562
|
T1_ENCODING_TYPE_NONE = 0,
|
@@ -622,6 +625,9 @@ FT_BEGIN_HEADER
|
|
622
625
|
/* PS_DICT_FS_TYPE :: */
|
623
626
|
/* PS_DICT_ITALIC_ANGLE :: */
|
624
627
|
/* */
|
628
|
+
/* <Since> */
|
629
|
+
/* 2.4.8 */
|
630
|
+
/* */
|
625
631
|
typedef enum PS_Dict_Keys_
|
626
632
|
{
|
627
633
|
/* conventionally in the font dictionary */
|
@@ -743,6 +749,9 @@ FT_BEGIN_HEADER
|
|
743
749
|
* If the font's format is not PostScript-based, this function returns
|
744
750
|
* the `FT_Err_Invalid_Argument' error code.
|
745
751
|
*
|
752
|
+
* @since:
|
753
|
+
* 2.4.8
|
754
|
+
*
|
746
755
|
*/
|
747
756
|
FT_EXPORT( FT_Long )
|
748
757
|
FT_Get_PS_Font_Value( FT_Face face,
|
@@ -4,7 +4,7 @@
|
|
4
4
|
/* */
|
5
5
|
/* TrueType name ID definitions (specification only). */
|
6
6
|
/* */
|
7
|
-
/* Copyright 1996-
|
7
|
+
/* Copyright 1996-2018 by */
|
8
8
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
9
9
|
/* */
|
10
10
|
/* This file is part of the FreeType project, and may only be used, */
|
@@ -437,7 +437,7 @@ FT_BEGIN_HEADER
|
|
437
437
|
*
|
438
438
|
* The canonical source for Microsoft's IDs is
|
439
439
|
*
|
440
|
-
*
|
440
|
+
* https://www.microsoft.com/globaldev/reference/lcid-all.mspx ,
|
441
441
|
*
|
442
442
|
* however, we only provide macros for language identifiers present in
|
443
443
|
* the OpenType specification: Microsoft has abandoned the concept of
|
@@ -5,7 +5,7 @@
|
|
5
5
|
/* Basic SFNT/TrueType tables definitions and interface */
|
6
6
|
/* (specification only). */
|
7
7
|
/* */
|
8
|
-
/* Copyright 1996-
|
8
|
+
/* Copyright 1996-2018 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, */
|
@@ -4,7 +4,7 @@
|
|
4
4
|
/* */
|
5
5
|
/* Tags for TrueType and OpenType tables (specification only). */
|
6
6
|
/* */
|
7
|
-
/* Copyright 1996-
|
7
|
+
/* Copyright 1996-2018 by */
|
8
8
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
9
9
|
/* */
|
10
10
|
/* This file is part of the FreeType project, and may only be used, */
|
@@ -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.35, July 15, 2018
|
5
5
|
*
|
6
|
-
* Copyright (c) 1998-2002,2004,2006-
|
6
|
+
* Copyright (c) 1998-2002,2004,2006-2018 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.35, July 15, 2018:
|
16
16
|
* Glenn Randers-Pehrson.
|
17
17
|
* See also "Contributing Authors", below.
|
18
18
|
*/
|
@@ -25,8 +25,8 @@
|
|
25
25
|
*
|
26
26
|
* This code is released under the libpng license.
|
27
27
|
*
|
28
|
-
* libpng versions 1.0.7, July 1, 2000 through 1.6.
|
29
|
-
* Copyright (c) 2000-2002, 2004, 2006-
|
28
|
+
* libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
|
29
|
+
* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
|
30
30
|
* derived from libpng-1.0.6, and are distributed according to the same
|
31
31
|
* disclaimer and license as libpng-1.0.6 with the following individuals
|
32
32
|
* added to the list of Contributing Authors:
|
@@ -213,7 +213,7 @@
|
|
213
213
|
* ...
|
214
214
|
* 1.5.30 15 10527 15.so.15.30[.0]
|
215
215
|
* ...
|
216
|
-
* 1.6.
|
216
|
+
* 1.6.35 16 10635 16.so.16.35[.0]
|
217
217
|
*
|
218
218
|
* Henceforth the source version will match the shared-library major
|
219
219
|
* and minor numbers; the shared-library major version number will be
|
@@ -241,13 +241,13 @@
|
|
241
241
|
* Y2K compliance in libpng:
|
242
242
|
* =========================
|
243
243
|
*
|
244
|
-
*
|
244
|
+
* July 15, 2018
|
245
245
|
*
|
246
246
|
* Since the PNG Development group is an ad-hoc body, we can't make
|
247
247
|
* an official declaration.
|
248
248
|
*
|
249
249
|
* This is your unofficial assurance that libpng from version 0.71 and
|
250
|
-
* upward through 1.6.
|
250
|
+
* upward through 1.6.35 are Y2K compliant. It is my belief that
|
251
251
|
* earlier versions were also Y2K compliant.
|
252
252
|
*
|
253
253
|
* Libpng only has two year fields. One is a 2-byte unsigned integer
|
@@ -309,8 +309,8 @@
|
|
309
309
|
*/
|
310
310
|
|
311
311
|
/* Version information for png.h - this should match the version in png.c */
|
312
|
-
#define PNG_LIBPNG_VER_STRING "1.6.
|
313
|
-
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.
|
312
|
+
#define PNG_LIBPNG_VER_STRING "1.6.35"
|
313
|
+
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.35 - July 15, 2018\n"
|
314
314
|
|
315
315
|
#define PNG_LIBPNG_VER_SONUM 16
|
316
316
|
#define PNG_LIBPNG_VER_DLLNUM 16
|
@@ -318,13 +318,13 @@
|
|
318
318
|
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
|
319
319
|
#define PNG_LIBPNG_VER_MAJOR 1
|
320
320
|
#define PNG_LIBPNG_VER_MINOR 6
|
321
|
-
#define PNG_LIBPNG_VER_RELEASE
|
321
|
+
#define PNG_LIBPNG_VER_RELEASE 35
|
322
322
|
|
323
323
|
/* This should match the numeric part of the final component of
|
324
324
|
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
|
325
325
|
*/
|
326
326
|
|
327
|
-
#define PNG_LIBPNG_VER_BUILD
|
327
|
+
#define PNG_LIBPNG_VER_BUILD 02
|
328
328
|
|
329
329
|
/* Release Status */
|
330
330
|
#define PNG_LIBPNG_BUILD_ALPHA 1
|
@@ -341,7 +341,7 @@
|
|
341
341
|
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
|
342
342
|
PNG_LIBPNG_BUILD_PRIVATE */
|
343
343
|
|
344
|
-
#define PNG_LIBPNG_BUILD_BASE_TYPE
|
344
|
+
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
|
345
345
|
|
346
346
|
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
|
347
347
|
* We must not include leading zeros.
|
@@ -349,7 +349,7 @@
|
|
349
349
|
* version 1.0.0 was mis-numbered 100 instead of 10000). From
|
350
350
|
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
|
351
351
|
*/
|
352
|
-
#define PNG_LIBPNG_VER
|
352
|
+
#define PNG_LIBPNG_VER 10635 /* 1.6.35 */
|
353
353
|
|
354
354
|
/* Library configuration: these options cannot be changed after
|
355
355
|
* the library has been built.
|
@@ -459,7 +459,7 @@ extern "C" {
|
|
459
459
|
/* This triggers a compiler error in png.c, if png.c and png.h
|
460
460
|
* do not agree upon the version number.
|
461
461
|
*/
|
462
|
-
typedef char*
|
462
|
+
typedef char* png_libpng_version_1_6_35;
|
463
463
|
|
464
464
|
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
|
465
465
|
*
|
@@ -600,8 +600,8 @@ typedef struct png_text_struct
|
|
600
600
|
png_charp key; /* keyword, 1-79 character description of "text" */
|
601
601
|
png_charp text; /* comment, may be an empty string (ie "")
|
602
602
|
or a NULL pointer */
|
603
|
-
|
604
|
-
|
603
|
+
size_t text_length; /* length of the text string */
|
604
|
+
size_t itxt_length; /* length of the itxt string */
|
605
605
|
png_charp lang; /* language code, 0-79 characters
|
606
606
|
or a NULL pointer */
|
607
607
|
png_charp lang_key; /* keyword translated UTF-8 string, 0 or more
|
@@ -654,7 +654,7 @@ typedef struct png_unknown_chunk_t
|
|
654
654
|
{
|
655
655
|
png_byte name[5]; /* Textual chunk name with '\0' terminator */
|
656
656
|
png_byte *data; /* Data, should not be modified on read! */
|
657
|
-
|
657
|
+
size_t size;
|
658
658
|
|
659
659
|
/* On write 'location' must be set using the flag values listed below.
|
660
660
|
* Notice that on read it is set by libpng however the values stored have
|
@@ -679,7 +679,7 @@ typedef png_unknown_chunk * * png_unknown_chunkpp;
|
|
679
679
|
/* Maximum positive integer used in PNG is (2^31)-1 */
|
680
680
|
#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
|
681
681
|
#define PNG_UINT_32_MAX ((png_uint_32)(-1))
|
682
|
-
#define PNG_SIZE_MAX ((
|
682
|
+
#define PNG_SIZE_MAX ((size_t)(-1))
|
683
683
|
|
684
684
|
/* These are constants for fixed point values encoded in the
|
685
685
|
* PNG specification manner (x100000)
|
@@ -785,7 +785,7 @@ typedef png_unknown_chunk * * png_unknown_chunkpp;
|
|
785
785
|
typedef struct png_row_info_struct
|
786
786
|
{
|
787
787
|
png_uint_32 width; /* width of row */
|
788
|
-
|
788
|
+
size_t rowbytes; /* number of bytes in row */
|
789
789
|
png_byte color_type; /* color type of row */
|
790
790
|
png_byte bit_depth; /* bit depth of row */
|
791
791
|
png_byte channels; /* number of channels (1, 2, 3, or 4) */
|
@@ -804,7 +804,7 @@ typedef png_row_info * * png_row_infopp;
|
|
804
804
|
* expected to return the read data in the buffer.
|
805
805
|
*/
|
806
806
|
typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp));
|
807
|
-
typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep,
|
807
|
+
typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, size_t));
|
808
808
|
typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp));
|
809
809
|
typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32,
|
810
810
|
int));
|
@@ -941,8 +941,8 @@ PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
|
|
941
941
|
* signature, and non-zero otherwise. Having num_to_check == 0 or
|
942
942
|
* start > 7 will always fail (ie return non-zero).
|
943
943
|
*/
|
944
|
-
PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig,
|
945
|
-
|
944
|
+
PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start,
|
945
|
+
size_t num_to_check));
|
946
946
|
|
947
947
|
/* Simple signature checking function. This is the same as calling
|
948
948
|
* png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
|
@@ -961,11 +961,11 @@ PNG_EXPORTA(5, png_structp, png_create_write_struct,
|
|
961
961
|
png_error_ptr warn_fn),
|
962
962
|
PNG_ALLOCATED);
|
963
963
|
|
964
|
-
PNG_EXPORT(6,
|
964
|
+
PNG_EXPORT(6, size_t, png_get_compression_buffer_size,
|
965
965
|
(png_const_structrp png_ptr));
|
966
966
|
|
967
967
|
PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,
|
968
|
-
|
968
|
+
size_t size));
|
969
969
|
|
970
970
|
/* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
|
971
971
|
* match up.
|
@@ -1018,7 +1018,7 @@ PNG_EXPORT(13, void, png_write_sig, (png_structrp png_ptr));
|
|
1018
1018
|
|
1019
1019
|
/* Write a PNG chunk - size, type, (optional) data, CRC. */
|
1020
1020
|
PNG_EXPORT(14, void, png_write_chunk, (png_structrp png_ptr, png_const_bytep
|
1021
|
-
chunk_name, png_const_bytep data,
|
1021
|
+
chunk_name, png_const_bytep data, size_t length));
|
1022
1022
|
|
1023
1023
|
/* Write the start of a PNG chunk - length and chunk name. */
|
1024
1024
|
PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,
|
@@ -1026,7 +1026,7 @@ PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,
|
|
1026
1026
|
|
1027
1027
|
/* Write the data of a PNG chunk started with png_write_chunk_start(). */
|
1028
1028
|
PNG_EXPORT(16, void, png_write_chunk_data, (png_structrp png_ptr,
|
1029
|
-
png_const_bytep data,
|
1029
|
+
png_const_bytep data, size_t length));
|
1030
1030
|
|
1031
1031
|
/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
|
1032
1032
|
PNG_EXPORT(17, void, png_write_chunk_end, (png_structrp png_ptr));
|
@@ -1040,7 +1040,7 @@ PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_const_structrp png_ptr),
|
|
1040
1040
|
* the API will be removed in the future.
|
1041
1041
|
*/
|
1042
1042
|
PNG_EXPORTA(19, void, png_info_init_3, (png_infopp info_ptr,
|
1043
|
-
|
1043
|
+
size_t png_info_struct_size), PNG_DEPRECATED);
|
1044
1044
|
|
1045
1045
|
/* Writes all the PNG information before the image. */
|
1046
1046
|
PNG_EXPORT(20, void, png_write_info_before_PLTE,
|
@@ -1137,7 +1137,7 @@ PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
|
|
1137
1137
|
* corresponding composited pixel, and the color channels are unassociated
|
1138
1138
|
* (not premultiplied). The gamma encoded color channels must be scaled
|
1139
1139
|
* according to the contribution and to do this it is necessary to undo
|
1140
|
-
* the encoding, scale the color values, perform the composition and
|
1140
|
+
* the encoding, scale the color values, perform the composition and re-encode
|
1141
1141
|
* the values. This is the 'PNG' mode.
|
1142
1142
|
*
|
1143
1143
|
* The alternative is to 'associate' the alpha with the color information by
|
@@ -1193,7 +1193,7 @@ PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,
|
|
1193
1193
|
*
|
1194
1194
|
* png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
|
1195
1195
|
* In this case the output is assumed to be something like an sRGB conformant
|
1196
|
-
* display
|
1196
|
+
* display preceded by a power-law lookup table of power 1.45. This is how
|
1197
1197
|
* early Mac systems behaved.
|
1198
1198
|
*
|
1199
1199
|
* png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);
|
@@ -1240,7 +1240,7 @@ PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,
|
|
1240
1240
|
*
|
1241
1241
|
* When the default gamma of PNG files doesn't match the output gamma.
|
1242
1242
|
* If you have PNG files with no gamma information png_set_alpha_mode allows
|
1243
|
-
* you to provide a default gamma, but it also sets the
|
1243
|
+
* you to provide a default gamma, but it also sets the output gamma to the
|
1244
1244
|
* matching value. If you know your PNG files have a gamma that doesn't
|
1245
1245
|
* match the output you can take advantage of the fact that
|
1246
1246
|
* png_set_alpha_mode always sets the output gamma but only sets the PNG
|
@@ -1691,7 +1691,7 @@ PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp));
|
|
1691
1691
|
* chunk will cause an error at this point unless it is to be saved.
|
1692
1692
|
* positive: The chunk was handled, libpng will ignore/discard it.
|
1693
1693
|
*
|
1694
|
-
* See "INTERACTION
|
1694
|
+
* See "INTERACTION WITH USER CHUNK CALLBACKS" below for important notes about
|
1695
1695
|
* how this behavior will change in libpng 1.7
|
1696
1696
|
*/
|
1697
1697
|
PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structrp png_ptr,
|
@@ -1716,7 +1716,7 @@ PNG_EXPORT(91, png_voidp, png_get_progressive_ptr,
|
|
1716
1716
|
|
1717
1717
|
/* Function to be called when data becomes available */
|
1718
1718
|
PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
|
1719
|
-
png_inforp info_ptr, png_bytep buffer,
|
1719
|
+
png_inforp info_ptr, png_bytep buffer, size_t buffer_size));
|
1720
1720
|
|
1721
1721
|
/* A function which may be called *only* within png_process_data to stop the
|
1722
1722
|
* processing of any more data. The function returns the number of bytes
|
@@ -1725,7 +1725,7 @@ PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
|
|
1725
1725
|
* 'save' is set to true the routine will first save all the pending data and
|
1726
1726
|
* will always return 0.
|
1727
1727
|
*/
|
1728
|
-
PNG_EXPORT(219,
|
1728
|
+
PNG_EXPORT(219, size_t, png_process_data_pause, (png_structrp, int save));
|
1729
1729
|
|
1730
1730
|
/* A function which may be called *only* outside (after) a call to
|
1731
1731
|
* png_process_data. It returns the number of bytes of data to skip in the
|
@@ -1870,7 +1870,7 @@ PNG_EXPORT(110, png_uint_32, png_get_valid, (png_const_structrp png_ptr,
|
|
1870
1870
|
png_const_inforp info_ptr, png_uint_32 flag));
|
1871
1871
|
|
1872
1872
|
/* Returns number of bytes needed to hold a transformed row. */
|
1873
|
-
PNG_EXPORT(111,
|
1873
|
+
PNG_EXPORT(111, size_t, png_get_rowbytes, (png_const_structrp png_ptr,
|
1874
1874
|
png_const_inforp info_ptr));
|
1875
1875
|
|
1876
1876
|
#ifdef PNG_INFO_IMAGE_SUPPORTED
|
@@ -2239,7 +2239,7 @@ PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
|
|
2239
2239
|
* to specifying "NEVER", however when "AS_DEFAULT" is used for specific chunks
|
2240
2240
|
* it simply resets the behavior to the libpng default.
|
2241
2241
|
*
|
2242
|
-
* INTERACTION
|
2242
|
+
* INTERACTION WITH USER CHUNK CALLBACKS:
|
2243
2243
|
* The per-chunk handling is always used when there is a png_user_chunk_ptr
|
2244
2244
|
* callback and the callback returns 0; the chunk is then always stored *unless*
|
2245
2245
|
* it is critical and the per-chunk setting is other than ALWAYS. Notice that
|
@@ -2658,7 +2658,7 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
|
|
2658
2658
|
* The simplified API hides the details of both libpng and the PNG file format
|
2659
2659
|
* itself. It allows PNG files to be read into a very limited number of
|
2660
2660
|
* in-memory bitmap formats or to be written from the same formats. If these
|
2661
|
-
* formats do not
|
2661
|
+
* formats do not accommodate your needs then you can, and should, use the more
|
2662
2662
|
* sophisticated APIs above - these support a wide variety of in-memory formats
|
2663
2663
|
* and a wide variety of sophisticated transformations to those formats as well
|
2664
2664
|
* as a wide variety of APIs to manipulate ancillary information.
|
@@ -3020,7 +3020,7 @@ PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
|
|
3020
3020
|
#endif /* STDIO */
|
3021
3021
|
|
3022
3022
|
PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
|
3023
|
-
png_const_voidp memory,
|
3023
|
+
png_const_voidp memory, size_t size));
|
3024
3024
|
/* The PNG header is read from the given memory buffer. */
|
3025
3025
|
|
3026
3026
|
PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,
|
@@ -3133,7 +3133,7 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
|
|
3133
3133
|
* than or equal to the original value.
|
3134
3134
|
*
|
3135
3135
|
* If the function returns false and *memory_bytes was not changed an error
|
3136
|
-
*
|
3136
|
+
* occurred during write. If *memory_bytes was changed, or is not 0 if
|
3137
3137
|
* 'memory' was NULL, the write would have succeeded but for the memory
|
3138
3138
|
* buffer being too small. *memory_bytes contains the required number of
|
3139
3139
|
* bytes and will be bigger that the original value.
|
@@ -3217,7 +3217,7 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
|
|
3217
3217
|
* option and 'onoff' is 0 (off) or non-0 (on). The value returned is given
|
3218
3218
|
* by the PNG_OPTION_ defines below.
|
3219
3219
|
*
|
3220
|
-
* HARDWARE: normally hardware
|
3220
|
+
* HARDWARE: normally hardware capabilities, such as the Intel SSE instructions,
|
3221
3221
|
* are detected at run time, however sometimes it may be impossible
|
3222
3222
|
* to do this in user mode, in which case it is necessary to discover
|
3223
3223
|
* the capabilities in an OS specific way. Such capabilities are
|