From 7869e676afd9c20781908e5b6f1f96b41ac1d5ba Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 12 Jul 2010 06:35:08 -0500 Subject: [PATCH] [master] Imported from libpng-1.4.4beta01.tar --- ANNOUNCE | 2 +- CHANGES | 2 +- INSTALL | 2 +- LICENSE | 4 +- README | 2 +- libpng-1.4.4beta01.txt | 6 +- libpng.3 | 14 +-- libpngpf.3 | 2 +- new_push_process_row.c | 204 ------------------------------------ png.5 | 2 +- png.c | 4 +- pngconf.h | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 15 files changed, 24 insertions(+), 228 deletions(-) delete mode 100644 new_push_process_row.c diff --git a/ANNOUNCE b/ANNOUNCE index 7ba1ed7ed..ce0410afe 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -33,7 +33,7 @@ version 1.4.4beta01 [July 12, 2010] Fixed some indentation in pngpread.c and pngrutil.c Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans) Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {') - Put #ifndef PNG_EXTERN, #endif around the define PNG_EXTERN in pngpriv.h + Put "#ifndef PNG_EXTERN, #endif" around "#define PNG_EXTERN" in pngpriv.h Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 678d370ab..085b01ac3 100644 --- a/CHANGES +++ b/CHANGES @@ -2617,7 +2617,7 @@ version 1.4.4beta01 [July 12, 2010] Fixed some indentation in pngpread.c and pngrutil.c Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans) Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {') - Put #ifndef PNG_EXTERN, #endif around the define PNG_EXTERN in pngpriv.h + Put "#ifndef PNG_EXTERN, #endif" around "#define PNG_EXTERN" in pngpriv.h Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 30124328e..27da7404c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.4beta01 - June 26, 2010 +Installing libpng version 1.4.4beta01 - July 12, 2010 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 5ccaa95b4..bb41cc3c9 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.4beta01, June 26, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.4beta01, July 12, 2010, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 26, 2010 +July 12, 2010 diff --git a/README b/README index 1b8cf3ddd..a2876ddae 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.4beta01 - July 1, 2010 (shared library 14.0) +README for libpng version 1.4.4beta01 - July 12, 2010 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/libpng-1.4.4beta01.txt b/libpng-1.4.4beta01.txt index 591103300..45d4b7136 100644 --- a/libpng-1.4.4beta01.txt +++ b/libpng-1.4.4beta01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.4beta01 - June 26, 2010 + libpng version 1.4.4beta01 - July 12, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.4beta01 - June 26, 2010 + libpng versions 0.97, January 1998, through 1.4.4beta01 - July 12, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3297,7 +3297,7 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -June 26, 2010 +July 12, 2010 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 5f03c8b91..1111d1ff9 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "June 27, 2010" +.TH LIBPNG 3 "July 12, 2010" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.4beta01 .SH SYNOPSIS @@ -785,7 +785,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.4beta01 - June 27, 2010 + libpng version 1.4.4beta01 - July 12, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -796,7 +796,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.4beta01 - June 27, 2010 + libpng versions 0.97, January 1998, through 1.4.4beta01 - July 12, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -4082,7 +4082,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -June 27, 2010 +July 12, 2010 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4328,7 +4328,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.4beta01 - June 27, 2010: +Libpng version 1.4.4beta01 - July 12, 2010: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4351,7 +4351,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.4beta01, June 27, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.4beta01, July 12, 2010, 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 @@ -4450,7 +4450,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 27, 2010 +July 12, 2010 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 15e2523d0..034862880 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "June 27, 2010" +.TH LIBPNGPF 3 "July 12, 2010" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.4beta01 (private functions) diff --git a/new_push_process_row.c b/new_push_process_row.c deleted file mode 100644 index fbd7dcfb9..000000000 --- a/new_push_process_row.c +++ /dev/null @@ -1,204 +0,0 @@ -void /* PRIVATE */ -png_push_process_row(png_structp png_ptr) -{ - png_ptr->row_info.color_type = png_ptr->color_type; - png_ptr->row_info.width = png_ptr->iwidth; - png_ptr->row_info.channels = png_ptr->channels; - png_ptr->row_info.bit_depth = png_ptr->bit_depth; - png_ptr->row_info.pixel_depth = png_ptr->pixel_depth; - - png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth, - png_ptr->row_info.width); - - png_read_filter_row(png_ptr, &(png_ptr->row_info), - png_ptr->row_buf + 1, png_ptr->prev_row + 1, - (int)(png_ptr->row_buf[0])); - - png_memcpy(png_ptr->prev_row, png_ptr->row_buf, png_ptr->rowbytes + 1); - - if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA)) - png_do_read_transformations(png_ptr); - -#ifdef PNG_READ_INTERLACING_SUPPORTED - /* Blow up interlaced rows to full size */ - if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE)) - { - if (png_ptr->pass < 6) -/* old interface (pre-1.0.9): - png_do_read_interlace(&(png_ptr->row_info), - png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations); - */ - png_do_read_interlace(png_ptr); - - switch (png_ptr->pass) - { - case 0: - { - int i; - for (i = 0; i < 8 && png_ptr->pass == 0; i++) - { - png_push_have_row(png_ptr, png_ptr->row_buf + 1); - png_read_push_finish_row(png_ptr); /* Updates png_ptr->pass */ - } - - if (png_ptr->pass == 2) /* Pass 1 might be empty */ - { - for (i = 0; i < 4 && png_ptr->pass == 2; i++) - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - } - - if (png_ptr->pass == 4 && png_ptr->height <= 4) - { - for (i = 0; i < 2 && png_ptr->pass == 4; i++) - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - } - - if (png_ptr->pass == 6 && png_ptr->height <= 4) - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - - break; - } - - case 1: - { - int i; - for (i = 0; i < 8 && png_ptr->pass == 1; i++) - { - png_push_have_row(png_ptr, png_ptr->row_buf + 1); - png_read_push_finish_row(png_ptr); - } - - if (png_ptr->pass == 2) /* Skip top 4 generated rows */ - { - for (i = 0; i < 4 && png_ptr->pass == 2; i++) - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - } - - break; - } - - case 2: - { - int i; - - for (i = 0; i < 4 && png_ptr->pass == 2; i++) - { - png_push_have_row(png_ptr, png_ptr->row_buf + 1); - png_read_push_finish_row(png_ptr); - } - - for (i = 0; i < 4 && png_ptr->pass == 2; i++) - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - - if (png_ptr->pass == 4) /* Pass 3 might be empty */ - { - for (i = 0; i < 2 && png_ptr->pass == 4; i++) - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - } - - break; - } - - case 3: - { - int i; - - for (i = 0; i < 4 && png_ptr->pass == 3; i++) - { - png_push_have_row(png_ptr, png_ptr->row_buf + 1); - png_read_push_finish_row(png_ptr); - } - - if (png_ptr->pass == 4) /* Skip top two generated rows */ - { - for (i = 0; i < 2 && png_ptr->pass == 4; i++) - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - } - - break; - } - - case 4: - { - int i; - - for (i = 0; i < 2 && png_ptr->pass == 4; i++) - { - png_push_have_row(png_ptr, png_ptr->row_buf + 1); - png_read_push_finish_row(png_ptr); - } - - for (i = 0; i < 2 && png_ptr->pass == 4; i++) - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - - if (png_ptr->pass == 6) /* Pass 5 might be empty */ - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - - break; - } - - case 5: - { - int i; - - for (i = 0; i < 2 && png_ptr->pass == 5; i++) - { - png_push_have_row(png_ptr, png_ptr->row_buf + 1); - png_read_push_finish_row(png_ptr); - } - - if (png_ptr->pass == 6) /* Skip top generated row */ - { - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - - break; - } - case 6: - { - png_push_have_row(png_ptr, png_ptr->row_buf + 1); - png_read_push_finish_row(png_ptr); - - if (png_ptr->pass != 6) - break; - - png_push_have_row(png_ptr, NULL); - png_read_push_finish_row(png_ptr); - } - } - } - else -#endif - { - png_push_have_row(png_ptr, png_ptr->row_buf + 1); - png_read_push_finish_row(png_ptr); - } -} diff --git a/png.5 b/png.5 index fed4b1753..2b34c6e08 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 27, 2010" +.TH PNG 5 "July 12, 2010" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 9143dd6c3..1c9ea692e 100644 --- a/png.c +++ b/png.c @@ -551,13 +551,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.4beta01 - June 26, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.4.4beta01 - July 12, 2010" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.4beta01 - June 26, 2010\ + return ((png_charp) "libpng version 1.4.4beta01 - July 12, 2010\ Copyright (c) 1998-2010 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); diff --git a/pngconf.h b/pngconf.h index 47eb9e2a9..0d08ad165 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.4beta01 - June 26, 2010 + * libpng version 1.4.4beta01 - July 12, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 6707a0475..1e7e90cc9 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.4beta01 - June 26, 2010 +libpng version 1.4.4beta01 - July 12, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index b7b1954db..289b72d9d 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@