cairo 1.14.6-x86-mingw32 → 1.15.2-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 (69) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +6 -6
  3. data/ext/cairo/rb_cairo.h +2 -2
  4. data/ext/cairo/rb_cairo_font_options.c +1 -5
  5. data/lib/2.2/cairo.so +0 -0
  6. data/lib/2.3/cairo.so +0 -0
  7. data/test/test_font_options.rb +2 -47
  8. data/vendor/local/bin/fc-cat.exe +0 -0
  9. data/vendor/local/bin/fc-match.exe +0 -0
  10. data/vendor/local/bin/libcairo-2.dll +0 -0
  11. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  12. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  13. data/vendor/local/bin/libfreetype-6.dll +0 -0
  14. data/vendor/local/bin/libpng-config +1 -1
  15. data/vendor/local/bin/libpng16-16.dll +0 -0
  16. data/vendor/local/bin/libpng16-config +1 -1
  17. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  18. data/vendor/local/bin/pngfix.exe +0 -0
  19. data/vendor/local/bin/xmlcatalog.exe +0 -0
  20. data/vendor/local/bin/xmllint.exe +0 -0
  21. data/vendor/local/include/cairo/cairo-version.h +2 -2
  22. data/vendor/local/include/cairo/cairo-win32.h +4 -0
  23. data/vendor/local/include/libpng16/png.h +61 -188
  24. data/vendor/local/include/libpng16/pngconf.h +1 -1
  25. data/vendor/local/include/libpng16/pnglibconf.h +1 -2
  26. data/vendor/local/include/png.h +61 -188
  27. data/vendor/local/include/pngconf.h +1 -1
  28. data/vendor/local/include/pnglibconf.h +1 -2
  29. data/vendor/local/lib/libcairo-gobject.a +0 -0
  30. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  31. data/vendor/local/lib/libcairo-gobject.la +3 -3
  32. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  33. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  34. data/vendor/local/lib/libcairo-script-interpreter.la +3 -3
  35. data/vendor/local/lib/libcairo.a +0 -0
  36. data/vendor/local/lib/libcairo.dll.a +0 -0
  37. data/vendor/local/lib/libcairo.la +3 -3
  38. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  39. data/vendor/local/lib/libfreetype.a +0 -0
  40. data/vendor/local/lib/libfreetype.dll.a +0 -0
  41. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  42. data/vendor/local/lib/libpng.a +0 -0
  43. data/vendor/local/lib/libpng.dll.a +0 -0
  44. data/vendor/local/lib/libpng.la +2 -2
  45. data/vendor/local/lib/libpng16.a +0 -0
  46. data/vendor/local/lib/libpng16.dll.a +0 -0
  47. data/vendor/local/lib/libpng16.la +2 -2
  48. data/vendor/local/lib/libxml2.dll.a +0 -0
  49. data/vendor/local/lib/libz.dll.a +0 -0
  50. data/vendor/local/lib/pkgconfig/cairo-fc.pc +1 -1
  51. data/vendor/local/lib/pkgconfig/cairo-ft.pc +1 -1
  52. data/vendor/local/lib/pkgconfig/cairo-gobject.pc +1 -1
  53. data/vendor/local/lib/pkgconfig/cairo-pdf.pc +1 -1
  54. data/vendor/local/lib/pkgconfig/cairo-png.pc +1 -1
  55. data/vendor/local/lib/pkgconfig/cairo-ps.pc +1 -1
  56. data/vendor/local/lib/pkgconfig/cairo-script.pc +1 -1
  57. data/vendor/local/lib/pkgconfig/cairo-svg.pc +1 -1
  58. data/vendor/local/lib/pkgconfig/cairo-win32-font.pc +1 -1
  59. data/vendor/local/lib/pkgconfig/cairo-win32.pc +1 -1
  60. data/vendor/local/lib/pkgconfig/cairo.pc +1 -1
  61. data/vendor/local/lib/pkgconfig/libpng.pc +1 -1
  62. data/vendor/local/lib/pkgconfig/libpng16.pc +1 -1
  63. data/vendor/local/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html +2 -1
  64. data/vendor/local/share/gtk-doc/html/cairo/index.html +1 -1
  65. data/vendor/local/share/license/libpng/README +1 -1
  66. data/vendor/local/share/man/man3/libpng.3 +21 -66
  67. data/vendor/local/share/man/man3/libpngpf.3 +2 -2
  68. data/vendor/local/share/man/man5/png.5 +2 -2
  69. metadata +2 -2
