diff --git a/ANNOUNCE b/ANNOUNCE index 60aa5ab21..5463a98b8 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -744,6 +744,7 @@ Version 1.7.0beta55 [March 7, 2015] properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. Stopped a potential memory leak in png_set_unknown_chunks(). Breaks tests/pngunknown-sAPI so it's temporarily marked SKIP. + Spelling fixes ("then", "occured") reported by Lauri Nurmi. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 410c70802..2af835d41 100644 --- a/CHANGES +++ b/CHANGES @@ -5034,6 +5034,7 @@ Version 1.7.0beta55 [March 7, 2015] properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. Stopped a potential memory leak in png_set_unknown_chunks(). Breaks tests/pngunknown-sAPI so it's temporarily marked SKIP. + Spelling fixes ("then", "occured") reported by Lauri Nurmi. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 7eef94d3b..cc3c2c485 100644 --- a/INSTALL +++ b/INSTALL @@ -189,7 +189,7 @@ run "make install". VIII. Configuring libpng for 16-bit platforms You will want to look into zconf.h to tell zlib (and thus libpng) that -it cannot allocate more then 64K at a time. Even if you can, the memory +it cannot allocate more than 64K at a time. Even if you can, the memory won't be accessible. So limit zlib and libpng to 64K by defining MAXSEG_64K. IX. Configuring for DOS diff --git a/libpng-manual.txt b/libpng-manual.txt index e94b96f9b..892c294e5 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.7.0beta55 - March 4, 2015 + libpng version 1.7.0beta55 - March 7, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta55 - March 4, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta55 - March 7, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -337,7 +337,7 @@ prediction. If you are intending to keep the file pointer open for use in libpng, you must ensure you don't read more than 8 bytes from the beginning -of the file, and you also have to make a call to png_set_sig_bytes_read() +of the file, and you also have to make a call to png_set_sig_bytes() with the number of bytes you read from the beginning. Libpng will then only check the bytes (if any) that your program didn't read. @@ -2003,7 +2003,7 @@ value when you call it in this position: png_set_gamma(png_ptr, screen_gamma, 0.45455); If you need to reduce an RGB file to a paletted file, or if a paletted -file has more entries then will fit on your screen, png_set_quantize() +file has more entries than will fit on your screen, png_set_quantize() will do that. Note that this is a simple match quantization that merely finds the closest color available. This should work fairly well with optimized palettes, but fairly badly with linear color cubes. If you @@ -2556,7 +2556,7 @@ png_infop info_ptr; 64K. The library seems to run fine with sizes of 4K. Although you can give it much less if necessary (I assume you can give it chunks of - 1 byte, I haven't tried less then 256 bytes + 1 byte, I haven't tried less than 256 bytes yet). When this function returns, you may want to display any rows that were generated in the row callback if you don't already do @@ -5332,7 +5332,7 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -March 4, 2015 +March 7, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index 4e8d512ca..3e80ff8e4 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 4, 2015" +.TH LIBPNG 3 "March 7, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta55 .SH SYNOPSIS @@ -494,7 +494,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.7.0beta55 - March 4, 2015 + libpng version 1.7.0beta55 - March 7, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta55 - March 4, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta55 - March 7, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -831,7 +831,7 @@ prediction. If you are intending to keep the file pointer open for use in libpng, you must ensure you don't read more than 8 bytes from the beginning -of the file, and you also have to make a call to png_set_sig_bytes_read() +of the file, and you also have to make a call to png_set_sig_bytes() with the number of bytes you read from the beginning. Libpng will then only check the bytes (if any) that your program didn't read. @@ -2497,7 +2497,7 @@ value when you call it in this position: png_set_gamma(png_ptr, screen_gamma, 0.45455); If you need to reduce an RGB file to a paletted file, or if a paletted -file has more entries then will fit on your screen, png_set_quantize() +file has more entries than will fit on your screen, png_set_quantize() will do that. Note that this is a simple match quantization that merely finds the closest color available. This should work fairly well with optimized palettes, but fairly badly with linear color cubes. If you @@ -3050,7 +3050,7 @@ png_infop info_ptr; 64K. The library seems to run fine with sizes of 4K. Although you can give it much less if necessary (I assume you can give it chunks of - 1 byte, I haven't tried less then 256 bytes + 1 byte, I haven't tried less than 256 bytes yet). When this function returns, you may want to display any rows that were generated in the row callback if you don't already do @@ -5826,7 +5826,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -March 4, 2015 +March 7, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6037,7 +6037,54 @@ the first widely used release: 1.5.7beta01-05 15 10507 15.so.15.7[.0] 1.5.7rc01-03 15 10507 15.so.15.7[.0] 1.5.7 15 10507 15.so.15.7[.0] - 1.6.0beta01-37 16 10600 16.so.16.0[.0] + 1.6.0beta01-40 16 10600 16.so.16.0[.0] + 1.6.0rc01-08 16 10600 16.so.16.0[.0] + 1.6.0 16 10600 16.so.16.0[.0] + 1.6.1beta01-09 16 10601 16.so.16.1[.0] + 1.6.1rc01 16 10601 16.so.16.1[.0] + 1.6.1 16 10601 16.so.16.1[.0] + 1.6.2beta01 16 10602 16.so.16.2[.0] + 1.6.2rc01-06 16 10602 16.so.16.2[.0] + 1.6.2 16 10602 16.so.16.2[.0] + 1.6.3beta01-11 16 10603 16.so.16.3[.0] + 1.6.3rc01 16 10603 16.so.16.3[.0] + 1.6.3 16 10603 16.so.16.3[.0] + 1.6.4beta01-02 16 10604 16.so.16.4[.0] + 1.6.4rc01 16 10604 16.so.16.4[.0] + 1.6.4 16 10604 16.so.16.4[.0] + 1.6.5 16 10605 16.so.16.5[.0] + 1.6.6 16 10606 16.so.16.6[.0] + 1.6.7beta01-04 16 10607 16.so.16.7[.0] + 1.6.7rc01-03 16 10607 16.so.16.7[.0] + 1.6.7 16 10607 16.so.16.7[.0] + 1.6.8beta01-02 16 10608 16.so.16.8[.0] + 1.6.8rc01-02 16 10608 16.so.16.8[.0] + 1.6.8 16 10608 16.so.16.8[.0] + 1.6.9beta01-04 16 10609 16.so.16.9[.0] + 1.6.9rc01-02 16 10609 16.so.16.9[.0] + 1.6.9 16 10609 16.so.16.9[.0] + 1.6.10beta01-03 16 10610 16.so.16.10[.0] + 1.6.10rc01-03 16 10610 16.so.16.10[.0] + 1.6.10 16 10610 16.so.16.10[.0] + 1.6.11beta01-06 16 10611 16.so.16.11[.0] + 1.6.11rc01-02 16 10611 16.so.16.11[.0] + 1.6.11 16 10611 16.so.16.11[.0] + 1.6.12rc01-03 16 10612 16.so.16.12[.0] + 1.6.12 16 10612 16.so.16.12[.0] + 1.6.13beta01-04 16 10613 16.so.16.13[.0] + 1.6.13rc01-02 16 10613 16.so.16.13[.0] + 1.6.13 16 10613 16.so.16.13[.0] + 1.6.14beta01-07 16 10614 16.so.16.14[.0] + 1.6.14rc01-02 16 10614 16.so.16.14[.0] + 1.6.14 16 10614 16.so.16.14[.0] + 1.6.15beta01-08 16 10615 16.so.16.15[.0] + 1.6.15rc01-03 16 10615 16.so.16.15[.0] + 1.6.15 16 10615 16.so.16.15[.0] + 1.6.16beta01-03 16 10616 16.so.16.16[.0] + 1.6.16rc01-02 16 10616 16.so.16.16[.0] + 1.6.16 16 10616 16.so.16.16[.0] + 1.6.17beta01-06 16 10617 16.so.16.17[.0] + 1.6.17rc01 16 10617 16.so.16.17[.0] 1.7.0alpha01-10 17 10700 17.so.17.0[.0] 1.7.0beta01-55 17 10700 17.so.17.0[.0] @@ -6096,7 +6143,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta55 - March 4, 2015: +Libpng version 1.7.0beta55 - March 7, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6119,7 +6166,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta55, March 4, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta55, March 7, 2015, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -6218,7 +6265,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 4, 2015 +March 7, 2015 .\" end of man page diff --git a/png.c b/png.c index 2a834aa64..ef01f078e 100644 --- a/png.c +++ b/png.c @@ -694,13 +694,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta55 - March 4, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta55 - March 7, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.7.0beta55 - March 4, 2015\ + return "libpng version 1.7.0beta55 - March 7, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index 2ca6f4e7c..82854e91c 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta55, March 4, 2015 + * libpng version 1.7.0beta55, March 7, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.7.0beta55, March 4, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta55, March 7, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -167,7 +167,54 @@ * 1.5.7beta01-05 15 10507 15.so.15.7[.0] * 1.5.7rc01-03 15 10507 15.so.15.7[.0] * 1.5.7 15 10507 15.so.15.7[.0] - * 1.6.0beta01-37 16 10600 16.so.16.0[.0] + * 1.6.0beta01-40 16 10600 16.so.16.0[.0] + * 1.6.0rc01-08 16 10600 16.so.16.0[.0] + * 1.6.0 16 10600 16.so.16.0[.0] + * 1.6.1beta01-09 16 10601 16.so.16.1[.0] + * 1.6.1rc01 16 10601 16.so.16.1[.0] + * 1.6.1 16 10601 16.so.16.1[.0] + * 1.6.2beta01 16 10602 16.so.16.2[.0] + * 1.6.2rc01-06 16 10602 16.so.16.2[.0] + * 1.6.2 16 10602 16.so.16.2[.0] + * 1.6.3beta01-11 16 10603 16.so.16.3[.0] + * 1.6.3rc01 16 10603 16.so.16.3[.0] + * 1.6.3 16 10603 16.so.16.3[.0] + * 1.6.4beta01-02 16 10604 16.so.16.4[.0] + * 1.6.4rc01 16 10604 16.so.16.4[.0] + * 1.6.4 16 10604 16.so.16.4[.0] + * 1.6.5 16 10605 16.so.16.5[.0] + * 1.6.6 16 10606 16.so.16.6[.0] + * 1.6.7beta01-04 16 10607 16.so.16.7[.0] + * 1.6.7rc01-03 16 10607 16.so.16.7[.0] + * 1.6.7 16 10607 16.so.16.7[.0] + * 1.6.8beta01-02 16 10608 16.so.16.8[.0] + * 1.6.8rc01-02 16 10608 16.so.16.8[.0] + * 1.6.8 16 10608 16.so.16.8[.0] + * 1.6.9beta01-04 16 10609 16.so.16.9[.0] + * 1.6.9rc01-02 16 10609 16.so.16.9[.0] + * 1.6.9 16 10609 16.so.16.9[.0] + * 1.6.10beta01-03 16 10610 16.so.16.10[.0] + * 1.6.10rc01-03 16 10610 16.so.16.10[.0] + * 1.6.10 16 10610 16.so.16.10[.0] + * 1.6.11beta01-06 16 10611 16.so.16.11[.0] + * 1.6.11rc01-02 16 10611 16.so.16.11[.0] + * 1.6.11 16 10611 16.so.16.11[.0] + * 1.6.12rc01-03 16 10612 16.so.16.12[.0] + * 1.6.12 16 10612 16.so.16.12[.0] + * 1.6.13beta01-04 16 10613 16.so.16.13[.0] + * 1.6.13rc01-02 16 10613 16.so.16.13[.0] + * 1.6.13 16 10613 16.so.16.13[.0] + * 1.6.14beta01-07 16 10614 16.so.16.14[.0] + * 1.6.14rc01-02 16 10614 16.so.16.14[.0] + * 1.6.14 16 10614 16.so.16.14[.0] + * 1.6.15beta01-08 16 10615 16.so.16.15[.0] + * 1.6.15rc01-03 16 10615 16.so.16.15[.0] + * 1.6.15 16 10615 16.so.16.15[.0] + * 1.6.16beta01-03 16 10616 16.so.16.16[.0] + * 1.6.16rc01-02 16 10616 16.so.16.16[.0] + * 1.6.16 16 10616 16.so.16.16[.0] + * 1.6.17beta01-06 16 10617 16.so.16.17[.0] + * 1.6.17rc01 16 10617 16.so.16.17[.0] * 1.7.0alpha01-10 17 10700 17.so.17.0[.0] * 1.7.0beta01-55 17 10700 17.so.17.0[.0] * @@ -201,7 +248,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta55, March 4, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta55, March 7, 2015, are * Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -313,7 +360,7 @@ * Y2K compliance in libpng: * ========================= * - * March 4, 2015 + * March 7, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -383,7 +430,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta55" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta55 - March 4, 2015\n" + " libpng version 1.7.0beta55 - March 7, 2015\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -1904,7 +1951,7 @@ PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp)); * * The integer return from the callback function is interpreted thus: * - * negative: An error occured, png_chunk_error will be called. + * negative: An error occurred; png_chunk_error will be called. * zero: The chunk was not handled, the default unknown handling is used * (even if this was a chunk that would otherwise be known.) * NOTE: prior to libpng 1.7 handling values of diff --git a/pngconf.h b/pngconf.h index 4823904fe..be4f56e7d 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta55, March 4, 2015 + * libpng version 1.7.0beta55, March 7, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngmem.c b/pngmem.c index 375386dad..529f93fbf 100644 --- a/pngmem.c +++ b/pngmem.c @@ -41,7 +41,7 @@ png_destroy_png_struct(png_structrp png_ptr) } /* Allocate memory. For reasonable files, size should never exceed - * 64K. However, zlib may allocate more then 64K if you don't tell + * 64K. However, zlib may allocate more than 64K if you don't tell * it not to. See zconf.h and png.h for more information. zlib does * need to allocate exactly 64K, so whatever you call here must * have the ability to do that. diff --git a/pngrio.c b/pngrio.c index 7c7afcde5..f30c768e5 100644 --- a/pngrio.c +++ b/pngrio.c @@ -26,7 +26,7 @@ * reads from a file pointer. Note that this routine sometimes gets called * with very small lengths, so you should implement some kind of simple * buffering if you are using unbuffered reads. This should never be asked - * to read more then 64K on a 16 bit machine. + * to read more than 64K on a 16 bit machine. */ void /* PRIVATE */ png_read_data(png_structrp png_ptr, png_bytep data, png_size_t length) diff --git a/pngrutil.c b/pngrutil.c index 03d933118..39dc81309 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -2793,7 +2793,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, &png_ptr->unknown_chunk); /* ret is: - * negative: An error occured, png_chunk_error will be called. + * negative: An error occurred; png_chunk_error will be called. * zero: The chunk was not handled, the chunk will be discarded * unless png_set_keep_unknown_chunks has been used to set * a 'keep' behavior for this particular chunk, in which diff --git a/scripts/README.txt b/scripts/README.txt index b569751c4..5a7174f0f 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.7.0beta55 - March 4, 2015 +Makefiles for libpng version 1.7.0beta55 - March 7, 2015 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile diff --git a/scripts/dfn.awk b/scripts/dfn.awk index 675829d47..346b9db7d 100755 --- a/scripts/dfn.awk +++ b/scripts/dfn.awk @@ -17,7 +17,7 @@ BEGIN{ out="/dev/null" # as a flag out_count=0 # count of output lines - err=0 # set if an error occured + err=0 # set if an error occurred sort=0 # sort the output array[""]="" } diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 08611ecdb..384cdc87f 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -2,7 +2,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.7.0beta55 - March 6, 2015 */ +/* Libpng version 1.7.0beta55 - March 7, 2015 */ /* Copyright (c) 1998-2014 Glenn Randers-Pehrson */