| OLD | NEW |
| 1 | 1 |
| 2 This copy of the libpng notices is provided for your convenience. In case of | 2 This copy of the libpng notices is provided for your convenience. In case of |
| 3 any discrepancy between this copy and the notices in the file png.h that is | 3 any discrepancy between this copy and the notices in the file png.h that is |
| 4 included in the libpng distribution, the latter shall prevail. | 4 included in the libpng distribution, the latter shall prevail. |
| 5 | 5 |
| 6 COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: | 6 COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: |
| 7 | 7 |
| 8 If you modify libpng you may insert additional notices immediately following | 8 If you modify libpng you may insert additional notices immediately following |
| 9 this sentence. | 9 this sentence. |
| 10 | 10 |
| 11 pngusr.h is distributed under the MPL 1.1/GPL 2.0/LGPL 2.1 tri-license. | |
| 12 | |
| 13 This code is released under the libpng license. | 11 This code is released under the libpng license. |
| 14 | 12 |
| 15 libpng versions 1.0.7, July 1, 2000, through 1.2.54, November 12, 2015, are | 13 libpng versions 1.0.7, July 1, 2000, through 1.6.19, November 12, 2015, are |
| 16 Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are | 14 Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are |
| 17 derived from libpng-1.0.6, and are distributed according to the same | 15 derived from libpng-1.0.6, and are distributed according to the same |
| 18 disclaimer and license as libpng-1.0.6 with the following individuals | 16 disclaimer and license as libpng-1.0.6 with the following individuals |
| 19 added to the list of Contributing Authors: | 17 added to the list of Contributing Authors: |
| 20 | 18 |
| 21 Simon-Pierre Cadieux | 19 Simon-Pierre Cadieux |
| 22 Eric S. Raymond | 20 Eric S. Raymond |
| 21 Mans Rullgard |
| 23 Cosmin Truta | 22 Cosmin Truta |
| 24 Gilles Vollant | 23 Gilles Vollant |
| 24 James Yu |
| 25 | 25 |
| 26 and with the following additions to the disclaimer: | 26 and with the following additions to the disclaimer: |
| 27 | 27 |
| 28 There is no warranty against interference with your enjoyment of the | 28 There is no warranty against interference with your enjoyment of the |
| 29 library or against infringement. There is no warranty that our | 29 library or against infringement. There is no warranty that our |
| 30 efforts or the library will fulfill any of your particular purposes | 30 efforts or the library will fulfill any of your particular purposes |
| 31 or needs. This library is provided with all faults, and the entire | 31 or needs. This library is provided with all faults, and the entire |
| 32 risk of satisfactory quality, performance, accuracy, and effort is with | 32 risk of satisfactory quality, performance, accuracy, and effort is with |
| 33 the user. | 33 the user. |
| 34 | 34 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 Also, the PNG logo (in PNG format, of course) is supplied in the | 103 Also, the PNG logo (in PNG format, of course) is supplied in the |
| 104 files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). | 104 files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). |
| 105 | 105 |
| 106 Libpng is OSI Certified Open Source Software. OSI Certified Open Source is | 106 Libpng is OSI Certified Open Source Software. OSI Certified Open Source is |
| 107 a certification mark of the Open Source Initiative. OSI has not addressed | 107 a certification mark of the Open Source Initiative. OSI has not addressed |
| 108 the additional disclaimers inserted at version 1.0.7. | 108 the additional disclaimers inserted at version 1.0.7. |
| 109 | 109 |
| 110 Glenn Randers-Pehrson | 110 Glenn Randers-Pehrson |
| 111 glennrp at users.sourceforge.net | 111 glennrp at users.sourceforge.net |
| 112 November 12, 2015 | 112 November 12, 2015 |
| OLD | NEW |