@@ -1,6 +1,6 @@
1
1
  /* pnglibconf.h - library build configuration */
2
2
 
3
- /* libpng version 1.6.23, June 9, 2016 */
3
+ /* libpng version 1.6.21, January 15, 2016 */
4
4
 
5
5
  /* Copyright (c) 1998-2016 Glenn Randers-Pehrson */
6
6
 
@@ -107,7 +107,6 @@
107
107
  #define PNG_SIMPLIFIED_READ_SUPPORTED
108
108
  #define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
109
109
  #define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
110
- #define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
111
110
  #define PNG_SIMPLIFIED_WRITE_SUPPORTED
112
111
  #define PNG_STDIO_SUPPORTED
113
112
  #define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
Binary file
@@ -23,9 +23,9 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/ho
23
23
  weak_library_names=''
24
24
 
25
25
  # Version information for libcairo-gobject.
26
- current=11402
27
- age=11400
28
- revision=6
26
+ current=11504
27
+ age=11502
28
+ revision=0
29
29
 
30
30
  # Is this an already installed library?
31
31
  installed=yes
@@ -23,9 +23,9 @@ dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib /home/vagrant/rc
23
23
  weak_library_names=''
24
24
 
25
25
  # Version information for libcairo-script-interpreter.
26
- current=11402
27
- age=11400
28
- revision=6
26
+ current=11504
27
+ age=11502
28
+ revision=0
29
29
 
30
30
  # Is this an already installed library?
31
31
  installed=yes
Binary file
Binary file
@@ -23,9 +23,9 @@ dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib -lpthread /home/
23
23
  weak_library_names=''
24
24
 
25
25
  # Version information for libcairo.
26
- current=11402
27
- age=11400
28
- revision=6
26
+ current=11504
27
+ age=11502
28
+ revision=0
29
29
 
30
30
  # Is this an already installed library?
31
31
  installed=yes
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
@@ -23,8 +23,8 @@ dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib -lz'
23
23
  weak_library_names=''
24
24
 
25
25
  # Version information for libpng16.
26
- current=39
27
- age=23
26
+ current=37
27
+ age=21
28
28
  revision=0
29
29
 
30
30
  # Is this an already installed library?
Binary file
Binary file
@@ -23,8 +23,8 @@ dependency_libs=' -L/home/vagrant/rcairo.win32/vendor/local/lib -lz'
23
23
  weak_library_names=''
24
24
 
25
25
  # Version information for libpng16.
26
- current=39
27
- age=23
26
+ current=37
27
+ age=21
28
28
  revision=0
29
29
 
30
30
  # Is this an already installed library?
Binary file
Binary file
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-fc
7
7
  Description: Fontconfig font backend for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo fontconfig >= 2.2.95
11
11
  Libs:
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-ft
7
7
  Description: FreeType font backend for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo freetype2 >= 9.7.3
11
11
  Libs:
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-gobject
7
7
  Description: gobject functions for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo gobject-2.0 glib-2.0 >= 2.14
11
11
  Libs: -L${libdir} -lcairo-gobject
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-pdf
7
7
  Description: PDF surface backend for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo
11
11
  Libs: -lz
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-png
7
7
  Description: PNG functions for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo libpng
11
11
  Libs:
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-ps
7
7
  Description: PostScript surface backend for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo
11
11
  Libs: -lz
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-script
7
7
  Description: script surface backend for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo
11
11
  Libs:
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-svg
7
7
  Description: SVG surface backend for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo
11
11
  Libs:
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-win32-font
7
7
  Description: Microsoft Windows font backend for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo
11
11
  Libs:
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo-win32
7
7
  Description: Microsoft Windows surface backend for cairo graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires: cairo
11
11
  Libs:
@@ -5,7 +5,7 @@ includedir=${prefix}/include
5
5
 
6
6
  Name: cairo
7
7
  Description: Multi-platform 2D graphics library
8
- Version: 1.14.6
8
+ Version: 1.15.2
9
9
 
10
10
  Requires.private: gobject-2.0 glib-2.0 >= 2.14 pixman-1 >= 0.30.0 fontconfig >= 2.2.95 freetype2 >= 9.7.3 libpng
11
11
  Libs: -L${libdir} -lcairo
@@ -5,7 +5,7 @@ includedir=${prefix}/include/libpng16
5
5
 
6
6
  Name: libpng
7
7
  Description: Loads and saves PNG files
8
- Version: 1.6.23
8
+ Version: 1.6.21
9
9
  Libs: -L${libdir} -lpng16
10
10
  Libs.private: -lz
11
11
  Cflags: -I${includedir}
@@ -5,7 +5,7 @@ includedir=${prefix}/include/libpng16
5
5
 
6
6
  Name: libpng
7
7
  Description: Loads and saves PNG files
8
- Version: 1.6.23
8
+ Version: 1.6.21
9
9
  Libs: -L${libdir} -lpng16
10
10
  Libs.private: -lz
11
11
  Cflags: -I${includedir}
@@ -130,6 +130,7 @@ queried for its initial clip extents, and this will be used as the
130
130
  size of the cairo surface. The resulting surface will always be of
131
131
  format <a class="link" href="cairo-Image-Surfaces.html#CAIRO-FORMAT-RGB24:CAPS"><code class="literal">CAIRO_FORMAT_RGB24</code></a>; should you need another surface format,
132
132
  you will need to create one through
133
+ <code class="function">cairo_win32_surface_create_with_format()</code> or
133
134
  <a class="link" href="cairo-Win32-Surfaces.html#cairo-win32-surface-create-with-dib" title="cairo_win32_surface_create_with_dib ()"><code class="function">cairo_win32_surface_create_with_dib()</code></a>.</p>
134
135
  <div class="refsect3">
135
136
  <a name="id-1.5.9.7.2.5"></a><h4>Parameters</h4>
@@ -148,7 +149,7 @@ you will need to create one through
148
149
  </div>
149
150
  <div class="refsect3">
150
151
  <a name="id-1.5.9.7.2.6"></a><h4>Returns</h4>
151
- <p> the newly created surface</p>
152
+ <p> the newly created surface, NULL on failure</p>
152
153
  <p></p>
153
154
  </div>
154
155
  <p class="since">Since 1.0</p>
@@ -14,7 +14,7 @@
14
14
  <div class="titlepage">
15
15
  <div>
16
16
  <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Cairo: A Vector Graphics Library</p></th></tr></table></div>
17
- <div><p class="releaseinfo">for Cairo 1.14.6
17
+ <div><p class="releaseinfo">for Cairo 1.15.2
18
18
  </p></div>
19
19
  </div>
20
20
  <hr>
@@ -1,4 +1,4 @@
1
- README for libpng version 1.6.23 - June 9, 2016 (shared library 16.0)
1
+ README for libpng version 1.6.21 - January 15, 2016 (shared library 16.0)
2
2
  See the note about version numbers near the top of png.h
3
3
 
4
4
  See INSTALL for instructions on how to install libpng.
@@ -1,6 +1,6 @@
1
- .TH LIBPNG 3 "June 9, 2016"
1
+ .TH LIBPNG 3 "January 15, 2016"
2
2
  .SH NAME
3
- libpng \- Portable Network Graphics (PNG) Reference Library 1.6.23
3
+ libpng \- Portable Network Graphics (PNG) Reference Library 1.6.21
4
4
  .SH SYNOPSIS
5
5
  \fB
6
6
  #include <png.h>\fP
@@ -229,8 +229,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.6.23
229
229
 
230
230
  \fBint png_image_write_to_file (png_imagep \fP\fIimage\fP\fB, const char \fP\fI*file\fP\fB, int \fP\fIconvert_to_8bit\fP\fB, const void \fP\fI*buffer\fP\fB, png_int_32 \fP\fIrow_stride\fP\fB, void \fI*colormap\fP\fB);\fP
231
231
 
232
- \fBint png_image_write_to_memory (png_imagep \fP\fIimage\fP\fB, void \fP\fI*memory\fP\fB, png_alloc_size_t * PNG_RESTRICT \fP\fImemory_bytes\fP\fB, int \fP\fIconvert_to_8_bit\fP\fB, const void \fP\fI*buffer\fP\fB, png_int_32 \fP\fIrow_stride\fP\fB, const void \fI*colormap)\fP\fB);\fP
233
-
234
232
  \fBint png_image_write_to_stdio (png_imagep \fP\fIimage\fP\fB, FILE \fP\fI*file\fP\fB, int \fP\fIconvert_to_8_bit\fP\fB, const void \fP\fI*buffer\fP\fB, png_int_32 \fP\fIrow_stride\fP\fB, void \fI*colormap)\fP\fB);\fP
235
233
 
236
234
  \fBvoid png_info_init_3 (png_infopp \fP\fIinfo_ptr\fP\fB, png_size_t \fIpng_info_struct_size\fP\fB);\fP
@@ -510,7 +508,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
510
508
  .SH LIBPNG.TXT
511
509
  libpng-manual.txt - A description on how to use and modify libpng
512
510
 
513
- libpng version 1.6.23 - June 9, 2016
511
+ libpng version 1.6.21 - January 15, 2016
514
512
  Updated and distributed by Glenn Randers-Pehrson
515
513
  <glennrp at users.sourceforge.net>
516
514
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -521,7 +519,7 @@ libpng-manual.txt - A description on how to use and modify libpng
521
519
 
522
520
  Based on:
523
521
 
524
- libpng versions 0.97, January 1998, through 1.6.23 - June 9, 2016
522
+ libpng versions 0.97, January 1998, through 1.6.21 - January 15, 2016
525
523
  Updated and distributed by Glenn Randers-Pehrson
526
524
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
527
525
 
@@ -3352,7 +3350,7 @@ filter types.
3352
3350
  PNG_FILTER_UP | PNG_FILTER_VALUE_UP |
3353
3351
  PNG_FILTER_AVG | PNG_FILTER_VALUE_AVG |
3354
3352
  PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|
3355
- PNG_ALL_FILTERS | PNG_FAST_FILTERS);
3353
+ PNG_ALL_FILTERS);
3356
3354
 
3357
3355
  If an application wants to start and stop using particular filters during
3358
3356
  compression, it should start out with all of the filters (to ensure that
@@ -4613,13 +4611,6 @@ be written:
4613
4611
 
4614
4612
  Write the image to the named file.
4615
4613
 
4616
- int png_image_write_to_memory (png_imagep image, void *memory,
4617
- png_alloc_size_t * PNG_RESTRICT memory_bytes,
4618
- int convert_to_8_bit, const void *buffer, ptrdiff_t row_stride,
4619
- const void *colormap));
4620
-
4621
- Write the image to memory.
4622
-
4623
4614
  int png_image_write_to_stdio(png_imagep image, FILE *file,
4624
4615
  int convert_to_8_bit, const void *buffer,
4625
4616
  png_int_32 row_stride, const void *colormap)
@@ -4897,9 +4888,8 @@ for any images with bit depths less than 8 bits/pixel.
4897
4888
  The 'method' parameter sets the main filtering method, which is
4898
4889
  currently only '0' in the PNG 1.2 specification. The 'filters'
4899
4890
  parameter sets which filter(s), if any, should be used for each
4900
- scanline. Possible values are PNG_ALL_FILTERS, PNG_NO_FILTERS,
4901
- or PNG_FAST_FILTERS to turn filtering on and off, or to turn on
4902
- just the fast-decoding subset of filters, respectively.
4891
+ scanline. Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS
4892
+ to turn filtering on and off, respectively.
4903
4893
 
4904
4894
  Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,
4905
4895
  PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise
@@ -4913,19 +4903,12 @@ means the first row must always be adaptively filtered, because libpng
4913
4903
  currently does not allocate the filter buffers until png_write_row()
4914
4904
  is called for the first time.)
4915
4905
 
4916
- filters = PNG_NO_FILTERS;
4917
- filters = PNG_ALL_FILTERS;
4918
- filters = PNG_FAST_FILTERS;
4919
-
4920
- or
4921
-
4922
- filters = PNG_FILTER_NONE | PNG_FILTER_SUB |
4906
+ filters = PNG_FILTER_NONE | PNG_FILTER_SUB
4923
4907
  PNG_FILTER_UP | PNG_FILTER_AVG |
4924
- PNG_FILTER_PAETH;
4908
+ PNG_FILTER_PAETH | PNG_ALL_FILTERS;
4925
4909
 
4926
4910
  png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,
4927
4911
  filters);
4928
-
4929
4912
  The second parameter can also be
4930
4913
  PNG_INTRAPIXEL_DIFFERENCING if you are
4931
4914
  writing a PNG to be embedded in a MNG
@@ -5300,8 +5283,7 @@ There are no substantial API changes between the non-deprecated parts of
5300
5283
  the 1.4.5 API and the 1.5.0 API; however, the ability to directly access
5301
5284
  members of the main libpng control structures, png_struct and png_info,
5302
5285
  deprecated in earlier versions of libpng, has been completely removed from
5303
- libpng 1.5, and new private "pngstruct.h", "pnginfo.h", and "pngdebug.h"
5304
- header files were created.
5286
+ libpng 1.5.
5305
5287
 
5306
5288
  We no longer include zlib.h in png.h. The include statement has been moved
5307
5289
  to pngstruct.h, where it is not accessible by applications. Applications that
@@ -5541,7 +5523,6 @@ includes the following:
5541
5523
  png_image_free()
5542
5524
  write functions
5543
5525
  png_image_write_to_file()
5544
- png_image_write_to_memory()
5545
5526
  png_image_write_to_stdio()
5546
5527
 
5547
5528
  Starting with libpng-1.6.0, you can configure libpng to prefix all exported
@@ -5855,7 +5836,7 @@ Since the PNG Development group is an ad-hoc body, we can't make
5855
5836
  an official declaration.
5856
5837
 
5857
5838
  This is your unofficial assurance that libpng from version 0.71 and
5858
- upward through 1.6.23 are Y2K compliant. It is my belief that earlier
5839
+ upward through 1.6.21 are Y2K compliant. It is my belief that earlier
5859
5840
  versions were also Y2K compliant.
5860
5841
 
5861
5842
  Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -5953,11 +5934,11 @@ the first widely used release:
5953
5934
  ...
5954
5935
  1.0.19 10 10019 10.so.0.19[.0]
5955
5936
  ...
5956
- 1.2.56 13 10256 12.so.0.56[.0]
5937
+ 1.2.53 13 10253 12.so.0.53[.0]
5957
5938
  ...
5958
- 1.5.27 15 10527 15.so.15.27[.0]
5939
+ 1.5.23 15 10523 15.so.15.23[.0]
5959
5940
  ...
5960
- 1.6.23 16 10623 16.so.16.23[.0]
5941
+ 1.6.21 16 10621 16.so.16.21[.0]
5961
5942
 
5962
5943
  Henceforth the source version will match the shared-library minor
5963
5944
  and patch numbers; the shared-library major version number will be
@@ -6013,7 +5994,7 @@ possible without all of you.
6013
5994
 
6014
5995
  Thanks to Frank J. T. Wojcik for helping with the documentation.
6015
5996
 
6016
- Libpng version 1.6.23 - June 9, 2016:
5997
+ Libpng version 1.6.21 - January 15, 2016:
6017
5998
  Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
6018
5999
  Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
6019
6000
 
@@ -6038,7 +6019,7 @@ this sentence.
6038
6019
 
6039
6020
  This code is released under the libpng license.
6040
6021
 
6041
- libpng versions 1.0.7, July 1, 2000 through 1.6.23, June 9, 2016 are
6022
+ libpng versions 1.0.7, July 1, 2000, through 1.6.21, January 15, 2016, are
6042
6023
  Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
6043
6024
  derived from libpng-1.0.6, and are distributed according to the same
6044
6025
  disclaimer and license as libpng-1.0.6 with the following individuals
@@ -6060,10 +6041,6 @@ and with the following additions to the disclaimer:
6060
6041
  risk of satisfactory quality, performance, accuracy, and effort is with
6061
6042
  the user.
6062
6043
 
6063
- Some files in the "contrib" directory and some configure-generated
6064
- files that are distributed with libpng have other copyright owners and
6065
- are released under other open source licenses.
6066
-
6067
6044
  libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
6068
6045
  Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
6069
6046
  libpng-0.96, and are distributed according to the same disclaimer and
@@ -6087,9 +6064,6 @@ Contributing Authors:
6087
6064
  Greg Roelofs
6088
6065
  Tom Tanner
6089
6066
 
6090
- Some files in the "scripts" directory have other copyright owners
6091
- but are released under this license.
6092
-
6093
6067
  libpng versions 0.5, May 1995, through 0.88, January 1996, are
6094
6068
  Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
6095
6069
 
@@ -6130,29 +6104,6 @@ appreciated.
6130
6104
 
6131
6105
  END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
6132
6106
 
6133
- TRADEMARK:
6134
-
6135
- The name "libpng" has not been registered by the Copyright owner
6136
- as a trademark in any jurisdiction. However, because libpng has
6137
- been distributed and maintained world-wide, continually since 1995,
6138
- the Copyright owner claims "common-law trademark protection" in any
6139
- jurisdiction where common-law trademark is recognized.
6140
-
6141
- OSI CERTIFICATION:
6142
-
6143
- Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
6144
- a certification mark of the Open Source Initiative. OSI has not addressed
6145
- the additional disclaimers inserted at version 1.0.7.
6146
-
6147
- EXPORT CONTROL:
6148
-
6149
- The Copyright owner believes that the Export Control Classification
6150
- Number (ECCN) for libpng is EAR99, which means not subject to export
6151
- controls or International Traffic in Arms Regulations (ITAR) because
6152
- it is open source, publicly available software, that does not contain
6153
- any encryption software. See the EAR, paragraphs 734.3(b)(3) and
6154
- 734.7(b).
6155
-
6156
6107
  A "png_get_copyright" function is available, for convenient use in "about"
6157
6108
  boxes and the like:
6158
6109
 
@@ -6161,9 +6112,13 @@ boxes and the like:
6161
6112
  Also, the PNG logo (in PNG format, of course) is supplied in the
6162
6113
  files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
6163
6114
 
6115
+ Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
6116
+ a certification mark of the Open Source Initiative. OSI has not addressed
6117
+ the additional disclaimers inserted at version 1.0.7.
6118
+
6164
6119
  Glenn Randers-Pehrson
6165
6120
  glennrp at users.sourceforge.net
6166
- June 9, 2016
6121
+ January 15, 2016
6167
6122
 
6168
6123
  .\" end of man page
6169
6124