[libpng16] Imported from libpng-1.6.30rc02.tar

2025-07-10 18:04:09 +02:00 · 2017-06-25 13:16:21 -05:00
361 changed files with 10590 additions and 65215 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,81 +0,0 @@
-version: 1.6.x-{build}
-
-branches:
-  except:
-    - /libpng[0-1][0-8]/
-    - /v[0-1][.][0-8][.][0-9]+/
-
-image:
-  - Visual Studio 2022
-
-shallow_clone: true
-
-environment:
-  matrix:
-    - TOOLCHAIN: vstudio
-      AUTOMATION: cmake
-      ARCH: x86
-    - TOOLCHAIN: vstudio
-      AUTOMATION: cmake
-      ARCH: x64
-    - TOOLCHAIN: vstudio
-      AUTOMATION: cmake
-      ARCH: arm64
-    - TOOLCHAIN: llvm
-      AUTOMATION: cmake
-      ARCH: x64
-    - TOOLCHAIN: msys2
-      AUTOMATION: cmake
-      ARCH: i686
-    - TOOLCHAIN: msys2
-      AUTOMATION: cmake
-      ARCH: x86_64
-    - TOOLCHAIN: msys2
-      AUTOMATION: configure
-      ARCH: i686
-    - TOOLCHAIN: msys2
-      AUTOMATION: configure
-      ARCH: x86_64
-    - TOOLCHAIN: msys2
-      AUTOMATION: makefiles
-      ARCH: i686
-    - TOOLCHAIN: msys2
-      AUTOMATION: makefiles
-      ARCH: x86_64
-
-install:
-  - 'if "%TOOLCHAIN%"=="vstudio" C:\tools\vcpkg\vcpkg.exe install zlib:%ARCH%-windows'
-  - 'if "%TOOLCHAIN%"=="vstudio" C:\tools\vcpkg\vcpkg.exe integrate install'
-  - 'if "%TOOLCHAIN%"=="llvm" C:\tools\vcpkg\vcpkg.exe install zlib:%ARCH%-windows'
-  - 'if "%TOOLCHAIN%"=="llvm" C:\tools\vcpkg\vcpkg.exe integrate install'
-  - 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="cmake" C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-%ARCH%-cmake mingw-w64-%ARCH%-ninja'
-
-before_build:
-  - 'if "%TOOLCHAIN%"=="vstudio" set CI_CMAKE_GENERATOR=Visual Studio 17 2022'
-  - 'if "%TOOLCHAIN%"=="vstudio" set CI_CMAKE_TOOLCHAIN_FILE=C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake'
-  - 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="x86" set CI_CMAKE_GENERATOR_PLATFORM=Win32'
-  - 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="x64" set CI_CMAKE_GENERATOR_PLATFORM=x64'
-  - 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="arm64" set CI_CMAKE_GENERATOR_PLATFORM=ARM64'
-  - 'if "%TOOLCHAIN%"=="vstudio" if "%ARCH%"=="arm64" set CI_CMAKE_VARS=-DPNG_TESTS=0'
-  - 'if "%TOOLCHAIN%"=="llvm" set CI_CMAKE_GENERATOR=Ninja'
-  - 'if "%TOOLCHAIN%"=="llvm" set CI_CMAKE_TOOLCHAIN_FILE=C:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake'
-  - 'if "%TOOLCHAIN%"=="llvm" set CI_CC=clang'
-  - 'if "%TOOLCHAIN%"=="msys2" set CI_CMAKE_GENERATOR=Ninja'
-  - 'if "%TOOLCHAIN%"=="msys2" set CI_CC=gcc'
-  - 'if "%TOOLCHAIN%"=="msys2" if "%ARCH%"=="i686" set MSYSTEM=MINGW32'
-  - 'if "%TOOLCHAIN%"=="msys2" if "%ARCH%"=="x86_64" set MSYSTEM=MINGW64'
-  - 'set CI_CMAKE_BUILD_FLAGS=-j2'
-  - 'set CI_CTEST_FLAGS=-j2'
-  - 'set CI_MAKE_FLAGS=-j2'
-  - 'set CI_MAKEFILES=scripts/makefile.gcc scripts/makefile.msys scripts/makefile.std'
-
-build_script:
-  - 'if "%TOOLCHAIN%"=="vstudio" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_cmake.sh"'
-  - 'if "%TOOLCHAIN%"=="llvm" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_cmake.sh"'
-  - 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="cmake" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_cmake.sh"'
-  - 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="configure" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_configure.sh"'
-  - 'if "%TOOLCHAIN%"=="msys2" if "%AUTOMATION%"=="makefiles" C:\msys64\usr\bin\bash.exe -l "%APPVEYOR_BUILD_FOLDER%\ci\ci_verify_makefiles.sh"'
-
-cache:
-  - 'C:\tools\vcpkg\installed'
-  - 'C:\msys64\var\cache\pacman'
--- a/.cmake-format.yaml
+++ b/.cmake-format.yaml
@@ -1,94 +0,0 @@
-# https://pypi.org/project/cmakelang
-# https://github.com/cheshirekow/cmake_format
-
-# ----------------------
-# Options for formatting
-# ----------------------
-
-# How wide to allow formatted cmake files
-# TODO: Reflow the CMake files to allow setting the maximum line width to 100.
-line_width: 255
-
-# How many spaces to tab for indent
-tab_size: 2
-
-# If true, lines are indented using tab characters (utf-8 0x09) instead of
-# <tab_size> space characters (utf-8 0x20). In cases where the layout would
-# require a fractional tab character, the behavior of the fractional
-# indentation is governed by <fractional_tab_policy>
-use_tabchars: false
-
-# If <use_tabchars> is True, then the value of this variable indicates how
-# fractional indentions are handled during whitespace replacement. If set to
-# 'use-space', fractional indentation is left as spaces (utf-8 0x20). If set
-# to `round-up` fractional indentation is replaced with a single tab character
-# (utf-8 0x09) effectively shifting the column to the next tabstop
-fractional_tab_policy: "use-space"
-
-# Enable comment markup parsing and reflow
-enable_markup: false
-
-# -------------------
-# Options for linting
-# -------------------
-
-# Lint codes to disable
-disabled_codes: [
-  # TODO:
-  # Reconcile the CMake variable names with the patterns below, then
-  # re-enable the "invalid variable name XXX" messages.
-  "C0103",
-
-  # A custom command with one output doesn't really need a comment because
-  # the default "generating XXX" is a good message already.
-  "C0113",
-]
-
-# Regular expression pattern describing valid function names
-function_pattern: "[0-9a-z_]+"
-
-# Regular expression pattern describing valid macro names
-macro_pattern: "[0-9A-Z_]+"
-
-# Regular expression pattern describing valid names for variables with global
-# (cache) scope
-global_var_pattern: "[A-Z][0-9A-Z_]+"
-
-# Regular expression pattern describing valid names for variables with global
-# scope (but internal semantic)
-internal_var_pattern: "_[A-Z][0-9A-Z_]+"
-
-# Regular expression pattern describing valid names for variables with local
-# scope
-local_var_pattern: "[a-z][a-z0-9_]+"
-
-# Regular expression pattern describing valid names for privatedirectory
-# variables
-private_var_pattern: "_[0-9a-z_]+"
-
-# Regular expression pattern describing valid names for public directory
-# variables
-public_var_pattern: "[A-Z][0-9A-Z_]+"
-
-# Regular expression pattern describing valid names for function/macro
-# arguments and loop variables.
-argument_var_pattern: "[a-z][a-z0-9_]+"
-
-# Regular expression pattern describing valid names for keywords used in
-# functions or macros
-keyword_pattern: "[A-Z][0-9A-Z_]+"
-
-# In the heuristic for C0201, how many conditionals to match within a loop in
-# before considering the loop a parser
-max_conditionals_custom_parser: 2
-
-# Require at least this many newlines between statements
-min_statement_spacing: 1
-
-# Require no more than this many newlines between statements
-max_statement_spacing: 2
-max_returns: 6
-max_branches: 12
-max_arguments: 5
-max_localvars: 15
-max_statements: 50
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,55 +0,0 @@
-# https://editorconfig.org
-
-root = true
-
-[*]
-charset = utf-8
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.txt]
-indent_size = unset
-indent_style = space
-
-[*.[chS]]
-indent_size = 3
-indent_style = space
-max_doc_length = 80
-max_line_length = 80
-
-[*.dfa]
-indent_size = 3
-indent_style = space
-max_doc_length = 80
-max_line_length = 80
-
-[*.awk]
-indent_size = 3
-indent_style = space
-max_doc_length = 80
-max_line_length = 100
-
-[*.cmake]
-indent_size = 2
-indent_style = space
-max_doc_length = 80
-max_line_length = 100
-
-[*.sh]
-indent_size = 4
-indent_style = space
-max_doc_length = 100
-max_line_length = 100
-
-[{Makefile.in,ltmain.sh}]
-indent_size = unset
-indent_style = unset
-insert_final_newline = unset
-max_doc_length = unset
-max_line_length = unset
-trim_trailing_whitespace = unset
-
-[COMMIT_EDITMSG]
-indent_style = space
-max_doc_length = unset
-max_line_length = 72
--- a/.editorconfig-checker.json
+++ b/.editorconfig-checker.json
@@ -1,9 +0,0 @@
-{
-  "Disable": {
-    "IndentSize": true
-  },
-  "Exclude": [
-    ".git/",
-    "out/"
-  ]
-}
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,29 +0,0 @@
-name: Linting libpng
-
-on:
-  push:
-    branches:
-      - libpng16
-      - libpng18
-  pull_request:
-    branches:
-      - libpng16
-      - libpng18
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: Set up the cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/pip.txt') }}
-          restore-keys: ${{ runner.os }}-pip-
-      - name: Install yamllint
-        run: pip install yamllint
-      - name: Check out the code
-        uses: actions/checkout@v4
-      - name: Run the linting script
-        run: bash ./ci/ci_lint.sh
--- a/.gitignore
+++ b/.gitignore
@@ -1,155 +0,0 @@
-# Prerequisites
-*.d
-
-# Precompiled headers
-*.gch
-*.pch
-
-# Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Linker output files
-*.exp
-*.ilk
-*.map
-
-# Compiled dynamic libraries
-*.dll
-*.dylib
-*.so
-*.so.*
-
-# Compiled static libraries
-*.a
-*.la
-*.lai
-*.lib
-
-# Compiled executables
-*.app/
-*.exe
-a.out
-
-# Debug files
-*.dSYM/
-*.idb
-*.pdb
-*.su
-
-# Tag files
-TAGS
-.TAGS
-!TAGS/
-tags
-.tags
-!tags/
-gtags.files
-GTAGS
-GRTAGS
-GPATH
-GSYMS
-cscope.files
-cscope.out
-cscope.*.out
-
-# Text editing and text processing artifacts
-\#*\#
-.\#*
-[._]*.sw[a-p]
-[._]sw[a-p]
-*.bak
-*.orig
-*.rej
-*.tmp
-*~
-
-# IDE files and directories
-## Eclipse
-.cproject/
-.project/
-.settings/
-## Embarcadero RAD Studio
-*.cbproj.*
-__recovery/
-## JetBrains
-.idea/
-## NetBeans
-nbbuild/
-nbdist/
-nbproject/
-## Visual Studio
-.vs/
-### Visual Studio user files
-*.rsuser
-*.sln.docstates
-*.suo
-*.user
-*.userprefs
-### Visual Studio cache files (for older versions)
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.VC.db
-*.VC.opendb
-ipch/
-## Visual Studio Code
-.vscode/*
-!.vscode/extensions.json
-!.vscode/launch.json
-!.vscode/settings.json
-!.vscode/tasks.json
-## (Various)
-*.*cache
-*.cache*
-[._]*_history
-.history/
-[Bb]ackup*/
-
-# Build, test and CI output directories
-*[Dd]ebug/
-[Dd]ebug*/
-*[Rr]elease/
-[Rr]elease*/
-[._]build*/
-/[Bb]uild*/
-/[Oo]ut/
-
-# Libpng configuration and auxiliary build artifacts
-*.out
-*out.png
-[._]deps/
-.dirstamp
-/Makefile
-/autom4te.cache/
-/config*~
-/config.h
-/config.log
-/config.status
-/install*~
-/libpng*-config
-/libpng*.pc
-/libpng.vers
-/libtool
-/stamp-h1
-CMake*.json
-!CMakePresets.json
-CMakeLists.txt.*
-pnglibconf.[ch]
-pnglibconf.dfn
-pnglibconf.pre
-pngprefix.h
-
-# Libpng test programs
-png-fix-itxt
-pngcp
-pngfix
-pngimage
-pngstest
-pngtest
-pngunknown
-pngvalid
-timepng
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +0,0 @@
-branches:
-  except:
-    - /libpng[0-1][0-8]/
-    - /v[0-1][.][0-8][.][0-9]+/
-
-language: c
-
-os:
-  - freebsd
-  - linux
-  - osx
-
-env:
-  - AUTOMATION=cmake
-  - AUTOMATION=configure
-  - AUTOMATION=makefiles
-
-before_script:
-  - 'if test "$TRAVIS_OS_NAME" = "linux"; then export CI_CC="gcc"; else export CI_CC="clang"; fi'
-  - 'if test "$TRAVIS_OS_NAME" = "osx"; then export CI_CMAKE_GENERATOR="Xcode"; fi'
-  - 'if test "$TRAVIS_OS_NAME" != "osx"; then export CI_SANITIZERS="address,undefined"; fi'
-  - 'export CI_MAKEFILES="scripts/makefile.$CI_CC scripts/makefile.std"'
-  - 'export CI_MAKE_FLAGS=-j2'
-  - 'export CI_CMAKE_BUILD_FLAGS=-j2'
-  - 'export CI_CTEST_FLAGS=-j2'
-
-script:
-  - './ci/ci_verify_$AUTOMATION.sh'
--- a/.yamllint.yml
+++ b/.yamllint.yml
@@ -1,7 +0,0 @@
-extends: default
-rules:
-  document-start: disable
-  document-end: disable
-  line-length: disable
-  truthy:
-    check-keys: false
--- a/88
+++ b/88
@@ -1,53 +1,65 @@
-libpng 1.6.46.git
-=================
+Libpng 1.6.30rc02 - June 25, 2017

-This is a development version, not intended to be a public release.
-It will be replaced by a public release, or by another development
-version, at a later time.
+This is not intended to be a public release. It will be replaced
+within a few weeks by a public version or by another test version.

+Files available for download:

-libpng 1.6.45 - January 7, 2025
-===============================
+Source files with LF line endings (for Unix/Linux) and with a
+"configure" script

-This is a public release of libpng, intended for use in production code.
+   1.6.30rc02.tar.xz (LZMA-compressed, recommended)
+   1.6.30rc02.tar.gz

+Source files with CRLF line endings (for Windows), without the
+"configure" script

-Files available for download
----------------------------
-
-Source files with LF line endings (for Unix/Linux):
-
- * libpng-1.6.45.tar.xz (LZMA-compressed, recommended)
- * libpng-1.6.45.tar.gz (deflate-compressed)
-
-Source files with CRLF line endings (for Windows):
-
- * lpng1645.7z (LZMA-compressed, recommended)
- * lpng1645.zip (deflate-compressed)
+   lp1630r02.7z  (LZMA-compressed, recommended)
+   lp1630r02.zip

 Other information:

- * README.md
- * LICENSE.md
- * AUTHORS.md
- * TRADEMARK.md
+   1.6.30rc02-README.txt
+   1.6.30rc02-LICENSE.txt
+   libpng-1.6.30rc02-*.asc (armored detached GPG signatures)

+Changes since the last public release (1.6.29):

-Changes from version 1.6.44 to version 1.6.45
---------------------------------------------
+Version 1.6.30beta01 [April 1, 2017]
+  Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in
+    makefile.linux and makefile.solaris-x86 (Cosmin).
+  Revised documentation of png_get_error_ptr() in the libpng manual.
+  Silence clang -Wcomma and const drop warnings (Viktor Szakats).
+  Update Sourceforge URLs in documentation (https instead of http).

- * Added support for the cICP chunk.
-   (Contributed by Lucas Chollet and John Bowler)
- * Adjusted and improved various checks in colorspace calculations.
-   (Contributed by John Bowler)
- * Rearranged the write order of colorspace chunks for better conformance
-   with the PNG v3 draft specification.
-   (Contributed by John Bowler)
- * Raised the minimum required CMake version from 3.6 to 3.14.
- * Forked off a development branch for libpng version 1.8.
+Version 1.6.30beta02 [April 22, 2017]
+  Document need to check for integer overflow when allocating a pixel
+    buffer for multiple rows in contrib/gregbook, contrib/pngminus,
+    example.c, and in the manual (suggested by Jaeseung Choi). This
+    is similar to the bug reported against pngquant in CVE-2016-5735.
+  Removed reference to the obsolete PNG_SAFE_LIMITS macro in the documentation.

+Version 1.6.30beta03 [May 22, 2017]
+  Check for integer overflow in contrib/visupng and contrib/tools/genpng.
+  Do not double evaluate CMAKE_SYSTEM_PROCESSOR in CMakeLists.txt.
+  Test CMAKE_HOST_WIN32 instead of WIN32 in CMakeLists.txt.
+  Fix some URL in documentation.

-Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
-Subscription is required; visit
+Version 1.6.30beta04 [June 7, 2017]
+  Avoid writing an empty IDAT when the last IDAT exactly fills the
+    compression buffer (bug report by Brian Baird). This bug was
+    introduced in libpng-1.6.0.
+
+Version 1.6.30rc01 [June 14, 2017]
+  No changes.
+
+Version 1.6.30 [%DATE]
+  No changes.
+
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+(subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe.
+to subscribe)
+or to glennrp at users.sourceforge.net
+
+Glenn R-P
--- a/62
+++ b/62
@@ -1,62 +0,0 @@
-PNG REFERENCE LIBRARY AUTHORS
-=============================
-
-This is the list of PNG Reference Library ("libpng") Contributing
-Authors, for copyright and licensing purposes.
-
- * Adam Richter
- * Andreas Dilger
- * Chris Blume
- * Cosmin Truta
- * Dave Martindale
- * Eric S. Raymond
- * Gilles Vollant
- * Glenn Randers-Pehrson
- * Greg Roelofs
- * Guy Eric Schalnat
- * James Yu
- * John Bowler
- * Kevin Bracey
- * Lucas Chollet
- * Magnus Holmgren
- * Mandar Sahastrabuddhe
- * Mans Rullgard
- * Matt Sarett
- * Mike Klein
- * Pascal Massimino
- * Paul Schmidt
- * Philippe Antoine
- * Qiang Zhou
- * Sam Bushell
- * Samuel Williams
- * Simon-Pierre Cadieux
- * Tim Wegner
- * Tom Lane
- * Tom Tanner
- * Vadim Barkov
- * Willem van Schaik
- * Zhijie Liang
- * Apple Inc.
-    - Zixu Wang (王子旭)
- * Arm Holdings
-    - Richard Townsend
- * Google Inc.
-    - Dan Field
-    - Leon Scroggins III
-    - Matt Sarett
-    - Mike Klein
-    - Sami Boukortt
-    - Wan-Teh Chang
- * Loongson Technology Corporation Ltd.
-    - GuXiWei (顾希伟)
-    - JinBo (金波)
-    - ZhangLixia (张利霞)
-
-The build projects, the build scripts, the test scripts, and other
-files in the "projects", "scripts" and "tests" directories, have
-other copyright owners, but are released under the libpng license.
-
-Some files in the "ci" and "contrib" directories, as well as some
-of the tools-generated files that are distributed with libpng, have
-other copyright owners, and are released under other open source
-licenses.
--- a/440
+++ b/440
@@ -1,3 +1,4 @@
+#if 0
 CHANGES - changes for libpng

 version 0.1 [March 29, 1995]
@@ -204,7 +205,7 @@ Version 0.97 [January, 1998]
  Added simple sRGB support (Glenn R-P)
  Easier conditional compiling, e.g.,
    define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;
-    all configurable options can be selected from command line instead
+    all configurable options can be selected from command-line instead
    of having to edit pngconf.h (Glenn R-P)
  Fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P)
  Added more conditions for png_do_background, to avoid changing
@@ -832,7 +833,7 @@ Version 1.0.7beta11 [May 7, 2000]
  Removed the new PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT modes
    which are no longer used.
  Eliminated the three new members of png_text when PNG_LEGACY_SUPPORTED is
-    defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXt_SUPPORTED
+    defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXT_SUPPORTED
    is defined.
  Made PNG_NO_READ|WRITE_iTXt the default setting, to avoid memory
    overrun when old applications fill the info_ptr->text structure directly.
@@ -942,7 +943,7 @@ Version 1.0.8 [July 24, 2000]
 Version 1.0.9beta1 [November 10, 2000]
  Fixed typo in scripts/makefile.hpux
  Updated makevms.com in scripts and contrib/* and contrib/* (Martin Zinser)
-  Fixed sequence-point bug in contrib/pngminus/png2pnm (Martin Zinser)
+  Fixed seqence-point bug in contrib/pngminus/png2pnm (Martin Zinser)
  Changed "cdrom.com" in documentation to "libpng.org"
  Revised pnggccrd.c to get it all working, and updated makefile.gcmmx (Greg).
  Changed type of "params" from voidp to png_voidp in png_read|write_png().
@@ -1453,7 +1454,7 @@ Version 1.2.6beta4 [July 28, 2004]
    sequential read support.
  Added some "#if PNG_WRITE_SUPPORTED" blocks.
  Added #ifdef to remove some redundancy in png_malloc_default().
-  Use png_malloc instead of png_zalloc to allocate the palette.
+  Use png_malloc instead of png_zalloc to allocate the pallete.

 Version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]
  Fixed buffer overflow vulnerability (CVE-2004-0597) in png_handle_tRNS().
@@ -2295,7 +2296,7 @@ Version 1.4.0beta58 [May 14, 2009]
  Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri)

 Version 1.4.0beta59 [May 15, 2009]
-  Reformatted sources in libpng style (3-space indentation, comment format)
+  Reformated sources in libpng style (3-space intentation, comment format)
  Fixed typo in libpng docs (PNG_FILTER_AVE should be PNG_FILTER_AVG)
  Added sections about the git repository and our coding style to the
    documentation
@@ -2661,7 +2662,7 @@ Version 1.4.1beta06 [January 28, 2010]

 Version 1.4.1beta07 [February 6, 2010]
  Folded some long lines in the source files.
-  Added definable PNG_USER_CHUNK_CACHE_MAX, PNG_USER_CHUNK_MALLOC_MAX,
+  Added defineable PNG_USER_CHUNK_CACHE_MAX, PNG_USER_CHUNK_MALLOC_MAX,
    and a PNG_USER_LIMITS_SUPPORTED flag.
  Eliminated use of png_ptr->irowbytes and reused the slot in png_ptr as
    png_ptr->png_user_chunk_malloc_max.
@@ -3258,7 +3259,7 @@ Version 1.5.2beta01 [February 13, 2011]
  Revised PNG_EXPORTA macro to not use an empty parameter, to accommodate the
    old VisualC++ preprocessor.
  Turned on interlace handling in png_read_png().
-  Fixed gcc pedantic warnings.
+  Fixed gcc pendantic warnings.
  Handle longjmp in Cygwin.
  Fixed png_get_current_row_number() in the interlaced case.
  Cleaned up ALPHA flags and transformations.
@@ -3358,7 +3359,7 @@ Version 1.5.3beta05 [May 6, 2011]
  Pass "" instead of '\0' to png_default_error() in png_err().  This mistake
    was introduced in libpng-1.2.20beta01.  This fixes CVE-2011-2691.
  Added PNG_WRITE_OPTIMIZE_CMF_SUPPORTED macro to make the zlib "CMF" byte
-    optimization configurable.
+    optimization configureable.
  IDAT compression failed if preceded by a compressed text chunk (bug
    introduced in libpng-1.5.3beta01-02).  This was because the attempt to
    reset the zlib stream in png_write_IDAT happened after the first IDAT
@@ -3642,7 +3643,7 @@ Version 1.5.6beta05 [October 12, 2011]
  Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01.

 Version 1.5.6beta06 [October 17, 2011]
-  Removed two redundant tests for uninitialized row.
+  Removed two redundant tests for unitialized row.
  Fixed a relatively harmless memory overwrite in compressed text writing
    with a 1 byte zlib buffer.
  Add ability to call png_read_update_info multiple times to pngvalid.c.
@@ -3688,7 +3689,7 @@ Version 1.5.7beta01 [November 4, 2011]
    crash.  The pngmem.c implementation of png_malloc() included a cast
    to png_size_t which would fail on large allocations on 16-bit systems.
  Fix for the preprocessor of the Intel C compiler. The preprocessor
-    splits adjacent @ signs with a space; this changes the concatenation
+    splits adjacent @ signs with a space; this changes the concatentation
    token from @-@-@ to PNG_JOIN; that should work with all compiler
    preprocessors.
  Paeth filter speed improvements from work by Siarhei Siamashka. This
@@ -3734,7 +3735,7 @@ Version 1.5.7beta03 [November 17, 2011]
    gray (on palette) itself.
  Fixes for C++ compilation using g++ When libpng source is compiled
    using g++. The compiler imposes C++ rules on the C source; thus it
-    is desirable to make the source work with either C or C++ rules
+    is desireable to make the source work with either C or C++ rules
    without throwing away useful error information.  This change adds
    png_voidcast to allow C semantic (void*) cases or the corresponding
    C++ static_cast operation, as appropriate.
@@ -3886,7 +3887,7 @@ Version 1.6.0beta06 [January 24, 2012]
 Version 1.6.0beta07 [January 28, 2012]
  Eliminated Intel icc/icl compiler warnings. The Intel (GCC derived)
    compiler issues slightly different warnings from those issued by the
-    current versions of GCC. This eliminates those warnings by
+    current vesions of GCC. This eliminates those warnings by
    adding/removing casts and small code rewrites.
  Updated configure.ac from autoupdate: added --enable-werror option.
    Also some layout regularization and removal of introduced tab characters
@@ -3919,7 +3920,7 @@ Version 1.6.0beta08 [February 1, 2012]
    version checking to configure.ac
  Improved pngstest speed by not doing redundant tests and add const to
    the background parameter of png_image_finish_read. The --background
-    option is now done automagically only when required, so that command-line
+    option is now done automagically only when required, so that commandline
    option no longer exists.
  Cleaned up pngpriv.h to consistently declare all functions and data.
    Also eliminated PNG_CONST_DATA, which is apparently not needed but we
@@ -4052,7 +4053,7 @@ Version 1.6.0beta16 [March 6, 2012]
    (in fact this is harmless, but the PNG data produced may be sub-optimal).

 Version 1.6.0beta17 [March 10, 2012]
-  Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition.
+  Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition. 
  Reject all iCCP chunks after the first, even if the first one is invalid.
  Deflate/inflate was reworked to move common zlib calls into single
    functions [rw]util.c.  A new shared keyword check routine was also added
@@ -4060,7 +4061,7 @@ Version 1.6.0beta17 [March 10, 2012]
    possible to call png_inflate() incrementally.  A warning is no longer
    issued if the language tag or translated keyword in the iTXt chunk
    has zero length.
-  If benign errors are disabled use maximum window on ancillary inflate.
+  If benign errors are disabled use maximum window on ancilliary inflate.
    This works round a bug introduced in 1.5.4 where compressed ancillary
    chunks could end up with a too-small windowBits value in the deflate
    header.
@@ -4175,7 +4176,7 @@ Version 1.6.0beta27 [August 11, 2012]
    declared even though the functions are never actually defined.  This
    change provides a dummy definition so that the declarations work, yet any
    implementation will fail to compile because of an incomplete type.
-  Re-eliminated the use of strcpy() in pngtest.c.  An unnecessary use of
+  Re-eliminated the use of strcpy() in pngtest.c.  An unncessary use of
    strcpy() was accidentally re-introduced in libpng16; this change replaces
    it with strncpy().
  Eliminated use of png_sizeof(); use sizeof() instead.
@@ -4308,7 +4309,7 @@ Version 1.6.0beta31 [November 1, 2012]
    resulting in VS2010 having to update the files.
  Removed non-working ICC profile support code that was mostly added to
    libpng-1.6.0beta29 and beta30. There was too much code for too little
-    gain; implementing full ICC color correction may be desirable but is left
+    gain; implementing full ICC color correction may be desireable but is left
    up to applications.

 Version 1.6.0beta32 [November 25, 2012]
@@ -4591,7 +4592,7 @@ Version 1.6.3beta07 [June 8, 2013]
    the optimizations ('check' vs 'api') are exposed in the public header files
    except that the new setting PNG_ARM_NEON_OPT documents how libpng makes the
    decision about whether or not to use the optimizations.
-  Protect symbol prefixing against CC/CPPFLAGS/CFLAGS usage.
+  Protect symbol prefixing against CC/CPPFLAGS/CFLAGS useage.
    Previous iOS/Xcode fixes for the ARM NEON optimizations moved the test
    on __ARM_NEON__ from configure time to compile time.  This breaks symbol
    prefixing because the definition of the special png_init_filter_functions
@@ -4962,7 +4963,7 @@ Version 1.6.13beta01 [July 4, 2014]
  Changed "if defined(__ARM_NEON__)" to
    "if (defined(__ARM_NEON__) || defined(__ARM_NEON))" (James Wu).
  Fixed clang no-warning builds: png_digit was defined but never used.
-
+    
 Version 1.6.13beta02 [July 21, 2014]
  Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32
    (bug report from Wolfgang S. Kechel).  Bug was introduced in libpng-1.6.11.
@@ -5453,7 +5454,7 @@ Version 1.6.21beta01 [December 11, 2015]
 Version 1.6.21beta02 [December 14, 2015]
  Moved png_check_keyword() from pngwutil.c to pngset.c
  Removed LE/BE dependencies in pngvalid, to 'fix' the current problem
-    in the BigEndian tests by not testing it, making the BE code the same
+    in the BigEndian tests by not testing it, making the BE code the same 
    as the LE version.
  Fixes to pngvalid for various reduced build configurations (eliminate unused
    statics) and a fix for the case in rgb_to_gray when the digitize option
@@ -5517,7 +5518,7 @@ Version 1.6.22beta03 [March 9, 2016]
  Added a common-law trademark notice and export control information
    to the LICENSE file, png.h, and the man page.
  Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
-    were accidentally removed from libpng-1.6.17.
+    were accidentally removed from libpng-1.6.17. 
  Changed PNG_INFO_cHNK and PNG_FREE_cHNK from 0xnnnn to 0xnnnnU in png.h
    (Robert C. Seacord).
  Removed dubious "#if INT_MAX" test from png.h that was added to
@@ -5634,7 +5635,7 @@ Version 1.6.24beta02 [June 23, 2016]
    to All and adds a list of the warnings that need to be turned off.  This is
    semi-documentary; the intent is to tell libpng users which warnings have
    been examined and judged non-fixable at present.  The warning about
-    structure padding is fixable, but it would be a significant change (moving
+    structure padding is fixable, but it would be a signficant change (moving
    structure members around).

 Version 1.6.24beta03 [July 4, 2016]
@@ -5780,7 +5781,7 @@ Version 1.6.28rc01 [January 3, 2017]
  Added option to Cmake build allowing a custom location of zlib to be
    specified in a scenario where libpng is being built as a subproject
    alongside zlib by another project (Sam Serrels).
-  Changed png_ptr->options from a png_byte to png_uint_32, to accommodate
+  Changed png_ptr->options from a png_byte to png_uint_32, to accomodate
    up to 16 options.

 Version 1.6.28rc02 [January 4, 2017]
@@ -5847,391 +5848,14 @@ Version 1.6.30beta04 [June 7, 2017]
 Version 1.6.30rc01 [June 14, 2017]
  No changes.

-Version 1.6.30rc02 [June 25, 2017]
+Version 1.6.30rc02 [%DATE]
  Update copyright year in pnglibconf.h, make ltmain.sh executable.
-  Add a reference to the libpng.download site in README.

-Version 1.6.30 [June 28, 2017]
-  No changes.
-
-Version 1.6.31beta01 [July 5, 2017]
-  Guard the definition of _POSIX_SOURCE in pngpriv.h (AIX already defines it;
-    bug report by Michael Felt).
-  Revised pngpriv.h to work around failure to compile arm/filter_neon.S
-    ("typedef" directive is unrecognized by the assembler). The problem
-    was introduced in libpng-1.6.30beta01.
-  Added "Requires: zlib" to libpng.pc.in (Pieter Neerincx).
-  Added special case for FreeBSD in arm/filter_neon.S (Maya Rashish).
-
-Version 1.6.31beta02 [July 8, 2017]
-  Added instructions for disabling hardware optimizations in INSTALL.
-  Added "--enable-hardware-optimizations" configuration flag to enable
-    or disable all hardware optimizations with one flag.
-
-Version 1.6.31beta03 [July 9, 2017]
-  Updated CMakeLists.txt to add INTEL_SSE and MIPS_MSA platforms.
-  Changed "int" to "png_size_t" in intel/filter_sse2.c to prevent
-    possible integer overflow (Bug report by John Bowler).
-  Quieted "declaration after statement" warnings in intel/filter_sse2.c.
-  Added scripts/makefile-linux-opt, which has hardware optimizations enabled.
-
-Version 1.6.31beta04 [July 11, 2017]
-  Removed one of the GCC-7.1.0 'strict-overflow' warnings that result when
-    integers appear on both sides of a compare.  Worked around the others by
-    forcing the strict-overflow setting in the relevant functions to a level
-    where they are not reported (John Bowler).
-  Changed "FALL THROUGH" comments to "FALLTHROUGH" because GCC doesn't like
-    the space.
-  Worked around some C-style casts from (void*) because g++ 5.4.0 objects
-    to them.
-  Increased the buffer size for 'sprint' to pass the gcc 7.1.0 'sprint
-    overflow' check that is on by default with -Wall -Wextra.
-
-Version 1.6.31beta05 [July 13, 2017]
-  Added eXIf chunk support.
-
-Version 1.6.31beta06 [July 17, 2017]
-  Added a minimal eXIf chunk (with Orientation and FocalLengthIn35mmFilm
-    tags) to pngtest.png.
-
-Version 1.6.31beta07 [July 18, 2017]
-  Revised the eXIf chunk in pngtest.png to fix "Bad IFD1 Directory" warning.
-
-Version 1.6.31rc01 [July 19, 2017]
-  No changes.
-
-Version 1.6.31rc02 [July 25, 2017]
-  Fixed typo in example.c (png_free_image should be png_image_free) (Bug
-    report by John Smith)
-
-Version 1.6.31 [July 27, 2017]
-  No changes.
-
-Version 1.6.32beta01 [July 31, 2017]
-  Avoid possible NULL dereference in png_handle_eXIf when benign_errors
-    are allowed. Avoid leaking the input buffer "eXIf_buf".
-  Eliminated png_ptr->num_exif member from pngstruct.h and added num_exif
-    to arguments for png_get_eXIf() and png_set_eXIf().
-  Added calls to png_handle_eXIf(() in pngread.c and png_write_eXIf() in
-    pngwrite.c, and made various other fixes to png_write_eXIf().
-  Changed name of png_get_eXIF and png_set_eXIf() to png_get_eXIf_1() and
-    png_set_eXIf_1(), respectively, to avoid breaking API compatibility
-    with libpng-1.6.31.
-
-Version 1.6.32beta02 [August 1, 2017]
-  Updated contrib/libtests/pngunknown.c with eXIf chunk.
-
-Version 1.6.32beta03 [August 2, 2017]
-  Initialized btoa[] in pngstest.c
-  Stop memory leak when returning from png_handle_eXIf() with an error
-    (Bug report from the OSS-fuzz project).
-
-Version 1.6.32beta04 [August 2, 2017]
-  Replaced local eXIf_buf with info_ptr->eXIf_buf in png_handle_eXIf().
-  Update libpng.3 and libpng-manual.txt about eXIf functions.
-
-Version 1.6.32beta05 [August 2, 2017]
-  Restored png_get_eXIf() and png_set_eXIf() to maintain API compatibility.
-
-Version 1.6.32beta06 [August 2, 2017]
-  Removed png_get_eXIf_1() and png_set_eXIf_1().
-
-Version 1.6.32beta07 [August 3, 2017]
-  Check length of all chunks except IDAT against user limit to fix an
-    OSS-fuzz issue (Fixes CVE-2017-12652).
-
-Version 1.6.32beta08 [August 3, 2017]
-  Check length of IDAT against maximum possible IDAT size, accounting
-    for height, rowbytes, interlacing and zlib/deflate overhead.
-  Restored png_get_eXIf_1() and png_set_eXIf_1(), because strlen(eXIf_buf)
-    does not work (the eXIf chunk data can contain zeroes).
-
-Version 1.6.32beta09 [August 3, 2017]
-  Require cmake-2.8.8 in CMakeLists.txt. Revised symlink creation,
-    no longer using deprecated cmake LOCATION feature (Clifford Yapp).
-  Fixed five-byte error in the calculation of IDAT maximum possible size.
-
-Version 1.6.32beta10 [August 5, 2017]
-  Moved chunk-length check into a png_check_chunk_length() private
-    function (Suggested by Max Stepin).
-  Moved bad pngs from tests to contrib/libtests/crashers
-  Moved testing of bad pngs into a separate tests/pngtest-badpngs script
-  Added the --xfail (expected FAIL) option to pngtest.c. It writes XFAIL
-    in the output but PASS for the libpng test.
-  Require cmake-3.0.2 in CMakeLists.txt (Clifford Yapp).
-  Fix "const" declaration info_ptr argument to png_get_eXIf_1() and the
-    num_exif argument to png_get_eXIf_1() (Github Issue 171).
-
-Version 1.6.32beta11 [August 7, 2017]
-  Added "eXIf" to "chunks_to_ignore[]" in png_set_keep_unknown_chunks().
-  Added huge_IDAT.png and empty_ancillary_chunks.png to testpngs/crashers.
-  Make pngtest --strict, --relax, --xfail options imply -m (multiple).
-  Removed unused chunk_name parameter from png_check_chunk_length().
-  Relocated setting free_me for eXIf data, to stop an OSS-fuzz leak.
-  Initialize profile_header[] in png_handle_iCCP() to fix OSS-fuzz issue.
-  Initialize png_ptr->row_buf[0] to 255 in png_read_row() to fix OSS-fuzz UMR.
-  Attempt to fix a UMR in png_set_text_2() to fix OSS-fuzz issue.
-  Increase minimum zlib stream from 9 to 14 in png_handle_iCCP(), to account
-    for the minimum 'deflate' stream, and relocate the test to a point
-    after the keyword has been read.
-  Check that the eXIf chunk has at least 2 bytes and begins with "II" or "MM".
-
-Version 1.6.32rc01 [August 18, 2017]
-  Added a set of "huge_xxxx_chunk.png" files to contrib/testpngs/crashers,
-    one for each known chunk type, with length = 2GB-1.
-  Check for 0 return from png_get_rowbytes() and added some (size_t) typecasts
-    in contrib/pngminus/*.c to stop some Coverity issues (162705, 162706,
-    and 162707).
-  Renamed chunks in contrib/testpngs/crashers to avoid having files whose
-    names differ only in case; this causes problems with some platforms
-    (github issue #172).
-
-Version 1.6.32rc02 [August 22, 2017]
-  Added contrib/oss-fuzz directory which contains files used by the oss-fuzz
-    project (https://github.com/google/oss-fuzz/tree/master/projects/libpng).
-
-Version 1.6.32 [August 24, 2017]
-  No changes.
-
-Version 1.6.33beta01 [August 28, 2017]
-  Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing
-    parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse).
-  Fixed off-by-one error in png_do_check_palette_indexes() (Bug report
-    by Mick P., Source Forge Issue #269).
-
-Version 1.6.33beta02 [September 3, 2017]
-  Initialize png_handler.row_ptr in contrib/oss-fuzz/libpng_read_fuzzer.cc
-    to fix shortlived oss-fuzz issue 3234.
-  Compute a larger limit on IDAT because some applications write a deflate
-    buffer for each row (Bug report by Andrew Church).
-  Use current date (DATE) instead of release-date (RDATE) in last
-    changed date of contrib/oss-fuzz files.
-  Enabled ARM support in CMakeLists.txt (Bernd Kuhls).
-
-Version 1.6.33beta03 [September 14, 2017]
-  Fixed incorrect typecast of some arguments to png_malloc() and
-    png_calloc() that were png_uint_32 instead of png_alloc_size_t
-    (Bug report by "irwir" in Github libpng issue #175).
-  Use pnglibconf.h.prebuilt when building for ANDROID with cmake (Github
-    issue 162, by rcdailey).
-
-Version 1.6.33rc01 [September 20, 2017]
-  Initialize memory allocated by png_inflate to zero, using memset, to
-    stop an oss-fuzz "use of uninitialized value" detection in png_set_text_2()
-    due to truncated iTXt or zTXt chunk.
-  Initialize memory allocated by png_read_buffer to zero, using memset, to
-    stop an oss-fuzz "use of uninitialized value" detection in
-    png_icc_check_tag_table() due to truncated iCCP chunk.
-  Removed a redundant test (suggested by "irwir" in Github issue #180).
-
-Version 1.6.33rc02 [September 23, 2017]
-  Added an interlaced version of each file in contrib/pngsuite.
-  Relocate new memset() call in pngrutil.c.
-  Removed more redundant tests (suggested by "irwir" in Github issue #180).
-  Add support for loading images with associated alpha in the Simplified
-    API (Samuel Williams).
-
-Version 1.6.33 [September 28, 2017]
-  Revert contrib/oss-fuzz/libpng_read_fuzzer.cc to libpng-1.6.32 state.
-  Initialize png_handler.row_ptr in contrib/oss-fuzz/libpng_read_fuzzer.cc
-  Add end_info structure and png_read_end() to the libpng fuzzer.
-
-Version 1.6.34 [September 29, 2017]
-  Removed contrib/pngsuite/i*.png; some of them caused test failures.
-
-Version 1.6.35beta01 [March 6, 2018]
-  Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
-    failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
-  Added calls to png_set_*() transforms commonly used by browsers to
-    the fuzzer.
-  Removed some unnecessary brackets in pngrtran.c
-  Fixed miscellaneous typos (Patch by github user "luzpaz").
-  Change "ASM C" to "C ASM" in CMakeLists.txt
-  Fixed incorrect handling of bKGD chunk in sub-8-bit files (Cosmin)
-  Added hardware optimization directories to zip and 7z distributions.
-  Fixed incorrect bitmask for options.
-  Fixed many spelling typos.
-
-Version 1.6.35beta02 [March 28, 2018]
-  Make png_get_iCCP consistent with man page (allow compression-type argument
-  to be NULL, bug report by Lenard Szolnoki).
-
-Version 1.6.35 [July 15, 2018]
-  Replaced the remaining uses of png_size_t with size_t (Cosmin)
-  Fixed the calculation of row_factor in png_check_chunk_length
-    (reported by Thuan Pham in SourceForge issue #278)
-  Added missing parentheses to a macro definition
-    (suggested by "irwir" in GitHub issue #216)
-
-Version 1.6.36 [December 1, 2018]
-  Optimized png_do_expand_palette for ARM processors.
-  Improved performance by around 10-22% on a recent ARM Chromebook.
-    (Contributed by Richard Townsend, ARM Holdings)
-  Fixed manipulation of machine-specific optimization options.
-    (Contributed by Vicki Pfau)
-  Used memcpy instead of manual pointer arithmetic on Intel SSE2.
-    (Contributed by Samuel Williams)
-  Fixed build errors with MSVC on ARM64.
-    (Contributed by Zhijie Liang)
-  Fixed detection of libm in CMakeLists.
-    (Contributed by Cameron Cawley)
-  Fixed incorrect creation of pkg-config file in CMakeLists.
-    (Contributed by Kyle Bentley)
-  Fixed the CMake build on Windows MSYS by avoiding symlinks.
-  Fixed a build warning on OpenBSD.
-    (Contributed by Theo Buehler)
-  Fixed various typos in comments.
-    (Contributed by "luz.paz")
-  Raised the minimum required CMake version from 3.0.2 to 3.1.
-  Removed yet more of the vestigial support for pre-ANSI C compilers.
-  Removed ancient makefiles for ancient systems that have been broken
-    across all previous libpng-1.6.x versions.
-  Removed the Y2K compliance statement and the export control
-    information.
-  Applied various code style and documentation fixes.
-
-Version 1.6.37 [April 14, 2019]
-  Fixed a use-after-free vulnerability (CVE-2019-7317) in png_image_free.
-  Fixed a memory leak in the ARM NEON implementation of png_do_expand_palette.
-  Fixed a memory leak in pngtest.c.
-  Fixed two vulnerabilities (CVE-2018-14048, CVE-2018-14550) in
-    contrib/pngminus; refactor.
-  Changed the license of contrib/pngminus to MIT; refresh makefile and docs.
-    (Contributed by Willem van Schaik)
-  Fixed a typo in the libpng license v2.
-    (Contributed by Miguel Ojeda)
-  Added makefiles for AddressSanitizer-enabled builds.
-  Cleaned up various makefiles.
-
-Version 1.6.38 [September 14, 2022]
-  Added configurations and scripts for continuous integration.
-  Fixed various errors in the handling of tRNS, hIST and eXIf.
-  Implemented many stability improvements across all platforms.
-  Updated the internal documentation.
-
-Version 1.6.39 [November 20, 2022]
-  Changed the error handler of oversized chunks (i.e. larger than
-    PNG_USER_CHUNK_MALLOC_MAX) from png_chunk_error to png_benign_error.
-  Fixed a buffer overflow error in contrib/tools/pngfix.
-  Fixed a memory leak (CVE-2019-6129) in contrib/tools/pngcp.
-  Disabled the ARM Neon optimizations by default in the CMake file,
-    following the default behavior of the configure script.
-  Allowed configure.ac to work with the trunk version of autoconf.
-  Removed the support for "install" targets from the legacy makefiles;
-    removed the obsolete makefile.cegcc.
-  Cleaned up the code and updated the internal documentation.
-
-Version 1.6.40 [June 21, 2023]
-  Fixed the eXIf chunk multiplicity checks.
-  Fixed a memory leak in pCAL processing.
-  Corrected the validity report about tRNS inside png_get_valid().
-  Fixed various build issues on *BSD, Mac and Windows.
-  Updated the configurations and the scripts for continuous integration.
-  Cleaned up the code, the build scripts, and the documentation.
-
-Version 1.6.41 [January 24, 2024]
-  Added SIMD-optimized code for the LoongArch LSX hardware.
-    (Contributed by GuXiWei, JinBo and ZhangLixia)
-  Fixed the run-time discovery of MIPS MSA hardware.
-    (Contributed by Sui Jingfeng)
-  Fixed an off-by-one error in the function png_do_check_palette_indexes(),
-    which failed to recognize errors that might have existed in the first
-    column of a broken palette-encoded image. This was a benign regression
-    accidentally introduced in libpng-1.6.33. No pixel was harmed.
-    (Contributed by Adam Richter; reviewed by John Bowler)
-  Fixed, improved and modernized the contrib/pngminus programs, i.e.,
-    png2pnm.c and pnm2png.c
-  Removed old and peculiar portability hacks that were meant to silence
-    warnings issued by gcc version 7.1 alone.
-    (Contributed by John Bowler)
-  Fixed and modernized the CMake file, and raised the minimum required
-    CMake version from 3.1 to 3.6.
-    (Contributed by Clinton Ingram, Timothy Lyanguzov, Tyler Kropp, et al.)
-  Allowed the configure script to disable the building of auxiliary tools
-    and tests, thus catching up with the CMake file.
-    (Contributed by Carlo Bramini)
-  Fixed a build issue on Mac.
-    (Contributed by Zixu Wang)
-  Moved the Autoconf macro files to scripts/autoconf.
-  Moved the CMake files (except for the main CMakeLists.txt) to
-    scripts/cmake and moved the list of their contributing authors to
-    scripts/cmake/AUTHORS.md
-  Updated the CI configurations and scripts.
-  Relicensed the CI scripts to the MIT License.
-  Improved the test coverage.
-    (Contributed by John Bowler)
-
-Version 1.6.42 [January 29, 2024]
-  Fixed the implementation of the macro function png_check_sig().
-    This was an API regression, introduced in libpng-1.6.41.
-    (Reported by Matthieu Darbois)
-  Fixed and updated the libpng manual.
-
-Version 1.6.43 [February 23, 2024]
-  Fixed the row width check in png_check_IHDR().
-    This corrected a bug that was specific to the 16-bit platforms,
-    and removed a spurious compiler warning from the 64-bit builds.
-    (Reported by Jacek Caban; fixed by John Bowler)
-  Added eXIf chunk support to the push-mode reader in pngpread.c.
-    (Contributed by Chris Blume)
-  Added contrib/pngexif for the benefit of the users who would like
-    to inspect the content of eXIf chunks.
-  Added contrib/conftest/basic.dfa, a basic build-time configuration.
-    (Contributed by John Bowler)
-  Fixed a preprocessor condition in pngread.c that broke build-time
-    configurations like contrib/conftest/pngcp.dfa.
-    (Contributed by John Bowler)
-  Added CMake build support for LoongArch LSX.
-    (Contributed by GuXiWei)
-  Fixed a CMake build error that occurred under a peculiar state of the
-    dependency tree. This was a regression introduced in libpng-1.6.41.
-    (Contributed by Dan Rosser)
-  Marked the installed libpng headers as system headers in CMake.
-    (Contributed by Benjamin Buch)
-  Updated the build support for RISCOS.
-    (Contributed by Cameron Cawley)
-  Updated the makefiles to allow cross-platform builds to initialize
-    conventional make variables like AR and ARFLAGS.
-  Added various improvements to the CI scripts in areas like version
-    consistency verification and text linting.
-  Added version consistency verification to pngtest.c also.
-
-Version 1.6.44 [September 12, 2024]
-  Hardened calculations in chroma handling to prevent overflows, and
-    relaxed a constraint in cHRM validation to accomodate the standard
-    ACES AP1 set of color primaries.
-    (Contributed by John Bowler)
-  Removed the ASM implementation of ARM Neon optimizations and updated
-    the build accordingly. Only the remaining C implementation shall be
-    used from now on, thus ensuring the support of the PAC/BTI security
-    features on ARM64.
-    (Contributed by Ross Burton and John Bowler)
-  Fixed the pickup of the PNG_HARDWARE_OPTIMIZATIONS option in the
-    CMake build on FreeBSD/amd64. This is an important performance fix
-    on this platform.
-  Applied various fixes and improvements to the CMake build.
-    (Contributed by Eric Riff, Benjamin Buch and Erik Scholz)
-  Added fuzzing targets for the simplified read API.
-    (Contributed by Mikhail Khachayants)
-  Fixed a build error involving pngtest.c under a custom config.
-    This was a regression introduced in a code cleanup in libpng-1.6.43.
-    (Contributed by Ben Wagner)
-  Fixed and improved the config files for AppVeyor CI and Travis CI.
-
-Version 1.6.45 [January 7, 2025]
-  Added support for the cICP chunk.
-    (Contributed by Lucas Chollet and John Bowler)
-  Adjusted and improved various checks in colorspace calculations.
-    (Contributed by John Bowler)
-  Rearranged the write order of colorspace chunks for better conformance
-    with the PNG v3 draft specification.
-    (Contributed by John Bowler)
-  Raised the minimum required CMake version from 3.6 to 3.14.
-  Forked off a development branch for libpng version 1.8.
-
-Version 1.6.46 [TODO]
-
-Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
-Subscription is required; visit
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+(subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe.
+to subscribe)
+or to glennrp at users.sourceforge.net
+
+Glenn R-P
+#endif
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/145
+++ b/145
@@ -1,3 +1,4 @@
+
    Installing libpng

 Contents
@@ -15,11 +16,10 @@ Contents
      XI. Prepending a prefix to exported symbols
     XII. Configuring for compiler xxx:
    XIII. Removing unwanted object code
-     XIV. Enabling or disabling hardware optimizations
-      XV. Changes to the build and configuration of libpng in libpng-1.5.x
-     XVI. Setjmp/longjmp issues
-    XVII. Common linking failures
-   XVIII. Other sources of information about libpng
+     XIV. Changes to the build and configuration of libpng in libpng-1.5.x
+      XV. Setjmp/longjmp issues
+     XVI. Common linking failures
+    XVII. Other sources of information about libpng

 I. Simple installation

@@ -127,18 +127,16 @@ Your directory structure should look like this:
          README
          *.h, *.c  => libpng source files
          CMakeLists.txt    =>  "cmake" script
-          ci
-             ci_*.sh
          configuration files:
             configure.ac, configure, Makefile.am, Makefile.in,
             autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in,
             libpng-config.in, aclocal.m4, config.h.in, config.sub,
-             depcomp, install-sh, mkinstalldirs, test-pngtest.sh, etc.
+             depcomp, install-sh, mkinstalldirs, test-pngtest.sh
          contrib
             arm-neon, conftest, examples, gregbook, libtests, pngminim,
             pngminus, pngsuite, tools, visupng
          projects
-             owatcom, visualc71, vstudio
+             cbuilder5, owatcom, visualc71, vstudio, xcode
          scripts
             makefile.*
             *.def (module definition files)
@@ -146,7 +144,7 @@ Your directory structure should look like this:
          pngtest.png
          etc.
      zlib
-          README, *.h, *.c, contrib, etc.
+          README, *.h, *.c contrib, etc.

 If the line endings in the files look funny, you may wish to get the other
 distribution of libpng.  It is available in both tar.gz (UNIX style line
@@ -154,27 +152,28 @@ endings) and zip (DOS style line endings) formats.

 VI. Building with project files

-If you are building libpng with Microsoft Visual Studio, you can enter
-the directory projects\visualc71 or projects\vstudio and follow the
-instructions in README.txt.
+If you are building libpng with MSVC, you can enter the
+libpng projects\visualc71 or vstudio directory and follow the instructions
+in README.txt.

-Otherwise, enter the zlib directory and follow the instructions in
-zlib/README, then come back here and run "configure" or choose the
-appropriate makefile in the scripts directory.
+Otherwise enter the zlib directory and follow the instructions in zlib/README,
+then come back here and run "configure" or choose the appropriate
+makefile.sys in the scripts directory.

 VII. Building with makefiles

 Copy the file (or files) that you need from the
 scripts directory into this directory, for example

+MSDOS example:
+
+    copy scripts\makefile.msc makefile
+    copy scripts\pnglibconf.h.prebuilt pnglibconf.h
+
 UNIX example:

-    cp scripts/makefile.std Makefile
-    make
-
-Windows example:
-
-    nmake -f scripts\makefile.vcwin32
+    cp scripts/makefile.std makefile
+    cp scripts/pnglibconf.h.prebuilt pnglibconf.h

 Read the makefile to see if you need to change any source or
 target directories to match your preferences.
@@ -191,33 +190,36 @@ test.  For more confidence, you can run another test by typing
 Also, you can run "pngtest -m contrib/pngsuite/*.png" and compare
 your output with the result shown in contrib/pngsuite/README.

-Most of the makefiles used to allow you to run "make install" to put
-the library in its final resting place, but that feature is no longer
-supported.  The only tested and supported manners to install libpng are
-the conventional build and install procedures driven by the configure
-script or by the CMake file.
+Most of the makefiles will allow you to run "make install" to
+put the library in its final resting place (if you want to
+do that, run "make install" in the zlib directory first if necessary).
+Some also allow you to run "make test-installed" after you have
+run "make install".

-VIII. Configuring for DOS and other 16-bit platforms
+VIII. Configuring libpng for 16-bit platforms

-Officially, the support for 16-bit platforms has been removed.
+You will want to look into zconf.h to tell zlib (and thus libpng) that
+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

 For DOS users who only have access to the lower 640K, you will
 have to limit zlib's memory usage via a png_set_compression_mem_level()
 call.  See zlib.h or zconf.h in the zlib library for more information.

-You may be or may not be in luck if you target the "large" memory model,
-but all the smaller models ("small", "compact" and "medium") are known
-to be unworkable.  For DOS users who have access beyond the lower 640K,
-a "flat" 32-bit DOS model (such as DJGPP) is strongly recommended.
+X. Configuring for Medium Model

-For DOS users who only have access to the lower 640K, you will have to
-limit zlib's memory usage via a png_set_compression_mem_level() call.
-You will also have to look into zconf.h to tell zlib (and thus libpng)
-that it cannot allocate more than 64K at a time.  Even if you can, the
-memory won't be accessible.  Therefore, you should limit zlib and libpng
-to 64K by defining MAXSEG_64K.
+Libpng's support for medium model has been tested on most of the popular
+compilers.  Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets
+defined, and FAR gets defined to far in pngconf.h, and you should be
+all set.  Everything in the library (except for zlib's structure) is
+expecting far data.  You must use the typedefs with the p or pp on
+the end for pointers (or at least look at them and be careful).  Make
+note that the rows of data are defined as png_bytepp, which is
+an "unsigned char far * far *".

-IX. Prepending a prefix to exported symbols
+XI. Prepending a prefix to exported symbols

 Starting with libpng-1.6.0, you can configure libpng (when using the
 "configure" script) to prefix all exported symbols by means of the
@@ -228,7 +230,7 @@ identifier).  This creates a set of macros in pnglibconf.h, so this is
 transparent to applications; their function calls get transformed by
 the macros to use the modified names.

-X. Configuring for compiler xxx:
+XII. Configuring for compiler xxx:

 All includes for libpng are in pngconf.h.  If you need to add, change
 or delete an include, this is the place to do it.
@@ -240,7 +242,7 @@ As of libpng-1.5.0, pngpriv.h also includes three other private header
 files, pngstruct.h, pnginfo.h, and pngdebug.h, which contain material
 that previously appeared in the public headers.

-XI. Removing unwanted object code
+XIII. Removing unwanted object code

 There are a bunch of #define's in pngconf.h that control what parts of
 libpng are compiled.  All the defines end in _SUPPORTED.  If you are
@@ -279,57 +281,7 @@ library to fail if they call functions not available in your library.
 The size of the library itself should not be an issue, because only
 those sections that are actually used will be loaded into memory.

-XII. Enabling or disabling hardware optimizations
-
-Certain hardware capabilities, such as the Intel SSE instructions,
-are normally detected at run time. Enable them with configure options
-such as one of
-
-   --enable-arm-neon=yes
-   --enable-mips-msa=yes
-   --enable-intel-sse=yes
-   --enable-powerpc-vsx=yes
-
-or enable them all at once with
-
-   --enable-hardware-optimizations=yes
-
-or, if you are not using "configure", you can use one
-or more of
-
-   CPPFLAGS += "-DPNG_ARM_NEON"
-   CPPFLAGS += "-DPNG_MIPS_MSA"
-   CPPFLAGS += "-DPNG_INTEL_SSE"
-   CPPFLAGS += "-DPNG_POWERPC_VSX"
-
-See for example scripts/makefile.linux-opt
-
-If you wish to avoid using them,
-you can disable them via the configure option
-
-   --disable-hardware-optimizations
-
-to disable them all, or
-
-   --enable-intel-sse=no
-
-to disable a particular one,
-or via compiler-command options such as
-
-   CPPFLAGS += "-DPNG_ARM_NEON_OPT=0, -DPNG_MIPS_MSA_OPT=0,
-   -DPNG_INTEL_SSE_OPT=0, -DPNG_POWERPC_VSX_OPT=0"
-
-If you are using cmake, hardware optimizations are "on"
-by default. To disable them, use
-
-    cmake . -DPNG_ARM_NEON=no -DPNG_INTEL_SSE=no \
-            -DPNG_MIPS_MSA=no -DPNG_POWERPC_VSX=no
-
-or disable them all at once with
-
-    cmake . -DPNG_HARDWARE_OPTIMIZATIONS=no
-
-XIII. Changes to the build and configuration of libpng in libpng-1.5.x
+XIV. Changes to the build and configuration of libpng in libpng-1.5.x

 Details of internal changes to the library code can be found in the CHANGES
 file and in the GIT repository logs.  These will be of no concern to the vast
@@ -420,7 +372,7 @@ $PREFIX/include directory).  Do not edit pnglibconf.h after you have built
 libpng, because than the settings would not accurately reflect the settings
 that were used to build libpng.

-XIV. Setjmp/longjmp issues
+XV. Setjmp/longjmp issues

 Libpng uses setjmp()/longjmp() for error handling.  Unfortunately setjmp()
 is known to be not thread-safe on some platforms and we don't know of
@@ -438,7 +390,7 @@ This requires setjmp/longjmp, so you must either build the library
 with PNG_SETJMP_SUPPORTED defined, or with PNG_SIMPLIFIED_READ_SUPPORTED
 and PNG_SIMPLIFIED_WRITE_SUPPORTED undefined.

-XV. Common linking failures
+XVI. Common linking failures

 If your application fails to find libpng or zlib entries while linking:

@@ -450,13 +402,12 @@ If your application fails to find libpng or zlib entries while linking:
  If you are using the vstudio project, observe the WARNING in
  project/vstudio/README.txt.

-XVI. Other sources of information about libpng:
+XVII. Other sources of information about libpng:

 Further information can be found in the README and libpng-manual.txt
 files, in the individual makefiles, in png.h, and the manual pages
 libpng.3 and png.5.

-Copyright (c) 2022 Cosmin Truta
 Copyright (c) 1998-2002,2006-2016 Glenn Randers-Pehrson
 This document is released under the libpng license.
 For conditions of distribution and use, see the disclaimer
--- a/177
+++ b/177
@@ -1,82 +1,53 @@
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
-=========================================

-PNG Reference Library License version 2
---------------------------------------
+This copy of the libpng notices is provided for your convenience.  In case of
+any discrepancy between this copy and the notices in the file png.h that is
+included in the libpng distribution, the latter shall prevail.

- * Copyright (c) 1995-2025 The PNG Reference Library Authors.
- * Copyright (c) 2018-2025 Cosmin Truta.
- * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
- * Copyright (c) 1996-1997 Andreas Dilger.
- * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:

-The software is supplied "as is", without warranty of any kind,
-express or implied, including, without limitation, the warranties
-of merchantability, fitness for a particular purpose, title, and
-non-infringement.  In no event shall the Copyright owners, or
-anyone distributing the software, be liable for any damages or
-other liability, whether in contract, tort or otherwise, arising
-from, out of, or in connection with the software, or the use or
-other dealings in the software, even if advised of the possibility
-of such damage.
+If you modify libpng you may insert additional notices immediately following
+this sentence.

-Permission is hereby granted to use, copy, modify, and distribute
-this software, or portions hereof, for any purpose, without fee,
-subject to the following restrictions:
+This code is released under the libpng license.

- 1. The origin of this software must not be misrepresented; you
-    must not claim that you wrote the original software.  If you
-    use this software in a product, an acknowledgment in the product
-    documentation would be appreciated, but is not required.
-
- 2. Altered source versions must be plainly marked as such, and must
-    not be misrepresented as being the original software.
-
- 3. This Copyright notice may not be removed or altered from any
-    source or altered source distribution.
-
-
-PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
-----------------------------------------------------------------------
-
-libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
-Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+libpng versions 1.0.7, July 1, 2000 through 1.6.30rc02, June 25, 2017 are
+Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
 added to the list of Contributing Authors:

-    Simon-Pierre Cadieux
-    Eric S. Raymond
-    Mans Rullgard
-    Cosmin Truta
-    Gilles Vollant
-    James Yu
-    Mandar Sahastrabuddhe
-    Google Inc.
-    Vadim Barkov
+   Simon-Pierre Cadieux
+   Eric S. Raymond
+   Mans Rullgard
+   Cosmin Truta
+   Gilles Vollant
+   James Yu
+   Mandar Sahastrabuddhe
+   Google Inc.
+   Vadim Barkov

 and with the following additions to the disclaimer:

-    There is no warranty against interference with your enjoyment of
-    the library or against infringement.  There is no warranty that our
-    efforts or the library will fulfill any of your particular purposes
-    or needs.  This library is provided with all faults, and the entire
-    risk of satisfactory quality, performance, accuracy, and effort is
-    with the user.
+   There is no warranty against interference with your enjoyment of the
+   library or against infringement.  There is no warranty that our
+   efforts or the library will fulfill any of your particular purposes
+   or needs.  This library is provided with all faults, and the entire
+   risk of satisfactory quality, performance, accuracy, and effort is with
+   the user.

 Some files in the "contrib" directory and some configure-generated
-files that are distributed with libpng have other copyright owners, and
+files that are distributed with libpng have other copyright owners and
 are released under other open source licenses.

 libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
 Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
 libpng-0.96, and are distributed according to the same disclaimer and
-license as libpng-0.96, with the following individuals added to the
-list of Contributing Authors:
+license as libpng-0.96, with the following individuals added to the list
+of Contributing Authors:

-    Tom Lane
-    Glenn Randers-Pehrson
-    Willem van Schaik
+   Tom Lane
+   Glenn Randers-Pehrson
+   Willem van Schaik

 libpng versions 0.89, June 1996, through 0.96, May 1997, are
 Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
@@ -84,14 +55,14 @@ and are distributed according to the same disclaimer and license as
 libpng-0.88, with the following individuals added to the list of
 Contributing Authors:

-    John Bowler
-    Kevin Bracey
-    Sam Bushell
-    Magnus Holmgren
-    Greg Roelofs
-    Tom Tanner
+   John Bowler
+   Kevin Bracey
+   Sam Bushell
+   Magnus Holmgren
+   Greg Roelofs
+   Tom Tanner

-Some files in the "scripts" directory have other copyright owners,
+Some files in the "scripts" directory have other copyright owners
 but are released under this license.

 libpng versions 0.5, May 1995, through 0.88, January 1996, are
@@ -100,35 +71,63 @@ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
 For the purposes of this copyright and license, "Contributing Authors"
 is defined as the following set of individuals:

-    Andreas Dilger
-    Dave Martindale
-    Guy Eric Schalnat
-    Paul Schmidt
-    Tim Wegner
+   Andreas Dilger
+   Dave Martindale
+   Guy Eric Schalnat
+   Paul Schmidt
+   Tim Wegner

-The PNG Reference Library is supplied "AS IS".  The Contributing
-Authors and Group 42, Inc. disclaim all warranties, expressed or
-implied, including, without limitation, the warranties of
-merchantability and of fitness for any purpose.  The Contributing
-Authors and Group 42, Inc. assume no liability for direct, indirect,
-incidental, special, exemplary, or consequential damages, which may
-result from the use of the PNG Reference Library, even if advised of
-the possibility of such damage.
+The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+and Group 42, Inc. disclaim all warranties, expressed or implied,
+including, without limitation, the warranties of merchantability and of
+fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+assume no liability for direct, indirect, incidental, special, exemplary,
+or consequential damages, which may result from the use of the PNG
+Reference Library, even if advised of the possibility of such damage.

 Permission is hereby granted to use, copy, modify, and distribute this
 source code, or portions hereof, for any purpose, without fee, subject
 to the following restrictions:

- 1. The origin of this source code must not be misrepresented.
+  1. The origin of this source code must not be misrepresented.

- 2. Altered versions must be plainly marked as such and must not
-    be misrepresented as being the original source.
+  2. Altered versions must be plainly marked as such and must not
+     be misrepresented as being the original source.

- 3. This Copyright notice may not be removed or altered from any
-    source or altered source distribution.
+  3. This Copyright notice may not be removed or altered from any
+     source or altered source distribution.

-The Contributing Authors and Group 42, Inc. specifically permit,
-without fee, and encourage the use of this source code as a component
-to supporting the PNG file format in commercial products.  If you use
-this source code in a product, acknowledgment is not required but would
-be appreciated.
+The Contributing Authors and Group 42, Inc. specifically permit, without
+fee, and encourage the use of this source code as a component to
+supporting the PNG file format in commercial products.  If you use this
+source code in a product, acknowledgment is not required but would be
+appreciated.
+
+END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
+
+TRADEMARK:
+
+The name "libpng" has not been registered by the Copyright owner
+as a trademark in any jurisdiction.  However, because libpng has
+been distributed and maintained world-wide, continually since 1995,
+the Copyright owner claims "common-law trademark protection" in any
+jurisdiction where common-law trademark is recognized.
+
+OSI CERTIFICATION:
+
+Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
+a certification mark of the Open Source Initiative. OSI has not addressed
+the additional disclaimers inserted at version 1.0.7.
+
+EXPORT CONTROL:
+
+The Copyright owner believes that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because
+it is open source, publicly available software, that does not contain
+any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
+734.7(b).
+
+Glenn Randers-Pehrson
+glennrp at users.sourceforge.net
+April 1, 2017
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am, the source file for Makefile.in (and hence Makefile), is
 #
-# Copyright (c) 2018-2025 Cosmin Truta
 # Copyright (c) 2004-2016 Glenn Randers-Pehrson
+# Last changed in libpng 1.6.25 [September 1, 2016]
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
@@ -9,24 +9,16 @@

 PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@

-ACLOCAL_AMFLAGS = -I scripts/autoconf
+ACLOCAL_AMFLAGS = -I scripts

 # test programs - run on make check, make distcheck
-if ENABLE_TESTS
 check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage pngcp
 if HAVE_CLOCK_GETTIME
 check_PROGRAMS += timepng
 endif
-else
-check_PROGRAMS=
-endif

 # Utilities - installed
-if ENABLE_TOOLS
 bin_PROGRAMS= pngfix png-fix-itxt
-else
-bin_PROGRAMS=
-endif

 # This ensures that pnglibconf.h gets built at the start of 'make all' or
 # 'make check', but it does not add dependencies to the individual programs,
@@ -38,7 +30,6 @@ endif
 # always wrong and always very confusing.
 BUILT_SOURCES = pnglibconf.h

-if ENABLE_TESTS
 pngtest_SOURCES = pngtest.c
 pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la

@@ -57,22 +48,18 @@ pngimage_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 timepng_SOURCES = contrib/libtests/timepng.c
 timepng_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la

-pngcp_SOURCES = contrib/tools/pngcp.c
-pngcp_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-endif
-
-if ENABLE_TOOLS
 pngfix_SOURCES = contrib/tools/pngfix.c
 pngfix_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la

 png_fix_itxt_SOURCES = contrib/tools/png-fix-itxt.c
-endif
+
+pngcp_SOURCES = contrib/tools/pngcp.c
+pngcp_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la

 # Generally these are single line shell scripts to run a test with a particular
 # set of parameters:
-if ENABLE_TESTS
 TESTS =\
-   tests/pngtest-all\
+   tests/pngtest\
   tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\
   tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\
   tests/pngvalid-gamma-expand16-background\
@@ -88,7 +75,6 @@ TESTS =\
   tests/pngunknown-discard tests/pngunknown-if-safe tests/pngunknown-sAPI\
   tests/pngunknown-sTER tests/pngunknown-save tests/pngunknown-vpAg\
   tests/pngimage-quick tests/pngimage-full
-endif

 # man pages
 dist_man_MANS= libpng.3 libpngpf.3 png.5
@@ -108,8 +94,7 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\

 if PNG_ARM_NEON
 libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/arm_init.c\
-	arm/filter_neon_intrinsics.c \
-	arm/palette_neon_intrinsics.c
+	arm/filter_neon.S arm/filter_neon_intrinsics.c
 endif

 if PNG_MIPS_MSA
@@ -117,13 +102,6 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += mips/mips_init.c\
 	mips/filter_msa_intrinsics.c
 endif

-if PNG_MIPS_MMI
-if !PNG_MIPS_MSA
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += mips/mips_init.c
-endif
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += mips/filter_mmi_inline_assembly.c
-endif
-
 if PNG_INTEL_SSE
 libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += intel/intel_init.c\
 	intel/filter_sse2_intrinsics.c
@@ -134,15 +112,6 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += powerpc/powerpc_init.c\
        powerpc/filter_vsx_intrinsics.c
 endif

-if PNG_LOONGARCH_LSX
-noinst_LTLIBRARIES= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx.la
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx_la_SOURCES = loongarch/loongarch_lsx_init.c\
-	loongarch/filter_lsx_intrinsics.c
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx_la_CFLAGS = -mlsx
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LIBADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx.la
-# libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx.la
-endif
-
 nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h

 libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \
@@ -163,10 +132,6 @@ else
  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym
 endif

-if PNG_LOONGARCH_LSX
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES += libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx.la
-endif
-
 #distribute headers in /usr/include/libpng/*
 pkgincludedir= $(includedir)/$(PNGLIB_BASENAME)
 pkginclude_HEADERS= png.h pngconf.h
@@ -181,9 +146,9 @@ pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
 # from those directories being included.  This only works if the configure is
 # not done in the source directory!
 EXTRA_DIST= \
-	ANNOUNCE AUTHORS CHANGES INSTALL LICENSE README TODO TRADEMARK \
+	ANNOUNCE CHANGES INSTALL LICENSE README TODO \
 	pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
-	${srcdir}/ci ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
+	${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
 	$(TESTS) $(XFAIL_TESTS) tests/pngstest \
 	CMakeLists.txt example.c libpng-manual.txt

@@ -199,7 +164,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
 config.sub configure depcomp install-sh ltmain.sh missing

 # PNG_COPTS give extra options for the C compiler to be used on all compilation
-# steps (unless target_CFLAGS is specified; that will take precedence over
+# steps (unless targe_CFLAGS is specified; that will take precedence over
 # AM_CFLAGS)
 PNG_COPTS = @PNG_COPTS@
 AM_CFLAGS = ${PNG_COPTS}
--- a/Makefile.in
+++ b/Makefile.in
--- a/348
+++ b/348
@@ -1,88 +1,56 @@
-README for libpng version 1.6.46.git
-====================================
+README for libpng version 1.6.30beta01 - April 1, 2017 (shared library 16.0)
+See the note about version numbers near the top of png.h

-See the note about version numbers near the top of `png.h`.
-See `INSTALL` for instructions on how to install libpng.
+See INSTALL for instructions on how to install libpng.

-Libpng comes in several distribution formats.  Get `libpng-*.tar.gz`
-or `libpng-*.tar.xz` if you want UNIX-style line endings in the text
-files, or `lpng*.7z` or `lpng*.zip` if you want DOS-style line endings.
+Libpng comes in several distribution formats.  Get libpng-*.tar.gz or
+libpng-*.tar.xz or if you want UNIX-style line endings in the text files,
+or lpng*.7z or lpng*.zip if you want DOS-style line endings.

-For a detailed description on using libpng, read `libpng-manual.txt`.
-For examples of libpng in a program, see `example.c` and `pngtest.c`.
-For usage information and restrictions (what little they are) on libpng,
-see `png.h`.  For a description on using zlib (the compression library
-used by libpng) and zlib's restrictions, see `zlib.h`.
+Version 0.89 was the first official release of libpng.  Don't let the
+fact that it's the first release fool you.  The libpng library has been in
+extensive use and testing since mid-1995.  By late 1997 it had
+finally gotten to the stage where there hadn't been significant
+changes to the API in some time, and people have a bad feeling about
+libraries with versions < 1.0.  Version 1.0.0 was released in
+March 1998.

-You should use zlib 1.0.4 or later to run this, but it _may_ work with
-versions as old as zlib 0.95.  Even so, there are bugs in older zlib
-versions which can cause the output of invalid compression streams for
-some images.
-
-You should also note that zlib is a compression library that is useful
-for more things than just PNG files.  You can use zlib as a drop-in
-replacement for `fread()` and `fwrite()`, if you are so inclined.
-
-zlib should be available at the same place that libpng is, or at
-https://zlib.net .
-
-You may also want a copy of the PNG specification.  It is available
-as an RFC, a W3C Recommendation, and an ISO/IEC Standard.  You can find
-these at http://www.libpng.org/pub/png/pngdocs.html .
-
-This code is currently being archived at https://libpng.sourceforge.io
-in the download area, and at http://libpng.download/src .
-
-This release, based in a large way on Glenn's, Guy's and Andreas'
-earlier work, was created and will be supported by myself and the PNG
-development group.
-
-Send comments, corrections and commendations to `png-mng-implement`
-at `lists.sourceforge.net`.  (Subscription is required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe.)
-
-Send general questions about the PNG specification to `png-mng-misc`
-at `lists.sourceforge.net`.  (Subscription is required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-misc
-to subscribe.)
-
-Historical notes
----------------
-
-The libpng library has been in extensive use and testing since mid-1995.
-Version 0.89, published a year later, was the first official release.
-By late 1997, it had finally gotten to the stage where there hadn't
-been significant changes to the API in some time, and people have a bad
-feeling about libraries with versions below 1.0.  Version 1.0.0 was
-released in March 1998.
-
-Note that some of the changes to the `png_info` structure render this
+****
+Note that some of the changes to the png_info structure render this
 version of the library binary incompatible with libpng-0.89 or
 earlier versions if you are using a shared library.  The type of the
-`filler` parameter for `png_set_filler()` has changed from `png_byte`
-to `png_uint_32`, which will affect shared-library applications that
-use this function.
+"filler" parameter for png_set_filler() has changed from png_byte to
+png_uint_32, which will affect shared-library applications that use
+this function.

-To avoid problems with changes to the internals of the `info_struct`,
+To avoid problems with changes to the internals of the png info_struct,
 new APIs have been made available in 0.95 to avoid direct application
-access to `info_ptr`.  These functions are the `png_set_<chunk>` and
-`png_get_<chunk>` functions.  These functions should be used when
-accessing/storing the `info_struct` data, rather than manipulating it
+access to info_ptr.  These functions are the png_set_<chunk> and
+png_get_<chunk> functions.  These functions should be used when
+accessing/storing the info_struct data, rather than manipulating it
 directly, to avoid such problems in the future.

 It is important to note that the APIs did not make current programs
 that access the info struct directly incompatible with the new
 library, through libpng-1.2.x.  In libpng-1.4.x, which was meant to
-be a transitional release, members of the `png_struct` and the
-`info_struct` can still be accessed, but the compiler will issue a
+be a transitional release, members of the png_struct and the
+info_struct can still be accessed, but the compiler will issue a
 warning about deprecated usage.  Since libpng-1.5.0, direct access
 to these structs is not allowed, and the definitions of the structs
-reside in private `pngstruct.h` and `pnginfo.h` header files that are
-not accessible to applications.  It is strongly suggested that new
-programs use the new APIs (as shown in `example.c` and `pngtest.c`),
-and older programs be converted to the new format, to facilitate
-upgrades in the future.
+reside in private pngstruct.h and pnginfo.h header files that are not
+accessible to applications.  It is strongly suggested that new
+programs use the new APIs (as shown in example.c and pngtest.c), and
+older programs be converted to the new format, to facilitate upgrades
+in the future.
+****
+
+Additions since 0.90 include the ability to compile libpng as a
+Windows DLL, and new APIs for accessing data in the info struct.
+Experimental functions include the ability to set weighting and cost
+factors for row filter selection, direct reads of integers from buffers
+on big-endian processors that support misaligned data access, faster
+methods of doing alpha composition, and more accurate 16->8 bit color
+conversion.

 The additions since 0.89 include the ability to read from a PNG stream
 which has had some (or all) of the signature bytes read by the calling
@@ -92,91 +60,163 @@ the library action on the detection of chunk CRC errors.  It is possible
 to set different actions based on whether the CRC error occurred in a
 critical or an ancillary chunk.

-The additions since 0.90 include the ability to compile libpng as a
-Windows DLL, and new APIs for accessing data in the `info_struct`.
-Experimental functions included the ability to set weighting and cost
-factors for row filter selection, direct reads of integers from buffers
-on big-endian processors that support misaligned data access, faster
-methods of doing alpha composition, and more accurate 16-to-8 bit color
-conversion.  Some of these experimental functions, such as the weighted
-filter heuristics, have since been removed.
+The changes made to the library, and bugs fixed are based on discussions
+on the PNG-implement mailing list and not on material submitted
+privately to Guy, Andreas, or Glenn.  They will forward any good
+suggestions to the list.

-Files included in this distribution
-----------------------------------
+For a detailed description on using libpng, read libpng-manual.txt.  For
+examples of libpng in a program, see example.c and pngtest.c.  For usage
+information and restrictions (what little they are) on libpng, see
+png.h.  For a description on using zlib (the compression library used by
+libpng) and zlib's restrictions, see zlib.h

-    ANNOUNCE      =>  Announcement of this version, with recent changes
-    AUTHORS       =>  List of contributing authors
-    CHANGES       =>  Description of changes between libpng versions
-    INSTALL       =>  Instructions to install libpng
-    LICENSE       =>  License to use and redistribute libpng
-    README        =>  This file
-    TODO          =>  Things not implemented in the current library
-    TRADEMARK     =>  Trademark information
-    example.c     =>  Example code for using libpng functions
-    libpng.3      =>  Manual page for libpng (includes libpng-manual.txt)
-    libpng-manual.txt  =>  Description of libpng and its functions
-    libpngpf.3    =>  Manual page for libpng's private functions (deprecated)
-    png.5         =>  Manual page for the PNG format
-    png.c         =>  Basic interface functions common to library
-    png.h         =>  Library function and interface declarations (public)
-    pngpriv.h     =>  Library function and interface declarations (private)
-    pngconf.h     =>  System specific library configuration (public)
-    pngstruct.h   =>  png_struct declaration (private)
-    pnginfo.h     =>  png_info struct declaration (private)
-    pngdebug.h    =>  debugging macros (private)
-    pngerror.c    =>  Error/warning message I/O functions
-    pngget.c      =>  Functions for retrieving info from struct
-    pngmem.c      =>  Memory handling functions
-    pngbar.png    =>  PNG logo, 88x31
-    pngnow.png    =>  PNG logo, 98x31
-    pngpread.c    =>  Progressive reading functions
-    pngread.c     =>  Read data/helper high-level functions
-    pngrio.c      =>  Lowest-level data read I/O functions
-    pngrtran.c    =>  Read data transformation functions
-    pngrutil.c    =>  Read data utility functions
-    pngset.c      =>  Functions for storing data into the info_struct
-    pngtest.c     =>  Library test program
-    pngtest.png   =>  Library test sample image
-    pngtrans.c    =>  Common data transformation functions
-    pngwio.c      =>  Lowest-level write I/O functions
-    pngwrite.c    =>  High-level write functions
-    pngwtran.c    =>  Write data transformations
-    pngwutil.c    =>  Write utility functions
-    arm/          =>  Optimized code for ARM Neon
-    intel/        =>  Optimized code for INTEL SSE2
-    loongarch/    =>  Optimized code for LoongArch LSX
-    mips/         =>  Optimized code for MIPS MSA and MIPS MMI
-    powerpc/      =>  Optimized code for PowerPC VSX
-    ci/           =>  Scripts for continuous integration
-    contrib/      =>  External contributions
-        arm-neon/     =>  Optimized code for the ARM-NEON platform
-        mips-msa/     =>  Optimized code for the MIPS-MSA platform
-        powerpc-vsx/  =>  Optimized code for the POWERPC-VSX platform
-        examples/     =>  Examples of libpng usage
-        gregbook/     =>  Source code for PNG reading and writing, from
-                          "PNG: The Definitive Guide" by Greg Roelofs,
-                          O'Reilly, 1999
-        libtests/     =>  Test programs
-        pngexif/      =>  Program to inspect the EXIF information in PNG files
-        pngminim/     =>  Minimal decoder, encoder, and progressive decoder
-                          programs demonstrating the use of pngusr.dfa
-        pngminus/     =>  Simple pnm2png and png2pnm programs
-        pngsuite/     =>  Test images
-        testpngs/     =>  Test images
-        tools/        =>  Various tools
-        visupng/      =>  VisualPng, a Windows viewer for PNG images
-    projects/     =>  Project files and workspaces for various IDEs
-        owatcom/      =>  OpenWatcom project
-        visualc71/    =>  Microsoft Visual C++ 7.1 workspace
-        vstudio/      =>  Microsoft Visual Studio workspace
-    scripts/      =>  Scripts and makefiles for building libpng
-                      (see scripts/README.txt for the complete list)
-    tests/        =>  Test scripts
+I have included a general makefile, as well as several machine and
+compiler specific ones, but you may have to modify one for your own needs.

-Good luck, and happy coding!
+You should use zlib 1.0.4 or later to run this, but it MAY work with
+versions as old as zlib 0.95.  Even so, there are bugs in older zlib
+versions which can cause the output of invalid compression streams for
+some images.  You will definitely need zlib 1.0.4 or later if you are
+taking advantage of the MS-DOS "far" structure allocation for the small
+and medium memory models.  You should also note that zlib is a
+compression library that is useful for more things than just PNG files.
+You can use zlib as a drop-in replacement for fread() and fwrite() if
+you are so inclined.

- * Cosmin Truta (current maintainer, since 2018)
- * Glenn Randers-Pehrson (former maintainer, 1998-2018)
- * Andreas Eric Dilger (former maintainer, 1996-1997)
- * Guy Eric Schalnat (original author and former maintainer, 1995-1996)
-   (formerly of Group 42, Inc.)
+zlib should be available at the same place that libpng is, or at zlib.net.
+
+You may also want a copy of the PNG specification.  It is available
+as an RFC, a W3C Recommendation, and an ISO/IEC Standard.  You can find
+these at http://www.libpng.org/pub/png/pngdocs.html .
+
+This code is currently being archived at libpng.sourceforge.io in the
+[DOWNLOAD] area, and at http://libpng.download/src .  If you
+can't find it in any of those places, e-mail me, and I'll help you find it.
+
+I am not a lawyer, but I believe that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because it
+is open source, publicly available software, that does not contain any
+encryption software.  See the EAR, paragraphs 734.3(b)(3) and 734.7(b).
+
+If you have any code changes, requests, problems, etc., please e-mail
+them to me.  Also, I'd appreciate any make files or project files,
+and any modifications you needed to make to get libpng to compile,
+along with a #define variable to tell what compiler/system you are on.
+If you needed to add transformations to libpng, or wish libpng would
+provide the image in a different way, drop me a note (and code, if
+possible), so I can consider supporting the transformation.
+Finally, if you get any warning messages when compiling libpng
+(note: not zlib), and they are easy to fix, I'd appreciate the
+fix.  Please mention "libpng" somewhere in the subject line.  Thanks.
+
+This release was created and will be supported by myself (of course
+based in a large way on Guy's and Andreas' earlier work), and the PNG
+development group.
+
+Send comments/corrections/commendations to png-mng-implement at
+lists.sourceforge.net (subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+to subscribe) or to glennrp at users.sourceforge.net
+
+You can't reach Guy, the original libpng author, at the addresses
+given in previous versions of this document.  He and Andreas will
+read mail addressed to the png-implement list, however.
+
+Please do not send general questions about PNG.  Send them to
+png-mng-misc at lists.sf.net (subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-misc to
+subscribe).  If you have a question about something
+in the PNG specification that is related to using libpng, send it
+to me.  Send me any questions that start with "I was using libpng,
+and ...".  If in doubt, send questions to me.  I'll bounce them
+to others, if necessary.
+
+Please do not send suggestions on how to change PNG.  We have
+been discussing PNG for twenty years now, and it is official and
+finished.  If you have suggestions for libpng, however, I'll
+gladly listen.  Even if your suggestion is not used immediately,
+it may be used later.
+
+Files in this distribution:
+
+      ANNOUNCE      =>  Announcement of this version, with recent changes
+      CHANGES       =>  Description of changes between libpng versions
+      KNOWNBUG      =>  List of known bugs and deficiencies
+      LICENSE       =>  License to use and redistribute libpng
+      README        =>  This file
+      TODO          =>  Things not implemented in the current library
+      Y2KINFO       =>  Statement of Y2K compliance
+      example.c     =>  Example code for using libpng functions
+      libpng.3      =>  manual page for libpng (includes libpng-manual.txt)
+      libpng-manual.txt  =>  Description of libpng and its functions
+      libpngpf.3    =>  manual page for libpng's private functions
+      png.5         =>  manual page for the PNG format
+      png.c         =>  Basic interface functions common to library
+      png.h         =>  Library function and interface declarations (public)
+      pngpriv.h     =>  Library function and interface declarations (private)
+      pngconf.h     =>  System specific library configuration (public)
+      pngstruct.h   =>  png_struct declaration (private)
+      pnginfo.h     =>  png_info struct declaration (private)
+      pngdebug.h    =>  debugging macros (private)
+      pngerror.c    =>  Error/warning message I/O functions
+      pngget.c      =>  Functions for retrieving info from struct
+      pngmem.c      =>  Memory handling functions
+      pngbar.png    =>  PNG logo, 88x31
+      pngnow.png    =>  PNG logo, 98x31
+      pngpread.c    =>  Progressive reading functions
+      pngread.c     =>  Read data/helper high-level functions
+      pngrio.c      =>  Lowest-level data read I/O functions
+      pngrtran.c    =>  Read data transformation functions
+      pngrutil.c    =>  Read data utility functions
+      pngset.c      =>  Functions for storing data into the info_struct
+      pngtest.c     =>  Library test program
+      pngtest.png   =>  Library test sample image
+      pngtrans.c    =>  Common data transformation functions
+      pngwio.c      =>  Lowest-level write I/O functions
+      pngwrite.c    =>  High-level write functions
+      pngwtran.c    =>  Write data transformations
+      pngwutil.c    =>  Write utility functions
+      arm           =>  Contains optimized code for the ARM platform
+      powerpc       =>  Contains optimized code for the PowerPC platform
+      contrib       =>  Contributions
+       arm-neon         =>  Optimized code for ARM-NEON platform
+       powerpc-vsx      =>  Optimized code for POWERPC-VSX platform
+       examples         =>  Example programs
+       gregbook         =>  source code for PNG reading and writing, from
+                            Greg Roelofs' "PNG: The Definitive Guide",
+                            O'Reilly, 1999
+       libtests         =>  Test programs
+       mips-msa         =>  Optimized code for MIPS-MSA platform
+       pngminim         =>  Minimal decoder, encoder, and progressive decoder
+                            programs demonstrating use of pngusr.dfa
+       pngminus         =>  Simple pnm2png and png2pnm programs
+       pngsuite         =>  Test images
+       testpngs
+       tools            =>  Various tools
+       visupng          =>  Contains a MSVC workspace for VisualPng
+      intel             =>  Optimized code for INTEL-SSE2 platform
+      mips              =>  Optimized code for MIPS platform
+      projects      =>  Contains project files and workspaces for
+                        building a DLL
+       owatcom          =>  Contains a WATCOM project for building libpng
+       visualc71        =>  Contains a Microsoft Visual C++ (MSVC)
+                            workspace for building libpng and zlib
+       vstudio          =>  Contains a Microsoft Visual C++ (MSVC)
+                            workspace for building libpng and zlib
+      scripts       =>  Directory containing scripts for building libpng:
+                            (see scripts/README.txt for the list of scripts)
+
+Good luck, and happy coding.
+
+-Glenn Randers-Pehrson (current maintainer, since 1998)
+ Internet: glennrp at users.sourceforge.net
+
+-Andreas Eric Dilger (former maintainer, 1996-1997)
+ Internet: adilger at enel.ucalgary.ca
+ Web: http://www-mddsp.enel.ucalgary.ca/People/adilger/
+
+-Guy Eric Schalnat (original author and former maintainer, 1995-1996)
+ (formerly of Group 42, Inc)
+ Internet: gschal at infinet.com
--- a/50
+++ b/50
@@ -1,22 +1,30 @@
-TODO list for libpng
--------------------
+/*
+TODO - list of things to do for libpng:

- * Fix all defects (duh!)
- * cHRM transformation.
- * Palette creation.
- * "grayscale->palette" transformation and "palette->grayscale" detection.
- * Improved dithering.
- * Multi-lingual error and warning message support.
- * Complete sRGB transformation.  (Currently it simply uses gamma=0.45455.)
- * Man pages for function calls.
- * Better documentation.
- * Better filter selection
-   (e.g., counting huffman bits/precompression; filter inertia; filter costs).
- * Histogram creation.
- * Text conversion between different code pages (e.g., Latin-1 to Mac).
- * Avoid building gamma tables whenever possible.
- * Greater precision in changing to linear gamma for compositing against
-   background, and in doing rgb-to-gray transformations.
- * Investigate pre-incremented loop counters and other loop constructions.
- * Interpolated method of handling interlacing.
- * More validations for libpng transformations.
+Final bug fixes.
+Better C++ wrapper/full C++ implementation?
+Fix problem with C++ and EXTERN "C".
+cHRM transformation.
+Remove setjmp/longjmp usage in favor of returning error codes. As a start on
+  this, minimize the use of png_error(), replacing them with
+  png_warning(); return(0); or similar.
+Palette creation.
+Add "grayscale->palette" transformation and "palette->grayscale" detection.
+Improved dithering.
+Multi-lingual error and warning message support.
+Complete sRGB transformation (presently it simply uses gamma=0.45455).
+Man pages for function calls.
+Better documentation.
+Better filter selection
+   (counting huffman bits/precompression?  filter inertia?  filter costs?).
+Histogram creation.
+Text conversion between different code pages (Latin-1 -> Mac and DOS).
+Avoid building gamma tables whenever possible.
+Use greater precision when changing to linear gamma for compositing against
+  background and doing rgb-to-gray transformation.
+Investigate pre-incremented loop counters and other loop constructions.
+Add interpolated method of handling interlacing.
+Extend pngvalid.c to validate more of the libpng transformations.
+Refactor preprocessor conditionals to compile entire statements
+
+*/
--- a/8
+++ b/8
@@ -1,8 +0,0 @@
-TRADEMARK
-=========
-
-The name "libpng" has not been registered by the Copyright owners
-as a trademark in any jurisdiction.  However, because libpng has
-been distributed and maintained world-wide, continually since 1995,
-the Copyright owners claim "common-law trademark protection" in any
-jurisdiction where common-law trademark is recognized.
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/arm/arm_init.c
+++ b/arm/arm_init.c
@@ -1,15 +1,17 @@
+
 /* arm_init.c - NEON optimised filter functions
 *
- * Copyright (c) 2018-2022 Cosmin Truta
 * Copyright (c) 2014,2016 Glenn Randers-Pehrson
 * Written by Mans Rullgard, 2011.
+ * Last changed in libpng 1.6.22 [May 26, 2016]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */
-
-/* This module requires POSIX 1003.1 functions. */
+/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are
+ * called.
+ */
 #define _POSIX_SOURCE 1

 #include "../pngpriv.h"
@@ -30,26 +32,21 @@
 * has partial support is contrib/arm-neon/linux.c - a generic Linux
 * implementation which reads /proc/cpufino.
 */
-#include <signal.h> /* for sig_atomic_t */
-
 #ifndef PNG_ARM_NEON_FILE
-#  if defined(__aarch64__) || defined(_M_ARM64)
-     /* ARM Neon is expected to be unconditionally available on ARM64. */
-#    error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on ARM64"
-#  elif defined(__ARM_NEON__) || defined(__ARM_NEON)
-     /* ARM Neon is expected to be available on the target CPU architecture. */
-#    error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this CPU arch"
-#  elif defined(__linux__)
-#    define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
-#  else
-#    error "No support for run-time ARM Neon checking; use compile-time options"
+#  ifdef __linux__
+#     define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
 #  endif
 #endif

-static int png_have_neon(png_structp png_ptr);
 #ifdef PNG_ARM_NEON_FILE
-#  include PNG_ARM_NEON_FILE
-#endif
+
+#include <signal.h> /* for sig_atomic_t */
+static int png_have_neon(png_structp png_ptr);
+#include PNG_ARM_NEON_FILE
+
+#else  /* PNG_ARM_NEON_FILE */
+#  error "PNG_ARM_NEON_FILE undefined: no support for run-time ARM NEON checks"
+#endif /* PNG_ARM_NEON_FILE */
 #endif /* PNG_ARM_NEON_CHECK_SUPPORTED */

 #ifndef PNG_ALIGNED_MEMORY_SUPPORTED
--- a/arm/filter_neon.S
+++ b/arm/filter_neon.S
@@ -1,60 +1,253 @@
-/* filter_neon.S - placeholder file
+
+/* filter_neon.S - NEON optimised filter functions
 *
- * Copyright (c) 2024 Cosmin Truta
+ * Copyright (c) 2014 Glenn Randers-Pehrson
+ * Written by Mans Rullgard, 2011.
+ * Last changed in libpng 1.6.16 [December 22, 2014]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */

-/* IMPORTANT NOTE:
- *
- * Historically, the hand-coded assembler implementation of Neon optimizations
- * in this module had not been in sync with the intrinsics-based implementation
- * in filter_neon_intrinsics.c and palette_neon_intrinsics.c, at least since
- * the introduction of riffled palette optimizations. Moreover, the assembler
- * code used to work on 32-bit ARM only, and it caused problems, even if empty,
- * on 64-bit ARM.
- *
- * All references to this module from our internal build scripts and projects
- * have been removed.
- *
- * For the external projects that might still expect this module to be present,
- * we leave this stub in place, for the remaining lifetime of libpng-1.6.x.
- * Everything should continue to function normally, as long as there are no
- * deliberate attempts to use the old hand-made assembler code. A build error
- * will be raised otherwise.
- */
-
 /* This is required to get the symbol renames, which are #defines, and the
 * definitions (or not) of PNG_ARM_NEON_OPT and PNG_ARM_NEON_IMPLEMENTATION.
 */
 #define PNG_VERSION_INFO_ONLY
 #include "../pngpriv.h"

+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
+#endif
+
 #ifdef PNG_READ_SUPPORTED
+
+/* Assembler NEON support - only works for 32-bit ARM (i.e. it does not work for
+ * ARM64).  The code in arm/filter_neon_intrinsics.c supports ARM64, however it
+ * only works if -mfpu=neon is specified on the GCC command line.  See pngpriv.h
+ * for the logic which sets PNG_USE_ARM_NEON_ASM:
+ */
 #if PNG_ARM_NEON_IMPLEMENTATION == 2 /* hand-coded assembler */
+
 #if PNG_ARM_NEON_OPT > 0

-#if defined(__clang__)
-#define GNUC_VERSION 0 /* not gcc, although it might pretend to be */
-#elif defined(__GNUC__)
-#define GNUC_MAJOR (__GNUC__ + 0)
-#define GNUC_MINOR (__GNUC_MINOR__ + 0)
-#define GNUC_PATCHLEVEL (__GNUC_PATCHLEVEL__ + 0)
-#define GNUC_VERSION (GNUC_MAJOR * 10000 + GNUC_MINOR * 100 + GNUC_PATCHLEVEL)
+#ifdef __ELF__
+#   define ELF
 #else
-#define GNUC_VERSION 0 /* not gcc */
+#   define ELF @
 #endif

-#if (GNUC_VERSION > 0) && (GNUC_VERSION < 40300)
-#error "PNG_ARM_NEON is not supported with gcc versions earlier than 4.3.0"
-#elif GNUC_VERSION == 40504
-#error "PNG_ARM_NEON is not supported with gcc version 4.5.4"
-#else
-#error "Please use 'arm/*_neon_intrinsics.c' for PNG_ARM_NEON support"
-#endif
+        .arch armv7-a
+        .fpu  neon

+.macro  func    name, export=0
+    .macro endfunc
+ELF     .size   \name, . - \name
+        .endfunc
+        .purgem endfunc
+    .endm
+        .text
+
+        /* Explicitly specifying alignment here because some versions of
+         * GAS don't align code correctly.  This is harmless in correctly
+         * written versions of GAS.
+         */
+        .align 2
+
+    .if \export
+        .global \name
+    .endif
+ELF     .type   \name, STT_FUNC
+        .func   \name
+\name:
+.endm
+
+func    png_read_filter_row_sub4_neon, export=1
+        ldr             r3,  [r0, #4]           @ rowbytes
+        vmov.i8         d3,  #0
+1:
+        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
+        vadd.u8         d0,  d3,  d4
+        vadd.u8         d1,  d0,  d5
+        vadd.u8         d2,  d1,  d6
+        vadd.u8         d3,  d2,  d7
+        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
+        subs            r3,  r3,  #16
+        bgt             1b
+
+        bx              lr
+endfunc
+
+func    png_read_filter_row_sub3_neon, export=1
+        ldr             r3,  [r0, #4]           @ rowbytes
+        vmov.i8         d3,  #0
+        mov             r0,  r1
+        mov             r2,  #3
+        mov             r12, #12
+        vld1.8          {q11},    [r0], r12
+1:
+        vext.8          d5,  d22, d23, #3
+        vadd.u8         d0,  d3,  d22
+        vext.8          d6,  d22, d23, #6
+        vadd.u8         d1,  d0,  d5
+        vext.8          d7,  d23, d23, #1
+        vld1.8          {q11},    [r0], r12
+        vst1.32         {d0[0]},  [r1,:32], r2
+        vadd.u8         d2,  d1,  d6
+        vst1.32         {d1[0]},  [r1], r2
+        vadd.u8         d3,  d2,  d7
+        vst1.32         {d2[0]},  [r1], r2
+        vst1.32         {d3[0]},  [r1], r2
+        subs            r3,  r3,  #12
+        bgt             1b
+
+        bx              lr
+endfunc
+
+func    png_read_filter_row_up_neon, export=1
+        ldr             r3,  [r0, #4]           @ rowbytes
+1:
+        vld1.8          {q0}, [r1,:128]
+        vld1.8          {q1}, [r2,:128]!
+        vadd.u8         q0,  q0,  q1
+        vst1.8          {q0}, [r1,:128]!
+        subs            r3,  r3,  #16
+        bgt             1b
+
+        bx              lr
+endfunc
+
+func    png_read_filter_row_avg4_neon, export=1
+        ldr             r12, [r0, #4]           @ rowbytes
+        vmov.i8         d3,  #0
+1:
+        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
+        vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
+        vhadd.u8        d0,  d3,  d16
+        vadd.u8         d0,  d0,  d4
+        vhadd.u8        d1,  d0,  d17
+        vadd.u8         d1,  d1,  d5
+        vhadd.u8        d2,  d1,  d18
+        vadd.u8         d2,  d2,  d6
+        vhadd.u8        d3,  d2,  d19
+        vadd.u8         d3,  d3,  d7
+        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
+        subs            r12, r12, #16
+        bgt             1b
+
+        bx              lr
+endfunc
+
+func    png_read_filter_row_avg3_neon, export=1
+        push            {r4,lr}
+        ldr             r12, [r0, #4]           @ rowbytes
+        vmov.i8         d3,  #0
+        mov             r0,  r1
+        mov             r4,  #3
+        mov             lr,  #12
+        vld1.8          {q11},    [r0], lr
+1:
+        vld1.8          {q10},    [r2], lr
+        vext.8          d5,  d22, d23, #3
+        vhadd.u8        d0,  d3,  d20
+        vext.8          d17, d20, d21, #3
+        vadd.u8         d0,  d0,  d22
+        vext.8          d6,  d22, d23, #6
+        vhadd.u8        d1,  d0,  d17
+        vext.8          d18, d20, d21, #6
+        vadd.u8         d1,  d1,  d5
+        vext.8          d7,  d23, d23, #1
+        vld1.8          {q11},    [r0], lr
+        vst1.32         {d0[0]},  [r1,:32], r4
+        vhadd.u8        d2,  d1,  d18
+        vst1.32         {d1[0]},  [r1], r4
+        vext.8          d19, d21, d21, #1
+        vadd.u8         d2,  d2,  d6
+        vhadd.u8        d3,  d2,  d19
+        vst1.32         {d2[0]},  [r1], r4
+        vadd.u8         d3,  d3,  d7
+        vst1.32         {d3[0]},  [r1], r4
+        subs            r12, r12, #12
+        bgt             1b
+
+        pop             {r4,pc}
+endfunc
+
+.macro  paeth           rx,  ra,  rb,  rc
+        vaddl.u8        q12, \ra, \rb           @ a + b
+        vaddl.u8        q15, \rc, \rc           @ 2*c
+        vabdl.u8        q13, \rb, \rc           @ pa
+        vabdl.u8        q14, \ra, \rc           @ pb
+        vabd.u16        q15, q12, q15           @ pc
+        vcle.u16        q12, q13, q14           @ pa <= pb
+        vcle.u16        q13, q13, q15           @ pa <= pc
+        vcle.u16        q14, q14, q15           @ pb <= pc
+        vand            q12, q12, q13           @ pa <= pb && pa <= pc
+        vmovn.u16       d28, q14
+        vmovn.u16       \rx, q12
+        vbsl            d28, \rb, \rc
+        vbsl            \rx, \ra, d28
+.endm
+
+func    png_read_filter_row_paeth4_neon, export=1
+        ldr             r12, [r0, #4]           @ rowbytes
+        vmov.i8         d3,  #0
+        vmov.i8         d20, #0
+1:
+        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
+        vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
+        paeth           d0,  d3,  d16, d20
+        vadd.u8         d0,  d0,  d4
+        paeth           d1,  d0,  d17, d16
+        vadd.u8         d1,  d1,  d5
+        paeth           d2,  d1,  d18, d17
+        vadd.u8         d2,  d2,  d6
+        paeth           d3,  d2,  d19, d18
+        vmov            d20, d19
+        vadd.u8         d3,  d3,  d7
+        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
+        subs            r12, r12, #16
+        bgt             1b
+
+        bx              lr
+endfunc
+
+func    png_read_filter_row_paeth3_neon, export=1
+        push            {r4,lr}
+        ldr             r12, [r0, #4]           @ rowbytes
+        vmov.i8         d3,  #0
+        vmov.i8         d4,  #0
+        mov             r0,  r1
+        mov             r4,  #3
+        mov             lr,  #12
+        vld1.8          {q11},    [r0], lr
+1:
+        vld1.8          {q10},    [r2], lr
+        paeth           d0,  d3,  d20, d4
+        vext.8          d5,  d22, d23, #3
+        vadd.u8         d0,  d0,  d22
+        vext.8          d17, d20, d21, #3
+        paeth           d1,  d0,  d17, d20
+        vst1.32         {d0[0]},  [r1,:32], r4
+        vext.8          d6,  d22, d23, #6
+        vadd.u8         d1,  d1,  d5
+        vext.8          d18, d20, d21, #6
+        paeth           d2,  d1,  d18, d17
+        vext.8          d7,  d23, d23, #1
+        vld1.8          {q11},    [r0], lr
+        vst1.32         {d1[0]},  [r1], r4
+        vadd.u8         d2,  d2,  d6
+        vext.8          d19, d21, d21, #1
+        paeth           d3,  d2,  d19, d18
+        vst1.32         {d2[0]},  [r1], r4
+        vmov            d4,  d19
+        vadd.u8         d3,  d3,  d7
+        vst1.32         {d3[0]},  [r1], r4
+        subs            r12, r12, #12
+        bgt             1b
+
+        pop             {r4,pc}
+endfunc
 #endif /* PNG_ARM_NEON_OPT > 0 */
-#endif /* PNG_ARM_NEON_IMPLEMENTATION == 2 */
+#endif /* PNG_ARM_NEON_IMPLEMENTATION == 2 (assembler) */
 #endif /* READ */
--- a/arm/filter_neon_intrinsics.c
+++ b/arm/filter_neon_intrinsics.c
@@ -1,10 +1,12 @@
+
 /* filter_neon_intrinsics.c - NEON optimised filter functions
 *
- * Copyright (c) 2018 Cosmin Truta
 * Copyright (c) 2014,2016 Glenn Randers-Pehrson
 * Written by James Yu <james.yu at linaro.org>, October 2013.
 * Based on filter_neon.S, written by Mans Rullgard, 2011.
 *
+ * Last changed in libpng 1.6.22 [May 26, 2016]
+ *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
@@ -17,11 +19,7 @@
 /* This code requires -mfpu=neon on the command line: */
 #if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */

-#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64)
-#  include <arm64_neon.h>
-#else
-#  include <arm_neon.h>
-#endif
+#include <arm_neon.h>

 /* libpng row pointers are not necessarily aligned to any particular boundary,
 * however this code will only work with appropriate alignment.  arm/arm_init.c
@@ -35,11 +33,6 @@
 * 'type'.  This is written this way just to hide the GCC strict aliasing
 * warning; note that the code is safe because there never is an alias between
 * the input and output pointers.
- *
- * When compiling with MSVC ARM64, the png_ldr macro can't be passed directly
- * to vst4_lane_u32, because of an internal compiler error inside MSVC.
- * To avoid this compiler bug, we use a temporary variable (vdest_val) to store
- * the result of png_ldr.
 */
 #define png_ldr(type,pointer)\
   (temp_pointer = png_ptr(type,pointer), *temp_pointer)
@@ -132,15 +125,12 @@ png_read_filter_row_sub4_neon(png_row_infop row_info, png_bytep row,
      uint8x8x4_t *vrpt = png_ptr(uint8x8x4_t,&vtmp);
      uint8x8x4_t vrp = *vrpt;
      uint32x2x4_t *temp_pointer;
-      uint32x2x4_t vdest_val;

      vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]);
      vdest.val[1] = vadd_u8(vdest.val[0], vrp.val[1]);
      vdest.val[2] = vadd_u8(vdest.val[1], vrp.val[2]);
      vdest.val[3] = vadd_u8(vdest.val[2], vrp.val[3]);
-
-      vdest_val = png_ldr(uint32x2x4_t, &vdest);
-      vst4_lane_u32(png_ptr(uint32_t,rp), vdest_val, 0);
+      vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0);
   }

   PNG_UNUSED(prev_row)
@@ -233,7 +223,6 @@ png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row,
      uint8x8x4_t *vrpt, *vppt;
      uint8x8x4_t vrp, vpp;
      uint32x2x4_t *temp_pointer;
-      uint32x2x4_t vdest_val;

      vtmp = vld4_u32(png_ptr(uint32_t,rp));
      vrpt = png_ptr(uint8x8x4_t,&vtmp);
@@ -251,8 +240,7 @@ png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row,
      vdest.val[3] = vhadd_u8(vdest.val[2], vpp.val[3]);
      vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]);

-      vdest_val = png_ldr(uint32x2x4_t, &vdest);
-      vst4_lane_u32(png_ptr(uint32_t,rp), vdest_val, 0);
+      vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0);
   }
 }

@@ -371,7 +359,6 @@ png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row,
      uint8x8x4_t *vrpt, *vppt;
      uint8x8x4_t vrp, vpp;
      uint32x2x4_t *temp_pointer;
-      uint32x2x4_t vdest_val;

      vtmp = vld4_u32(png_ptr(uint32_t,rp));
      vrpt = png_ptr(uint8x8x4_t,&vtmp);
@@ -391,8 +378,7 @@ png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row,

      vlast = vpp.val[3];

-      vdest_val = png_ldr(uint32x2x4_t, &vdest);
-      vst4_lane_u32(png_ptr(uint32_t,rp), vdest_val, 0);
+      vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0);
   }
 }

--- a/arm/palette_neon_intrinsics.c
+++ b/arm/palette_neon_intrinsics.c
@@ -1,150 +0,0 @@
-/* palette_neon_intrinsics.c - NEON optimised palette expansion functions
- *
- * Copyright (c) 2018-2019 Cosmin Truta
- * Copyright (c) 2017-2018 Arm Holdings. All rights reserved.
- * Written by Richard Townsend <Richard.Townsend@arm.com>, February 2017.
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "../pngpriv.h"
-
-#if PNG_ARM_NEON_IMPLEMENTATION == 1
-
-#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64)
-#  include <arm64_neon.h>
-#else
-#  include <arm_neon.h>
-#endif
-
-/* Build an RGBA8 palette from the separate RGB and alpha palettes. */
-void
-png_riffle_palette_neon(png_structrp png_ptr)
-{
-   png_const_colorp palette = png_ptr->palette;
-   png_bytep riffled_palette = png_ptr->riffled_palette;
-   png_const_bytep trans_alpha = png_ptr->trans_alpha;
-   int num_trans = png_ptr->num_trans;
-   int i;
-
-   /* Initially black, opaque. */
-   uint8x16x4_t w = {{
-      vdupq_n_u8(0x00),
-      vdupq_n_u8(0x00),
-      vdupq_n_u8(0x00),
-      vdupq_n_u8(0xff),
-   }};
-
-   png_debug(1, "in png_riffle_palette_neon");
-
-   /* First, riffle the RGB colours into an RGBA8 palette.
-    * The alpha component is set to opaque for now.
-    */
-   for (i = 0; i < 256; i += 16)
-   {
-      uint8x16x3_t v = vld3q_u8((png_const_bytep)(palette + i));
-      w.val[0] = v.val[0];
-      w.val[1] = v.val[1];
-      w.val[2] = v.val[2];
-      vst4q_u8(riffled_palette + (i << 2), w);
-   }
-
-   /* Fix up the missing transparency values. */
-   for (i = 0; i < num_trans; i++)
-      riffled_palette[(i << 2) + 3] = trans_alpha[i];
-}
-
-/* Expands a palettized row into RGBA8. */
-int
-png_do_expand_palette_rgba8_neon(png_structrp png_ptr, png_row_infop row_info,
-    png_const_bytep row, png_bytepp ssp, png_bytepp ddp)
-{
-   png_uint_32 row_width = row_info->width;
-   const png_uint_32 *riffled_palette =
-      png_aligncastconst(png_const_uint_32p, png_ptr->riffled_palette);
-   const png_uint_32 pixels_per_chunk = 4;
-   png_uint_32 i;
-
-   png_debug(1, "in png_do_expand_palette_rgba8_neon");
-
-   PNG_UNUSED(row)
-   if (row_width < pixels_per_chunk)
-      return 0;
-
-   /* This function originally gets the last byte of the output row.
-    * The NEON part writes forward from a given position, so we have
-    * to seek this back by 4 pixels x 4 bytes.
-    */
-   *ddp = *ddp - ((pixels_per_chunk * sizeof(png_uint_32)) - 1);
-
-   for (i = 0; i < row_width; i += pixels_per_chunk)
-   {
-      uint32x4_t cur;
-      png_bytep sp = *ssp - i, dp = *ddp - (i << 2);
-      cur = vld1q_dup_u32 (riffled_palette + *(sp - 3));
-      cur = vld1q_lane_u32(riffled_palette + *(sp - 2), cur, 1);
-      cur = vld1q_lane_u32(riffled_palette + *(sp - 1), cur, 2);
-      cur = vld1q_lane_u32(riffled_palette + *(sp - 0), cur, 3);
-      vst1q_u32((void *)dp, cur);
-   }
-   if (i != row_width)
-   {
-      /* Remove the amount that wasn't processed. */
-      i -= pixels_per_chunk;
-   }
-
-   /* Decrement output pointers. */
-   *ssp = *ssp - i;
-   *ddp = *ddp - (i << 2);
-   return i;
-}
-
-/* Expands a palettized row into RGB8. */
-int
-png_do_expand_palette_rgb8_neon(png_structrp png_ptr, png_row_infop row_info,
-    png_const_bytep row, png_bytepp ssp, png_bytepp ddp)
-{
-   png_uint_32 row_width = row_info->width;
-   png_const_bytep palette = (png_const_bytep)png_ptr->palette;
-   const png_uint_32 pixels_per_chunk = 8;
-   png_uint_32 i;
-
-   png_debug(1, "in png_do_expand_palette_rgb8_neon");
-
-   PNG_UNUSED(row)
-   if (row_width <= pixels_per_chunk)
-      return 0;
-
-   /* Seeking this back by 8 pixels x 3 bytes. */
-   *ddp = *ddp - ((pixels_per_chunk * sizeof(png_color)) - 1);
-
-   for (i = 0; i < row_width; i += pixels_per_chunk)
-   {
-      uint8x8x3_t cur;
-      png_bytep sp = *ssp - i, dp = *ddp - ((i << 1) + i);
-      cur = vld3_dup_u8(palette + sizeof(png_color) * (*(sp - 7)));
-      cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 6)), cur, 1);
-      cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 5)), cur, 2);
-      cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 4)), cur, 3);
-      cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 3)), cur, 4);
-      cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 2)), cur, 5);
-      cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 1)), cur, 6);
-      cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 0)), cur, 7);
-      vst3_u8((void *)dp, cur);
-   }
-
-   if (i != row_width)
-   {
-      /* Remove the amount that wasn't processed. */
-      i -= pixels_per_chunk;
-   }
-
-   /* Decrement output pointers. */
-   *ssp = *ssp - i;
-   *ddp = *ddp - ((i << 1) + i);
-   return i;
-}
-
-#endif /* PNG_ARM_NEON_IMPLEMENTATION */
--- a/autogen.sh
+++ b/autogen.sh
@@ -77,14 +77,13 @@ libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in
   config.sub configure depcomp install-sh ltmain.sh missing\
   test-driver"
 #
-# Files generated by versions of autoconf >2.68 or automake >1.13 (i.e. later
+# Files generated by versions of configue >2.68 or automake >1.13 (i.e. later
 # versions than those required by configure.ac):
 libpng_autotools_extra="compile config.h.in~"
 #
 # These are separate because 'maintainer-clean' does not remove them.
-libpng_libtool_files="scripts/autoconf/libtool.m4 scripts/autoconf/ltoptions.m4\
-   scripts/autoconf/ltsugar.m4 scripts/autoconf/ltversion.m4\
-   scripts/autoconf/lt~obsolete.m4"
+libpng_libtool_files="scripts/libtool.m4 scripts/ltoptions.m4\
+   scripts/ltsugar.m4 scripts/ltversion.m4 scripts/lt~obsolete.m4"

 libpng_autotools_dirs="autom4te.cache" # not required
 #
@@ -195,7 +194,7 @@ case "$mode" in
      if test -d .git
      then
         exec >&2
-         echo "ERROR: running autoreconf on an initialized system"
+         echo "ERROR: running autoreconf on an initialized sytem"
         echo "  This is not necessary; it is only necessary to remake the"
         echo "  autotools generated files if Makefile.am or configure.ac"
         echo "  change and make does the right thing with:"
--- a/ci/.shellcheckrc
+++ b/ci/.shellcheckrc
@@ -1,11 +0,0 @@
-# Disable the "expressions don't expand in single quotes, use double quotes"
-# advice. We need the regular expressions to remain uninterpolated.
-disable=SC2016
-
-# Disable the "variable appears unused" warning caused by the use of getopts
-# with an obligatory (but unused) variable name in the main function.
-disable=SC2034
-
-# Disable all the "quote to prevent globbing or word splitting" advice.
-# We need word splitting for well-known variables like MAKEFLAGS and CFLAGS.
-disable=SC2086,SC2206
--- a/ci/LICENSE_MIT.txt
+++ b/ci/LICENSE_MIT.txt
@@ -1,19 +0,0 @@
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/ci/ci_lint.sh
+++ b/ci/ci_lint.sh
@@ -1,142 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit -o pipefail -o posix
-
-# Copyright (c) 2019-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-# shellcheck source=ci/lib/ci.lib.sh
-source "$(dirname "$0")/lib/ci.lib.sh"
-cd "$CI_TOPLEVEL_DIR"
-
-# Initialize the global constants CI_{...}{CHECK,CHECKER,LINT}.
-CI_SHELLCHECK="${CI_SHELLCHECK:-shellcheck}"
-CI_EDITORCONFIG_CHECKER="${CI_EDITORCONFIG_CHECKER:-editorconfig-checker}"
-CI_YAMLLINT="${CI_YAMLLINT:-yamllint}"
-
-# Initialize the global lint status.
-CI_LINT_STATUS=0
-
-function ci_init_lint {
-    ci_info "## START OF LINTING ##"
-    local my_program
-    # Complete the initialization of CI_SHELLCHECK.
-    # Set it to the empty string if the shellcheck program is unavailable.
-    my_program="$(command -v "$CI_SHELLCHECK")" || {
-        ci_warn "program not found: '$CI_SHELLCHECK'"
-    }
-    CI_SHELLCHECK="$my_program"
-    # Complete the initialization of CI_EDITORCONFIG_CHECKER.
-    # Set it to the empty string if the editorconfig-checker program is unavailable.
-    my_program="$(command -v "$CI_EDITORCONFIG_CHECKER")" || {
-        ci_warn "program not found: '$CI_EDITORCONFIG_CHECKER'"
-    }
-    CI_EDITORCONFIG_CHECKER="$my_program"
-    # Complete the initialization of CI_YAMLLINT.
-    # Set it to the empty string if the yamllint program is unavailable.
-    my_program="$(command -v "$CI_YAMLLINT")" || {
-        ci_warn "program not found: '$CI_YAMLLINT'"
-    }
-    CI_YAMLLINT="$my_program"
-}
-
-function ci_finish_lint {
-    ci_info "## END OF LINTING ##"
-    if [[ $CI_LINT_STATUS -eq 0 ]]
-    then
-        ci_info "## SUCCESS ##"
-    else
-        ci_info "linting failed"
-    fi
-    return "$CI_LINT_STATUS"
-}
-
-function ci_lint_ci_scripts {
-    [[ -x $CI_SHELLCHECK ]] || {
-        ci_warn "## NOT LINTING: CI scripts ##"
-        return 0
-    }
-    ci_info "## LINTING: CI scripts ##"
-    ci_spawn "$CI_SHELLCHECK" --version
-    find ./ci -maxdepth 1 -name "*.sh" | {
-        local my_file
-        while IFS="" read -r my_file
-        do
-            ci_spawn "$CI_SHELLCHECK" -x "$my_file" || {
-                # Linting failed.
-                return 1
-            }
-        done
-    }
-}
-
-function ci_lint_text_files {
-    [[ -x $CI_EDITORCONFIG_CHECKER ]] || {
-        ci_warn "## NOT LINTING: text files ##"
-        return 0
-    }
-    ci_info "## LINTING: text files ##"
-    ci_spawn "$CI_EDITORCONFIG_CHECKER" --version
-    ci_spawn "$CI_EDITORCONFIG_CHECKER" --config .editorconfig-checker.json || {
-        # Linting failed.
-        return 1
-    }
-}
-
-function ci_lint_yaml_files {
-    [[ -x $CI_YAMLLINT ]] || {
-        ci_warn "## NOT LINTING: YAML files ##"
-        return 0
-    }
-    ci_info "## LINTING: YAML files ##"
-    ci_spawn "$CI_YAMLLINT" --version
-    # Considering that the YAML format is an extension of the JSON format,
-    # we can lint both the YAML files and the plain JSON files here.
-    find . \( -iname "*.yml" -o -iname "*.yaml" -o -iname "*.json" \) -not -path "./out/*" | {
-        local my_file
-        while IFS="" read -r my_file
-        do
-            ci_spawn "$CI_YAMLLINT" --strict "$my_file" || {
-                # Linting failed.
-                return 1
-            }
-        done
-    }
-}
-
-function ci_lint {
-    ci_init_lint
-    ci_lint_ci_scripts || CI_LINT_STATUS=1
-    ci_lint_text_files || CI_LINT_STATUS=1
-    ci_lint_yaml_files || CI_LINT_STATUS=1
-    # TODO: ci_lint_png_files, etc.
-    ci_finish_lint
-}
-
-function usage {
-    echo "usage: $CI_SCRIPT_NAME [<options>]"
-    echo "options: -?|-h|--help"
-    exit "${@:-0}"
-}
-
-function main {
-    local opt
-    while getopts ":" opt
-    do
-        # This ain't a while-loop. It only pretends to be.
-        [[ $1 == -[?h]* || $1 == --help || $1 == --help=* ]] && usage 0
-        ci_err "unknown option: '$1'"
-    done
-    shift $((OPTIND - 1))
-    [[ $# -eq 0 ]] || {
-        echo >&2 "error: unexpected argument: '$1'"
-        usage 2
-    }
-    # And... go!
-    ci_lint
-}
-
-main "$@"
--- a/ci/ci_shellify.sh
+++ b/ci/ci_shellify.sh
@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit -o pipefail -o posix
-
-# Copyright (c) 2019-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-# shellcheck source=ci/lib/ci.lib.sh
-source "$(dirname "$0")/lib/ci.lib.sh"
-cd "$CI_TOPLEVEL_DIR"
-
-function ci_shellify_c {
-    # Convert C preprocessor text, specifically originating
-    # from png.h, to shell scripting text.
-    # Select only the easy-to-parse definitions of PNG_LIBPNG_*.
-    sed -n -e '/^\# *define * PNG_LIBPNG_[^ ]* * ["0-9A-Za-z_]/ p' |
-        sed -e 's/^\# *define * PNG\([^ ]*\) * \([^ ]*\)/PNG\1=\2/' \
-            -e 's/=PNG\([0-9A-Za-z_]*\)/=\${PNG\1}/' \
-            -e 's/^\([^ ]*=[^ ]*\).*$/export \1;/'
-}
-
-function ci_shellify_autoconf {
-    # Convert autoconf (M4) text, specifically originating
-    # from configure.ac, to shell scripting text.
-    # Select only the easy-to-parse definitions of PNGLIB_*.
-    sed -n -e '/^ *PNGLIB_[^ ]*=[$"0-9A-Za-z_]/ p' |
-        sed -e 's/^ *PNG\([0-9A-Za-z_]*\)=\([^# ]*\).*$/PNG\1=\2/' \
-            -e 's/^\([^ ]*=[^ ]*\).*$/export \1;/'
-}
-
-function ci_shellify_cmake {
-    # Convert CMake lists text, specifically originating
-    # from CMakeLists.txt, to shell scripting text.
-    # Select only the easy-to-parse definitions of PNGLIB_*.
-    sed -n -e '/^ *set *(PNGLIB_[^ ]* * [$"0-9A-Za-z_].*)/ p' |
-        sed -e 's/^ *set *(PNG\([^ ]*\) * \([^() ]*\)).*$/PNG\1=\2/' \
-            -e 's/^\([^ ]*=[^ ]*\).*$/export \1;/'
-}
-
-function ci_shellify {
-    local arg filename
-    for arg in "$@"
-    do
-        test -f "$arg" || ci_err "no such file: '$arg'"
-        filename="$(basename -- "$arg")"
-        case "$filename" in
-        ( *.[ch] )
-            [[ $filename == png.h ]] || {
-                ci_err "unable to shellify: '$filename' (expecting: 'png.h')"
-            }
-            ci_shellify_c <"$arg" ;;
-        ( config* | *.ac )
-            [[ $filename == configure.ac ]] || {
-                ci_err "unable to shellify: '$filename' (expecting: 'configure.ac')"
-            }
-            ci_shellify_autoconf <"$arg" ;;
-        ( *CMake* | *cmake* | *.txt )
-            [[ $filename == [Cc][Mm]ake[Ll]ists.txt ]] || {
-                ci_err "unable to shellify: '$filename' (expecting: 'CMakeLists.txt')"
-            }
-            ci_shellify_cmake <"$arg" ;;
-        ( * )
-            ci_err "unable to shellify: '$arg'" ;;
-        esac
-    done
-}
-
-function usage {
-    echo "usage: $CI_SCRIPT_NAME [<options>] <files>..."
-    echo "options: -?|-h|--help"
-    echo "files: png.h|configure.ac|CMakeLists.txt"
-    exit "${@:-0}"
-}
-
-function main {
-    local opt
-    while getopts ":" opt
-    do
-        # This ain't a while-loop. It only pretends to be.
-        [[ $1 == -[?h]* || $1 == --help || $1 == --help=* ]] && usage 0
-        ci_err "unknown option: '$1'"
-    done
-    shift $((OPTIND - 1))
-    [[ $# -eq 0 ]] && usage 2
-    # And... go!
-    ci_shellify "$@"
-}
-
-main "$@"
--- a/ci/ci_verify_cmake.sh
+++ b/ci/ci_verify_cmake.sh
@@ -1,206 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit -o pipefail -o posix
-
-# Copyright (c) 2019-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-# shellcheck source=ci/lib/ci.lib.sh
-source "$(dirname "$0")/lib/ci.lib.sh"
-cd "$CI_TOPLEVEL_DIR"
-
-CI_SRC_DIR="$CI_TOPLEVEL_DIR"
-CI_OUT_DIR="$CI_TOPLEVEL_DIR/out"
-CI_BUILD_DIR="$CI_OUT_DIR/ci_verify_cmake.$CI_TARGET_SYSTEM.$CI_TARGET_ARCH.build"
-CI_INSTALL_DIR="$CI_OUT_DIR/ci_verify_cmake.$CI_TARGET_SYSTEM.$CI_TARGET_ARCH.install"
-
-function ci_init_build {
-    # Ensure that the mandatory variables are initialized.
-    CI_CMAKE="${CI_CMAKE:-cmake}"
-    CI_CTEST="${CI_CTEST:-ctest}"
-    CI_CMAKE_BUILD_TYPE="${CI_CMAKE_BUILD_TYPE:-Release}"
-    if [[ $CI_CMAKE_GENERATOR == "Visual Studio"* ]]
-    then
-        # Clean up incidental mixtures of Windows and Bash-on-Windows
-        # environment variables, to avoid confusing MSBuild.
-        [[ $TEMP && ( $Temp || $temp ) ]] && unset TEMP
-        [[ $TMP && ( $Tmp || $tmp ) ]] && unset TMP
-        # Ensure that CI_CMAKE_GENERATOR_PLATFORM is initialized for this generator.
-        [[ $CI_CMAKE_GENERATOR_PLATFORM ]] || {
-            ci_err_internal "missing \$CI_CMAKE_GENERATOR_PLATFORM"
-        }
-    elif [[ -x $(command -v ninja) ]]
-    then
-        CI_CMAKE_GENERATOR="${CI_CMAKE_GENERATOR:-Ninja}"
-    fi
-}
-
-function ci_trace_build {
-    ci_info "## START OF CONFIGURATION ##"
-    ci_info "build arch: $CI_BUILD_ARCH"
-    ci_info "build system: $CI_BUILD_SYSTEM"
-    [[ "$CI_TARGET_SYSTEM.$CI_TARGET_ARCH" != "$CI_BUILD_SYSTEM.$CI_BUILD_ARCH" ]] && {
-        ci_info "target arch: $CI_TARGET_ARCH"
-        ci_info "target system: $CI_TARGET_SYSTEM"
-    }
-    ci_info "source directory: $CI_SRC_DIR"
-    ci_info "build directory: $CI_BUILD_DIR"
-    ci_info "install directory: $CI_INSTALL_DIR"
-    ci_info "environment option: \$CI_CMAKE: '$CI_CMAKE'"
-    ci_info "environment option: \$CI_CMAKE_GENERATOR: '$CI_CMAKE_GENERATOR'"
-    ci_info "environment option: \$CI_CMAKE_GENERATOR_PLATFORM: '$CI_CMAKE_GENERATOR_PLATFORM'"
-    ci_info "environment option: \$CI_CMAKE_BUILD_TYPE: '$CI_CMAKE_BUILD_TYPE'"
-    ci_info "environment option: \$CI_CMAKE_BUILD_FLAGS: '$CI_CMAKE_BUILD_FLAGS'"
-    ci_info "environment option: \$CI_CMAKE_TOOLCHAIN_FILE: '$CI_CMAKE_TOOLCHAIN_FILE'"
-    ci_info "environment option: \$CI_CMAKE_VARS: '$CI_CMAKE_VARS'"
-    ci_info "environment option: \$CI_CTEST: '$CI_CTEST'"
-    ci_info "environment option: \$CI_CTEST_FLAGS: '$CI_CTEST_FLAGS'"
-    ci_info "environment option: \$CI_CC: '$CI_CC'"
-    ci_info "environment option: \$CI_CC_FLAGS: '$CI_CC_FLAGS'"
-    ci_info "environment option: \$CI_AR: '$CI_AR'"
-    ci_info "environment option: \$CI_RANLIB: '$CI_RANLIB'"
-    ci_info "environment option: \$CI_SANITIZERS: '$CI_SANITIZERS'"
-    ci_info "environment option: \$CI_FORCE: '$CI_FORCE'"
-    ci_info "environment option: \$CI_NO_TEST: '$CI_NO_TEST'"
-    ci_info "environment option: \$CI_NO_INSTALL: '$CI_NO_INSTALL'"
-    ci_info "environment option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'"
-    ci_info "executable: \$CI_CMAKE: $(command -V "$CI_CMAKE")"
-    ci_info "executable: \$CI_CTEST: $(command -V "$CI_CTEST")"
-    [[ $CI_CC ]] && {
-        ci_info "executable: \$CI_CC: $(command -V "$CI_CC")"
-    }
-    [[ $CI_AR ]] && {
-        ci_info "executable: \$CI_AR: $(command -V "$CI_AR")"
-    }
-    [[ $CI_RANLIB ]] && {
-        ci_info "executable: \$CI_RANLIB: $(command -V "$CI_RANLIB")"
-    }
-    ci_info "## END OF CONFIGURATION ##"
-}
-
-function ci_cleanup_old_build {
-    ci_info "## START OF PRE-BUILD CLEANUP ##"
-    [[ ! -e $CI_BUILD_DIR && ! -e $CI_INSTALL_DIR ]] || {
-        ci_spawn rm -fr "$CI_BUILD_DIR"
-        ci_spawn rm -fr "$CI_INSTALL_DIR"
-    }
-    ci_info "## END OF PRE-BUILD CLEANUP ##"
-}
-
-function ci_build {
-    ci_info "## START OF BUILD ##"
-    # Adjust the CI environment variables, as needed.
-    CI_CMAKE="$(command -v "$CI_CMAKE")" || ci_err "bad or missing \$CI_CMAKE"
-    ci_spawn "$CI_CMAKE" --version
-    CI_CTEST="$(command -v "$CI_CTEST")" || ci_err "bad or missing \$CI_CTEST"
-    ci_spawn "$CI_CTEST" --version
-    [[ $CI_CMAKE_GENERATOR == *"Ninja"* ]] && {
-        CI_NINJA="$(command -v ninja)" || ci_err "bad or missing ninja, no pun intended"
-        ci_spawn "$CI_NINJA" --version
-    }
-    [[ $CI_AR ]] && {
-        # Use the full path of CI_AR to work around a mysterious CMake error.
-        CI_AR="$(command -v "$CI_AR")" || ci_err "bad or missing \$CI_AR"
-    }
-    [[ $CI_RANLIB ]] && {
-        # Use the full path of CI_RANLIB to work around a mysterious CMake error.
-        CI_RANLIB="$(command -v "$CI_RANLIB")" || ci_err "bad or missing \$CI_RANLIB"
-    }
-    # Export the CMake environment variables.
-    [[ $CI_CMAKE_GENERATOR ]] && {
-        ci_spawn export CMAKE_GENERATOR="$CI_CMAKE_GENERATOR"
-    }
-    [[ $CI_CMAKE_GENERATOR_PLATFORM ]] && {
-        ci_spawn export CMAKE_GENERATOR_PLATFORM="$CI_CMAKE_GENERATOR_PLATFORM"
-    }
-    # Initialize and populate the local arrays.
-    local all_cmake_vars=()
-    local all_cmake_build_flags=()
-    local all_ctest_flags=()
-    [[ $CI_CMAKE_TOOLCHAIN_FILE ]] && {
-        all_cmake_vars+=("-DCMAKE_TOOLCHAIN_FILE=$CI_CMAKE_TOOLCHAIN_FILE")
-    }
-    [[ $CI_CC ]] && {
-        all_cmake_vars+=("-DCMAKE_C_COMPILER=$CI_CC")
-    }
-    [[ $CI_CC_FLAGS || $CI_SANITIZERS ]] && {
-        [[ $CI_SANITIZERS ]] && CI_CC_FLAGS+="${CI_CC_FLAGS:+" "}-fsanitize=$CI_SANITIZERS"
-        all_cmake_vars+=("-DCMAKE_C_FLAGS=$CI_CC_FLAGS")
-    }
-    [[ $CI_AR ]] && {
-        all_cmake_vars+=("-DCMAKE_AR=$CI_AR")
-    }
-    [[ $CI_RANLIB ]] && {
-        all_cmake_vars+=("-DCMAKE_RANLIB=$CI_RANLIB")
-    }
-    all_cmake_vars+=("-DCMAKE_BUILD_TYPE=$CI_CMAKE_BUILD_TYPE")
-    all_cmake_vars+=("-DCMAKE_VERBOSE_MAKEFILE=ON")
-    all_cmake_vars+=($CI_CMAKE_VARS)
-    all_cmake_build_flags+=($CI_CMAKE_BUILD_FLAGS)
-    all_ctest_flags+=($CI_CTEST_FLAGS)
-    # And... build!
-    ci_spawn mkdir -p "$CI_BUILD_DIR"
-    # Spawn "cmake ...".
-    ci_spawn "$CI_CMAKE" -B "$CI_BUILD_DIR" \
-                         -S . \
-                         -DCMAKE_INSTALL_PREFIX="$CI_INSTALL_DIR" \
-                         "${all_cmake_vars[@]}"
-    # Spawn "cmake --build ...".
-    ci_spawn "$CI_CMAKE" --build "$CI_BUILD_DIR" \
-                         --config "$CI_CMAKE_BUILD_TYPE" \
-                         "${all_cmake_build_flags[@]}"
-    ci_expr $((CI_NO_TEST)) || {
-        # Spawn "ctest" if testing is not disabled.
-        ci_spawn pushd "$CI_BUILD_DIR"
-        ci_spawn "$CI_CTEST" --build-config "$CI_CMAKE_BUILD_TYPE" \
-                             "${all_ctest_flags[@]}"
-        ci_spawn popd
-    }
-    ci_expr $((CI_NO_INSTALL)) || {
-        # Spawn "cmake --build ... --target install" if installation is not disabled.
-        ci_spawn "$CI_CMAKE" --build "$CI_BUILD_DIR" \
-                             --config "$CI_CMAKE_BUILD_TYPE" \
-                             --target install \
-                             "${all_cmake_build_flags[@]}"
-    }
-    ci_expr $((CI_NO_CLEAN)) || {
-        # Spawn "make --build ... --target clean" if cleaning is not disabled.
-        ci_spawn "$CI_CMAKE" --build "$CI_BUILD_DIR" \
-                             --config "$CI_CMAKE_BUILD_TYPE" \
-                             --target clean \
-                             "${all_cmake_build_flags[@]}"
-    }
-    ci_info "## END OF BUILD ##"
-}
-
-function usage {
-    echo "usage: $CI_SCRIPT_NAME [<options>]"
-    echo "options: -?|-h|--help"
-    exit "${@:-0}"
-}
-
-function main {
-    local opt
-    while getopts ":" opt
-    do
-        # This ain't a while-loop. It only pretends to be.
-        [[ $1 == -[?h]* || $1 == --help || $1 == --help=* ]] && usage 0
-        ci_err "unknown option: '$1'"
-    done
-    shift $((OPTIND - 1))
-    # And... go!
-    ci_init_build
-    ci_trace_build
-    [[ $# -eq 0 ]] || {
-        echo >&2 "error: unexpected argument: '$1'"
-        echo >&2 "note: this program accepts environment options only"
-        usage 2
-    }
-    ci_cleanup_old_build
-    ci_build
-}
-
-main "$@"
--- a/ci/ci_verify_configure.sh
+++ b/ci/ci_verify_configure.sh
@@ -1,179 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit -o pipefail -o posix
-
-# Copyright (c) 2019-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-# shellcheck source=ci/lib/ci.lib.sh
-source "$(dirname "$0")/lib/ci.lib.sh"
-cd "$CI_TOPLEVEL_DIR"
-
-CI_SRC_DIR="$CI_TOPLEVEL_DIR"
-CI_OUT_DIR="$CI_TOPLEVEL_DIR/out"
-CI_BUILD_DIR="$CI_OUT_DIR/ci_verify_configure.$CI_TARGET_SYSTEM.$CI_TARGET_ARCH.build"
-CI_INSTALL_DIR="$CI_OUT_DIR/ci_verify_configure.$CI_TARGET_SYSTEM.$CI_TARGET_ARCH.install"
-
-function ci_init_build {
-    # Ensure that the mandatory variables are initialized.
-    CI_MAKE="${CI_MAKE:-make}"
-    [[ "$CI_TARGET_SYSTEM.$CI_TARGET_ARCH" != "$CI_BUILD_SYSTEM.$CI_BUILD_ARCH" ]] || {
-        # For native builds, set CI_CC to "cc" by default if the cc command is available.
-        # The configure script defaults CC to "gcc", which is not always a good idea.
-        [[ -x $(command -v cc) ]] && CI_CC="${CI_CC:-cc}"
-    }
-    # Ensure that the CI_ variables that cannot be customized reliably are not initialized.
-    [[ ! $CI_CONFIGURE_VARS ]] || {
-        ci_err "unsupported: \$CI_CONFIGURE_VARS='$CI_CONFIGURE_VARS'"
-    }
-    [[ ! $CI_MAKE_VARS ]] || {
-        ci_err "unsupported: \$CI_MAKE_VARS='$CI_MAKE_VARS'"
-    }
-}
-
-function ci_trace_build {
-    ci_info "## START OF CONFIGURATION ##"
-    ci_info "build arch: $CI_BUILD_ARCH"
-    ci_info "build system: $CI_BUILD_SYSTEM"
-    [[ "$CI_TARGET_SYSTEM.$CI_TARGET_ARCH" != "$CI_BUILD_SYSTEM.$CI_BUILD_ARCH" ]] && {
-        ci_info "target arch: $CI_TARGET_ARCH"
-        ci_info "target system: $CI_TARGET_SYSTEM"
-    }
-    ci_info "source directory: $CI_SRC_DIR"
-    ci_info "build directory: $CI_BUILD_DIR"
-    ci_info "install directory: $CI_INSTALL_DIR"
-    ci_info "environment option: \$CI_CONFIGURE_FLAGS: '$CI_CONFIGURE_FLAGS'"
-    ci_info "environment option: \$CI_MAKE: '$CI_MAKE'"
-    ci_info "environment option: \$CI_MAKE_FLAGS: '$CI_MAKE_FLAGS'"
-    ci_info "environment option: \$CI_CC: '$CI_CC'"
-    ci_info "environment option: \$CI_CC_FLAGS: '$CI_CC_FLAGS'"
-    ci_info "environment option: \$CI_CPP: '$CI_CPP'"
-    ci_info "environment option: \$CI_CPP_FLAGS: '$CI_CPP_FLAGS'"
-    ci_info "environment option: \$CI_AR: '$CI_AR'"
-    ci_info "environment option: \$CI_RANLIB: '$CI_RANLIB'"
-    ci_info "environment option: \$CI_LD: '$CI_LD'"
-    ci_info "environment option: \$CI_LD_FLAGS: '$CI_LD_FLAGS'"
-    ci_info "environment option: \$CI_SANITIZERS: '$CI_SANITIZERS'"
-    ci_info "environment option: \$CI_FORCE: '$CI_FORCE'"
-    ci_info "environment option: \$CI_NO_TEST: '$CI_NO_TEST'"
-    ci_info "environment option: \$CI_NO_INSTALL: '$CI_NO_INSTALL'"
-    ci_info "environment option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'"
-    ci_info "executable: \$CI_MAKE: $(command -V "$CI_MAKE")"
-    [[ $CI_CC ]] && {
-        ci_info "executable: \$CI_CC: $(command -V "$CI_CC")"
-    }
-    [[ $CI_CPP ]] && {
-        ci_info "executable: \$CI_CPP: $(command -V "$CI_CPP")"
-    }
-    [[ $CI_AR ]] && {
-        ci_info "executable: \$CI_AR: $(command -V "$CI_AR")"
-    }
-    [[ $CI_RANLIB ]] && {
-        ci_info "executable: \$CI_RANLIB: $(command -V "$CI_RANLIB")"
-    }
-    [[ $CI_LD ]] && {
-        ci_info "executable: \$CI_LD: $(command -V "$CI_LD")"
-    }
-    ci_info "## END OF CONFIGURATION ##"
-}
-
-function ci_cleanup_old_build {
-    ci_info "## START OF PRE-BUILD CLEANUP ##"
-    [[ ! -e $CI_BUILD_DIR && ! -e $CI_INSTALL_DIR ]] || {
-        ci_spawn rm -fr "$CI_BUILD_DIR"
-        ci_spawn rm -fr "$CI_INSTALL_DIR"
-    }
-    [[ ! -e "$CI_SRC_DIR/config.status" ]] || {
-        ci_warn "unexpected build configuration file: '$CI_SRC_DIR/config.status'"
-        if ci_expr $((CI_FORCE))
-        then
-            # Delete the old config and (possibly) the old build.
-            ci_info "note: forcing an in-tree build cleanup"
-            if [[ -f $CI_SRC_DIR/Makefile ]]
-            then
-                ci_spawn make -C "$CI_SRC_DIR" distclean
-            else
-                ci_spawn rm -fr "$CI_SRC_DIR"/config.{log,status}
-            fi
-        else
-            # Alert the user, but do not delete their files.
-            ci_warn "the configure script might fail"
-            ci_info "hint: consider using the option \$CI_FORCE=1"
-        fi
-    }
-    ci_info "## END OF PRE-BUILD CLEANUP ##"
-}
-
-function ci_build {
-    ci_info "## START OF BUILD ##"
-    # Export the configure build environment.
-    [[ $CI_CC ]] && ci_spawn export CC="$CI_CC"
-    [[ $CI_CC_FLAGS ]] && ci_spawn export CFLAGS="$CI_CC_FLAGS"
-    [[ $CI_CPP ]] && ci_spawn export CPP="$CI_CPP"
-    [[ $CI_CPP_FLAGS ]] && ci_spawn export CPPFLAGS="$CI_CPP_FLAGS"
-    [[ $CI_AR ]] && ci_spawn export AR="$CI_AR"
-    [[ $CI_RANLIB ]] && ci_spawn export RANLIB="$CI_RANLIB"
-    [[ $CI_LD ]] && ci_spawn export LD="$CI_LD"
-    [[ $CI_LD_FLAGS ]] && ci_spawn export LDFLAGS="$CI_LD_FLAGS"
-    [[ $CI_SANITIZERS ]] && {
-        ci_spawn export CFLAGS="${CFLAGS:-"-O2"} -fsanitize=$CI_SANITIZERS"
-        ci_spawn export LDFLAGS="${LDFLAGS}${LDFLAGS:+" "}-fsanitize=$CI_SANITIZERS"
-    }
-    # Spawn "autogen.sh" if the configure script is not available.
-    [[ -x "$CI_SRC_DIR/configure" ]] || {
-        ci_spawn "$CI_SRC_DIR/autogen.sh" --maintainer
-    }
-    # And... build!
-    ci_spawn mkdir -p "$CI_BUILD_DIR"
-    ci_spawn cd "$CI_BUILD_DIR"
-    # Spawn "configure".
-    ci_spawn "$CI_SRC_DIR/configure" --prefix="$CI_INSTALL_DIR" $CI_CONFIGURE_FLAGS
-    # Spawn "make".
-    ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS
-    ci_expr $((CI_NO_TEST)) || {
-        # Spawn "make test" if testing is not disabled.
-        ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS test
-    }
-    ci_expr $((CI_NO_INSTALL)) || {
-        # Spawn "make install" if installation is not disabled.
-        ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS install
-    }
-    ci_expr $((CI_NO_CLEAN)) || {
-        # Spawn "make clean" and "make distclean" if cleaning is not disabled.
-        ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS clean
-        ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS distclean
-    }
-    ci_info "## END OF BUILD ##"
-}
-
-function usage {
-    echo "usage: $CI_SCRIPT_NAME [<options>]"
-    echo "options: -?|-h|--help"
-    exit "${@:-0}"
-}
-
-function main {
-    local opt
-    while getopts ":" opt
-    do
-        # This ain't a while-loop. It only pretends to be.
-        [[ $1 == -[?h]* || $1 == --help || $1 == --help=* ]] && usage 0
-        ci_err "unknown option: '$1'"
-    done
-    shift $((OPTIND - 1))
-    # And... go!
-    ci_init_build
-    ci_trace_build
-    [[ $# -eq 0 ]] || {
-        echo >&2 "error: unexpected argument: '$1'"
-        echo >&2 "note: this program accepts environment options only"
-        usage 2
-    }
-    ci_cleanup_old_build
-    ci_build
-}
-
-main "$@"
--- a/ci/ci_verify_makefiles.sh
+++ b/ci/ci_verify_makefiles.sh
@@ -1,197 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit -o pipefail -o posix
-
-# Copyright (c) 2019-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-# shellcheck source=ci/lib/ci.lib.sh
-source "$(dirname "$0")/lib/ci.lib.sh"
-cd "$CI_TOPLEVEL_DIR"
-
-CI_SRC_DIR="$CI_TOPLEVEL_DIR"
-
-function ci_init_build {
-    # Ensure that the mandatory variables are initialized.
-    CI_MAKE="${CI_MAKE:-make}"
-    case "$CI_CC" in
-    ( *clang* )
-        CI_MAKEFILES="${CI_MAKEFILES:-"scripts/makefile.clang"}" ;;
-    ( *gcc* )
-        CI_MAKEFILES="${CI_MAKEFILES:-"scripts/makefile.gcc"}" ;;
-    ( * )
-        CI_MAKEFILES="${CI_MAKEFILES:-"scripts/makefile.std"}" ;;
-    esac
-}
-
-function ci_trace_build {
-    ci_info "## START OF CONFIGURATION ##"
-    ci_info "build arch: $CI_BUILD_ARCH"
-    ci_info "build system: $CI_BUILD_SYSTEM"
-    [[ "$CI_TARGET_SYSTEM.$CI_TARGET_ARCH" != "$CI_BUILD_SYSTEM.$CI_BUILD_ARCH" ]] && {
-        ci_info "target arch: $CI_TARGET_ARCH"
-        ci_info "target system: $CI_TARGET_SYSTEM"
-    }
-    ci_info "source directory: $CI_SRC_DIR"
-    ci_info "environment option: \$CI_MAKEFILES: '$CI_MAKEFILES'"
-    ci_info "environment option: \$CI_MAKE: '$CI_MAKE'"
-    ci_info "environment option: \$CI_MAKE_FLAGS: '$CI_MAKE_FLAGS'"
-    ci_info "environment option: \$CI_MAKE_VARS: '$CI_MAKE_VARS'"
-    ci_info "environment option: \$CI_CC: '$CI_CC'"
-    ci_info "environment option: \$CI_CC_FLAGS: '$CI_CC_FLAGS'"
-    ci_info "environment option: \$CI_CPP: '$CI_CPP'"
-    ci_info "environment option: \$CI_CPP_FLAGS: '$CI_CPP_FLAGS'"
-    ci_info "environment option: \$CI_AR: '$CI_AR'"
-    ci_info "environment option: \$CI_RANLIB: '$CI_RANLIB'"
-    ci_info "environment option: \$CI_LD: '$CI_LD'"
-    ci_info "environment option: \$CI_LD_FLAGS: '$CI_LD_FLAGS'"
-    ci_info "environment option: \$CI_LIBS: '$CI_LIBS'"
-    ci_info "environment option: \$CI_SANITIZERS: '$CI_SANITIZERS'"
-    ci_info "environment option: \$CI_FORCE: '$CI_FORCE'"
-    ci_info "environment option: \$CI_NO_TEST: '$CI_NO_TEST'"
-    ci_info "environment option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'"
-    ci_info "executable: \$CI_MAKE: $(command -V "$CI_MAKE")"
-    [[ $CI_CC ]] && {
-        ci_info "executable: \$CI_CC: $(command -V "$CI_CC")"
-    }
-    [[ $CI_CPP ]] && {
-        ci_info "executable: \$CI_CPP: $(command -V "$CI_CPP")"
-    }
-    [[ $CI_AR ]] && {
-        ci_info "executable: \$CI_AR: $(command -V "$CI_AR")"
-    }
-    [[ $CI_RANLIB ]] && {
-        ci_info "executable: \$CI_RANLIB: $(command -V "$CI_RANLIB")"
-    }
-    [[ $CI_LD ]] && {
-        ci_info "executable: \$CI_LD: $(command -V "$CI_LD")"
-    }
-    ci_info "## END OF CONFIGURATION ##"
-}
-
-function ci_cleanup_old_build {
-    # Any old makefile-based build will most likely leave a mess
-    # of object files behind if interrupted, e.g., via Ctrl+C.
-    # There may be other files behind, depending on what makefile
-    # had been used. We cannot easily enumerate all of those.
-    # Fortunately, for a clean makefiles-based build, it should be
-    # sufficient to remove the old object files only.
-    ci_info "## START OF PRE-BUILD CLEANUP ##"
-    local find_args=(-maxdepth 1 \( -iname "*.o" -o -iname "*.obj" \))
-    [[ ! $(find "$CI_SRC_DIR" "${find_args[@]}" | head -n1) ]] || {
-        ci_warn "unexpected build found in '$CI_SRC_DIR'"
-        if ci_expr $((CI_FORCE))
-        then
-            # Delete the old build.
-            local my_file
-            find "$CI_SRC_DIR" "${find_args[@]}" |
-                while IFS="" read -r my_file
-                do
-                    ci_spawn rm -fr "$my_file"
-                done
-            ci_info "## END OF PRE-BUILD CLEANUP ##"
-        else
-            # Alert the user, but do not delete their existing files,
-            # and do not mess up their existing build.
-            ci_info "hint: consider using the option \$CI_FORCE=1"
-            ci_err "unable to continue"
-        fi
-    }
-}
-
-function ci_build {
-    ci_info "## START OF BUILD ##"
-    # Initialize and populate the local arrays.
-    local all_make_flags=()
-    local all_make_vars=()
-    [[ $CI_MAKE_FLAGS ]] && {
-        all_make_flags+=($CI_MAKE_FLAGS)
-    }
-    [[ $CI_CC ]] && {
-        all_make_vars+=("CC=$CI_CC")
-    }
-    [[ $CI_CC_FLAGS || $CI_SANITIZERS ]] && {
-        [[ $CI_SANITIZERS ]] && CI_CC_FLAGS="${CI_CC_FLAGS:-"-O2"} -fsanitize=$CI_SANITIZERS"
-        all_make_vars+=("CFLAGS=$CI_CC_FLAGS")
-    }
-    [[ $CI_CPP ]] && {
-        all_make_vars+=("CPP=$CI_CPP")
-    }
-    [[ $CI_CPP_FLAGS ]] && {
-        all_make_vars+=("CPPFLAGS=$CI_CPP_FLAGS")
-    }
-    [[ $CI_AR ]] && {
-        all_make_vars+=("AR=$CI_AR")
-    }
-    [[ $CI_RANLIB ]] && {
-        all_make_vars+=("RANLIB=$CI_RANLIB")
-    }
-    [[ $CI_LD ]] && {
-        all_make_vars+=("LD=$CI_LD")
-    }
-    [[ $CI_LD_FLAGS || $CI_SANITIZERS ]] && {
-        [[ $CI_SANITIZERS ]] && CI_LD_FLAGS+="${CI_LD_FLAGS:+" "}-fsanitize=$CI_SANITIZERS"
-        all_make_vars+=("LDFLAGS=$CI_LD_FLAGS")
-    }
-    [[ $CI_LIBS ]] && {
-        all_make_vars+=("LIBS=$CI_LIBS")
-    }
-    all_make_vars+=($CI_MAKE_VARS)
-    # And... build!
-    local my_makefile
-    for my_makefile in $CI_MAKEFILES
-    do
-        ci_info "using makefile: $my_makefile"
-        # Spawn "make".
-        ci_spawn "$CI_MAKE" -f "$my_makefile" \
-                            "${all_make_flags[@]}" \
-                            "${all_make_vars[@]}"
-        ci_expr $((CI_NO_TEST)) || {
-            # Spawn "make test" if testing is not disabled.
-            ci_spawn "$CI_MAKE" -f "$my_makefile" \
-                                "${all_make_flags[@]}" \
-                                "${all_make_vars[@]}" \
-                                test
-        }
-        ci_expr $((CI_NO_CLEAN)) || {
-            # Spawn "make clean" if cleaning is not disabled.
-            ci_spawn "$CI_MAKE" -f "$my_makefile" \
-                                "${all_make_flags[@]}" \
-                                "${all_make_vars[@]}" \
-                                clean
-        }
-    done
-    ci_info "## END OF BUILD ##"
-}
-
-function usage {
-    echo "usage: $CI_SCRIPT_NAME [<options>]"
-    echo "options: -?|-h|--help"
-    exit "${@:-0}"
-}
-
-function main {
-    local opt
-    while getopts ":" opt
-    do
-        # This ain't a while-loop. It only pretends to be.
-        [[ $1 == -[?h]* || $1 == --help || $1 == --help=* ]] && usage 0
-        ci_err "unknown option: '$1'"
-    done
-    shift $((OPTIND - 1))
-    # And... go!
-    ci_init_build
-    ci_trace_build
-    [[ $# -eq 0 ]] || {
-        echo >&2 "error: unexpected argument: '$1'"
-        echo >&2 "note: this program accepts environment options only"
-        usage 2
-    }
-    ci_cleanup_old_build
-    ci_build
-}
-
-main "$@"
--- a/ci/ci_verify_version.sh
+++ b/ci/ci_verify_version.sh
@@ -1,163 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit -o pipefail -o posix
-
-# Copyright (c) 2019-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-# shellcheck source=ci/lib/ci.lib.sh
-source "$(dirname "$0")/lib/ci.lib.sh"
-cd "$CI_TOPLEVEL_DIR"
-
-function ci_init_shellify {
-    [[ -f $CI_SCRIPT_DIR/ci_shellify.sh ]] || {
-        ci_err_internal "missing script: '$CI_SCRIPT_DIR/ci_shellify.sh'"
-    }
-}
-
-function ci_run_shellify {
-    ci_info "shellifying:" "$@"
-    local my_result
-    "$BASH" "$CI_SCRIPT_DIR/ci_shellify.sh" "$@"
-    echo "$my_result" | "$BASH" --posix || ci_err "bad shellify output"
-    echo "$my_result"
-}
-
-function ci_verify_version {
-    ci_info "## START OF VERIFICATION ##"
-    local my_env_libpng_ver my_env_autoconf_ver my_env_cmake_ver my_expect
-    ci_init_shellify
-    my_env_libpng_ver="$(ci_run_shellify png.h)"
-    echo "$my_env_libpng_ver"
-    my_env_autoconf_ver="$(ci_run_shellify configure.ac)"
-    echo "$my_env_autoconf_ver"
-    my_env_cmake_ver="$(ci_run_shellify CMakeLists.txt)"
-    echo "$my_env_cmake_ver"
-    ci_info "## VERIFYING: png.h version definitions ##"
-    eval "$my_env_libpng_ver"
-    local my_expect="${PNG_LIBPNG_VER_MAJOR}.${PNG_LIBPNG_VER_MINOR}.${PNG_LIBPNG_VER_RELEASE}"
-    if [[ "$PNG_LIBPNG_VER_STRING" == "$my_expect"* ]]
-    then
-        ci_info "matched: \$PNG_LIBPNG_VER_STRING == $my_expect*"
-    else
-        ci_err "mismatched: \$PNG_LIBPNG_VER_STRING != $my_expect*"
-    fi
-    my_expect=$((PNG_LIBPNG_VER_MAJOR*10000 + PNG_LIBPNG_VER_MINOR*100 + PNG_LIBPNG_VER_RELEASE))
-    if [[ "$PNG_LIBPNG_VER" == "$my_expect" ]]
-    then
-        ci_info "matched: \$PNG_LIBPNG_VER == $my_expect"
-    else
-        ci_err "mismatched: \$PNG_LIBPNG_VER != $my_expect"
-    fi
-    my_expect=$((PNG_LIBPNG_VER_MAJOR*10 + PNG_LIBPNG_VER_MINOR))
-    if [[ "$PNG_LIBPNG_VER_SHAREDLIB" == "$my_expect" ]]
-    then
-        ci_info "matched: \$PNG_LIBPNG_VER_SHAREDLIB == $my_expect"
-    else
-        ci_err "mismatched: \$PNG_LIBPNG_VER_SHAREDLIB != $my_expect"
-    fi
-    if [[ "$PNG_LIBPNG_VER_SONUM" == "$my_expect" ]]
-    then
-        ci_info "matched: \$PNG_LIBPNG_VER_SONUM == $my_expect"
-    else
-        ci_err "mismatched: \$PNG_LIBPNG_VER_SONUM != $my_expect"
-    fi
-    if [[ "$PNG_LIBPNG_VER_DLLNUM" == "$my_expect" ]]
-    then
-        ci_info "matched: \$PNG_LIBPNG_VER_DLLNUM == $my_expect"
-    else
-        ci_err "mismatched: \$PNG_LIBPNG_VER_DLLNUM != $my_expect"
-    fi
-    if [[ "$PNG_LIBPNG_VER_BUILD" == [01] ]]
-    then
-        ci_info "matched: \$PNG_LIBPNG_VER_BUILD == [01]"
-    else
-        ci_err "mismatched: \$PNG_LIBPNG_VER_BUILD != [01]"
-    fi
-    ci_info "## VERIFYING: png.h build definitions ##"
-    my_expect="${PNG_LIBPNG_VER_MAJOR}.${PNG_LIBPNG_VER_MINOR}.${PNG_LIBPNG_VER_RELEASE}"
-    if [[ "$PNG_LIBPNG_VER_STRING" == "$my_expect" ]]
-    then
-        if [[ $PNG_LIBPNG_VER_BUILD -eq 0 ]]
-        then
-            ci_info "matched: \$PNG_LIBPNG_VER_BUILD -eq 0"
-        else
-            ci_err "mismatched: \$PNG_LIBPNG_VER_BUILD -ne 0"
-        fi
-        if [[ $PNG_LIBPNG_BUILD_BASE_TYPE -eq $PNG_LIBPNG_BUILD_STABLE ]]
-        then
-            ci_info "matched: \$PNG_LIBPNG_BUILD_BASE_TYPE -eq \$PNG_LIBPNG_BUILD_STABLE"
-        else
-            ci_err "mismatched: \$PNG_LIBPNG_BUILD_BASE_TYPE -ne \$PNG_LIBPNG_BUILD_STABLE"
-        fi
-    elif [[ "$PNG_LIBPNG_VER_STRING" == "$my_expect".git ]]
-    then
-        if [[ $PNG_LIBPNG_VER_BUILD -ne 0 ]]
-        then
-            ci_info "matched: \$PNG_LIBPNG_VER_BUILD -ne 0"
-        else
-            ci_err "mismatched: \$PNG_LIBPNG_VER_BUILD -eq 0"
-        fi
-        if [[ $PNG_LIBPNG_BUILD_BASE_TYPE -ne $PNG_LIBPNG_BUILD_STABLE ]]
-        then
-            ci_info "matched: \$PNG_LIBPNG_BUILD_BASE_TYPE -ne \$PNG_LIBPNG_BUILD_STABLE"
-        else
-            ci_err "mismatched: \$PNG_LIBPNG_BUILD_BASE_TYPE -eq \$PNG_LIBPNG_BUILD_STABLE"
-        fi
-    else
-        ci_err "unexpected: \$PNG_LIBPNG_VER_STRING == '$PNG_LIBPNG_VER_STRING'"
-    fi
-    ci_info "## VERIFYING: png.h type definitions ##"
-    my_expect="$(echo "png_libpng_version_${PNG_LIBPNG_VER_STRING}" | tr . _)"
-    ci_spawn grep -w -e "$my_expect" png.h
-    ci_info "## VERIFYING: configure.ac version definitions ##"
-    eval "$my_env_autoconf_ver"
-    if [[ "$PNGLIB_VERSION" == "$PNG_LIBPNG_VER_STRING" ]]
-    then
-        ci_info "matched: \$PNGLIB_VERSION == \$PNG_LIBPNG_VER_STRING"
-    else
-        ci_err "mismatched: \$PNGLIB_VERSION != \$PNG_LIBPNG_VER_STRING"
-    fi
-    ci_info "## VERIFYING: CMakeLists.txt version definitions ##"
-    eval "$my_env_cmake_ver"
-    if [[ "$PNGLIB_VERSION" == "$PNG_LIBPNG_VER_STRING" && "$PNGLIB_SUBREVISION" == 0 ]]
-    then
-        ci_info "matched: \$PNGLIB_VERSION == \$PNG_LIBPNG_VER_STRING"
-        ci_info "matched: \$PNGLIB_SUBREVISION == 0"
-    elif [[ "$PNGLIB_VERSION.$PNGLIB_SUBREVISION" == "$PNG_LIBPNG_VER_STRING" ]]
-    then
-        ci_info "matched: \$PNGLIB_VERSION.\$PNGLIB_SUBREVISION == \$PNG_LIBPNG_VER_STRING"
-    else
-        ci_err "mismatched: \$PNGLIB_VERSION != \$PNG_LIBPNG_VER_STRING"
-    fi
-    ci_info "## END OF VERIFICATION ##"
-    ci_info "success!"
-}
-
-function usage {
-    echo "usage: $CI_SCRIPT_NAME [<options>]"
-    echo "options: -?|-h|--help"
-    exit "${@:-0}"
-}
-
-function main {
-    local opt
-    while getopts ":" opt
-    do
-        # This ain't a while-loop. It only pretends to be.
-        [[ $1 == -[?h]* || $1 == --help || $1 == --help=* ]] && usage 0
-        ci_err "unknown option: '$1'"
-    done
-    shift $((OPTIND - 1))
-    [[ $# -eq 0 ]] || {
-        echo >&2 "error: unexpected argument: '$1'"
-        usage 2
-    }
-    # And... go!
-    ci_verify_version
-}
-
-main "$@"
--- a/ci/lib/ci.lib.sh
+++ b/ci/lib/ci.lib.sh
@@ -1,102 +0,0 @@
-# Copyright (c) 2019-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-test -f "$BASH_SOURCE" || {
-    echo >&2 "warning: this module requires Bash version 3 or newer"
-}
-test "${#BASH_SOURCE[@]}" -gt 1 || {
-    echo >&2 "warning: this module should be sourced from a Bash script"
-}
-
-# Reset the locale to avoid surprises from locale-dependent commands.
-export LC_ALL=C
-export LANG=C
-export LANGUAGE=C
-
-# Reset CDPATH to avoid surprises from the "cd" command.
-export CDPATH=""
-
-# Initialize the global constants CI_SCRIPT_{NAME,DIR} and CI_TOPLEVEL_DIR.
-CI_SCRIPT_NAME="$(basename -- "$0")"
-CI_SCRIPT_DIR="$(cd "$(dirname -- "$0")" && pwd)"
-CI_TOPLEVEL_DIR="$(cd "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)"
-
-# Initialize the global constants CI_BUILD_{...} for the host build platform.
-CI_BUILD_ARCH="${CI_BUILD_ARCH:-"$(uname -m | tr 'A-Z/\.-' 'a-z____')"}"
-CI_BUILD_SYSTEM="${CI_BUILD_SYSTEM:-"$(uname -s | tr 'A-Z/\.-' 'a-z____')"}"
-
-# Initialize the global constants CI_TARGET_{...} for the target platform.
-CI_TARGET_ARCH="${CI_TARGET_ARCH:-"$CI_BUILD_ARCH"}"
-CI_TARGET_SYSTEM="${CI_TARGET_SYSTEM:-"$CI_BUILD_SYSTEM"}"
-
-function ci_info {
-    printf >&2 "%s: %s\\n" "$CI_SCRIPT_NAME" "$*"
-}
-
-function ci_warn {
-    printf >&2 "%s: warning: %s\\n" "$CI_SCRIPT_NAME" "$*"
-}
-
-function ci_err {
-    printf >&2 "%s: error: %s\\n" "$CI_SCRIPT_NAME" "$*"
-    exit 2
-}
-
-function ci_err_internal {
-    printf >&2 "%s: internal error: %s\\n" "$CI_SCRIPT_NAME" "$*"
-    printf >&2 "ABORTED\\n"
-    # Exit with the conventional SIGABRT code.
-    exit 134
-}
-
-function ci_expr {
-    if [[ ${*:-0} == [0-9] ]]
-    then
-        # This is the same as in the else-branch below, albeit much faster
-        # for our intended use cases.
-        return $((!$1))
-    else
-        # The funny-looking compound command "... && return $? || return $?"
-        # allows the execution to continue uninterrupted under "set -e".
-        expr >/dev/null "$@" && return $? || return $?
-    fi
-}
-
-function ci_spawn {
-    printf >&2 "%s: executing:" "$CI_SCRIPT_NAME"
-    printf >&2 " %q" "$@"
-    printf >&2 "\\n"
-    "$@"
-}
-
-# Ensure that the internal initialization is correct.
-[[ $CI_TOPLEVEL_DIR/ci/lib/ci.lib.sh -ef ${BASH_SOURCE[0]} ]] || {
-    ci_err_internal "bad or missing \$CI_TOPLEVEL_DIR"
-}
-[[ $CI_SCRIPT_DIR/$CI_SCRIPT_NAME -ef $0 ]] || {
-    ci_err_internal "bad or missing \$CI_SCRIPT_DIR/\$CI_SCRIPT_NAME"
-}
-[[ $CI_BUILD_ARCH && $CI_BUILD_SYSTEM ]] || {
-    ci_err_internal "missing \$CI_BUILD_ARCH or \$CI_BUILD_SYSTEM"
-}
-[[ $CI_TARGET_ARCH && $CI_TARGET_SYSTEM ]] || {
-    ci_err_internal "missing \$CI_TARGET_ARCH or \$CI_TARGET_SYSTEM"
-}
-
-# Ensure that the user initialization is correct.
-[[ ${CI_FORCE:-0} == [01] ]] || {
-    ci_err "bad boolean option: \$CI_FORCE: '$CI_FORCE'"
-}
-[[ ${CI_NO_TEST:-0} == [01] ]] || {
-    ci_err "bad boolean option: \$CI_NO_TEST: '$CI_NO_TEST'"
-}
-[[ ${CI_NO_INSTALL:-0} == [01] ]] || {
-    ci_err "bad boolean option: \$CI_NO_INSTALL: '$CI_NO_INSTALL'"
-}
-[[ ${CI_NO_CLEAN:-0} == [01] ]] || {
-    ci_err "bad boolean option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'"
-}
--- a/ci/targets/android/ci_env.aarch64-linux-android.sh
+++ b/ci/targets/android/ci_env.aarch64-linux-android.sh
@@ -1,16 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=aarch64
-export CI_TARGET_ARCHVER=aarch64
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=android
-export CI_TARGET_ABIVER=android29
-
-export CI_CC="$CI_TARGET_ARCHVER-$CI_TARGET_SYSTEM-$CI_TARGET_ABIVER-clang"
-export CI_AR="llvm-ar"
-export CI_RANLIB="llvm-ranlib"
--- a/ci/targets/android/ci_env.armv7a-linux-androideabi.sh
+++ b/ci/targets/android/ci_env.armv7a-linux-androideabi.sh
@@ -1,16 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=arm
-export CI_TARGET_ARCHVER=armv7a
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=androideabi
-export CI_TARGET_ABIVER=androideabi29
-
-export CI_CC="$CI_TARGET_ARCHVER-$CI_TARGET_SYSTEM-$CI_TARGET_ABIVER-clang"
-export CI_AR="llvm-ar"
-export CI_RANLIB="llvm-ranlib"
--- a/ci/targets/android/ci_env.i686-linux-android.sh
+++ b/ci/targets/android/ci_env.i686-linux-android.sh
@@ -1,16 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=i686
-export CI_TARGET_ARCHVER=i686
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=android
-export CI_TARGET_ABIVER=android29
-
-export CI_CC="$CI_TARGET_ARCHVER-$CI_TARGET_SYSTEM-$CI_TARGET_ABIVER-clang"
-export CI_AR="llvm-ar"
-export CI_RANLIB="llvm-ranlib"
--- a/ci/targets/android/ci_env.x86_64-linux-android.sh
+++ b/ci/targets/android/ci_env.x86_64-linux-android.sh
@@ -1,16 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=x86_64
-export CI_TARGET_ARCHVER=x86_64
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=android
-export CI_TARGET_ABIVER=android29
-
-export CI_CC="$CI_TARGET_ARCHVER-$CI_TARGET_SYSTEM-$CI_TARGET_ABIVER-clang"
-export CI_AR="llvm-ar"
-export CI_RANLIB="llvm-ranlib"
--- a/ci/targets/cygwin/ci_env.i686-pc-cygwin.sh
+++ b/ci/targets/cygwin/ci_env.i686-pc-cygwin.sh
@@ -1,18 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=i686
-export CI_TARGET_SYSTEM=cygwin
-
-export CI_CC="$CI_TARGET_ARCH-pc-$CI_TARGET_SYSTEM-gcc"
-export CI_AR="$CI_CC-ar"
-export CI_RANLIB="$CI_CC-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=CYGWIN
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/cygwin/ci_env.x86_64-pc-cygwin.sh
+++ b/ci/targets/cygwin/ci_env.x86_64-pc-cygwin.sh
@@ -1,18 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=x86_64
-export CI_TARGET_SYSTEM=cygwin
-
-export CI_CC="$CI_TARGET_ARCH-pc-$CI_TARGET_SYSTEM-gcc"
-export CI_AR="$CI_CC-ar"
-export CI_RANLIB="$CI_CC-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=CYGWIN
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/darwin/ci_env.arm64-apple-darwin.sh
+++ b/ci/targets/darwin/ci_env.arm64-apple-darwin.sh
@@ -1,15 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=arm64
-export CI_TARGET_SYSTEM=darwin
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Darwin
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-    -DCMAKE_OSX_ARCHITECTURES=$CI_TARGET_ARCH
-"
--- a/ci/targets/darwin/ci_env.x86_64-apple-darwin.sh
+++ b/ci/targets/darwin/ci_env.x86_64-apple-darwin.sh
@@ -1,15 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=x86_64
-export CI_TARGET_SYSTEM=darwin
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Darwin
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-    -DCMAKE_OSX_ARCHITECTURES=$CI_TARGET_ARCH
-"
--- a/ci/targets/freebsd/ci_env.aarch64-unknown-freebsd.sh
+++ b/ci/targets/freebsd/ci_env.aarch64-unknown-freebsd.sh
@@ -1,14 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=aarch64
-export CI_TARGET_SYSTEM=freebsd
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=FreeBSD
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/freebsd/ci_env.i686-unknown-freebsd.sh
+++ b/ci/targets/freebsd/ci_env.i686-unknown-freebsd.sh
@@ -1,14 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=i686
-export CI_TARGET_SYSTEM=freebsd
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=FreeBSD
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/freebsd/ci_env.riscv64-unknown-freebsd.sh
+++ b/ci/targets/freebsd/ci_env.riscv64-unknown-freebsd.sh
@@ -1,14 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=riscv64
-export CI_TARGET_SYSTEM=freebsd
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=FreeBSD
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/freebsd/ci_env.x86_64-unknown-freebsd.sh
+++ b/ci/targets/freebsd/ci_env.x86_64-unknown-freebsd.sh
@@ -1,14 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=x86_64
-export CI_TARGET_SYSTEM=freebsd
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=FreeBSD
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.aarch64-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.aarch64-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=aarch64
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.arm-linux-gnueabi.sh
+++ b/ci/targets/linux/ci_env.arm-linux-gnueabi.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=arm
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnueabi
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.arm-linux-gnueabihf.sh
+++ b/ci/targets/linux/ci_env.arm-linux-gnueabihf.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=arm
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnueabihf
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.i686-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.i686-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=i686
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.mips-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.mips-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=mips
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.mips64-linux-gnuabi64.sh
+++ b/ci/targets/linux/ci_env.mips64-linux-gnuabi64.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=mips64
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnuabi64
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.mips64el-linux-gnuabi64.sh
+++ b/ci/targets/linux/ci_env.mips64el-linux-gnuabi64.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=mips64el
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnuabi64
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.mipsel-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.mipsel-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=mipsel
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.mipsisa32r6-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.mipsisa32r6-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=mipsisa32r6
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.mipsisa32r6el-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.mipsisa32r6el-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=mipsisa32r6el
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.mipsisa64r6-linux-gnuabi64.sh
+++ b/ci/targets/linux/ci_env.mipsisa64r6-linux-gnuabi64.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=mipsisa64r6
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnuabi64
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.mipsisa64r6el-linux-gnuabi64.sh
+++ b/ci/targets/linux/ci_env.mipsisa64r6el-linux-gnuabi64.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=mipsisa64r6el
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnuabi64
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.powerpc-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.powerpc-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=powerpc
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.powerpc64-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.powerpc64-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=powerpc64
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.powerpc64le-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.powerpc64le-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=powerpc64le
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.riscv64-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.riscv64-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=riscv64
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/linux/ci_env.x86_64-linux-gnu.sh
+++ b/ci/targets/linux/ci_env.x86_64-linux-gnu.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=x86_64
-export CI_TARGET_SYSTEM=linux
-export CI_TARGET_ABI=gnu
-
-export CI_GCC="${CI_GCC-gcc}"
-
-export CI_CC="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-$CI_GCC"
-export CI_AR="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ar"
-export CI_RANLIB="$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Linux
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/msdos/ci_env.i386-pc-msdoswatcom.sh
+++ b/ci/targets/msdos/ci_env.i386-pc-msdoswatcom.sh
@@ -1,18 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=i386
-export CI_TARGET_SYSTEM=msdoswatcom
-
-export CI_CC="wcl386"
-
-# Open Watcom V2 CMake build
-# https://github.com/open-watcom/open-watcom-v2/discussions/716
-export CI_CMAKE_GENERATOR="Watcom WMake"
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=DOS
-"
--- a/ci/targets/msdos/ci_env.i586-pc-msdosdjgpp.sh
+++ b/ci/targets/msdos/ci_env.i586-pc-msdosdjgpp.sh
@@ -1,18 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=i586
-export CI_TARGET_SYSTEM=msdosdjgpp
-
-export CI_CC="$CI_TARGET_ARCH-pc-$CI_TARGET_SYSTEM-gcc"
-export CI_AR="$CI_CC-ar"
-export CI_RANLIB="$CI_CC-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Generic
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/msdos/ci_env.i86-pc-msdoswatcom.sh
+++ b/ci/targets/msdos/ci_env.i86-pc-msdoswatcom.sh
@@ -1,19 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=i86
-export CI_TARGET_SYSTEM=msdoswatcom
-
-export CI_CC="wcl"
-
-# Open Watcom V2 CMake build
-# https://github.com/open-watcom/open-watcom-v2/discussions/716
-export CI_CMAKE_GENERATOR="Watcom WMake"
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=DOS
-    -DCMAKE_SYSTEM_PROCESSOR=I86
-"
--- a/ci/targets/windows/ci_env.aarch64-windows-llvm.sh
+++ b/ci/targets/windows/ci_env.aarch64-windows-llvm.sh
@@ -1,18 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=aarch64
-export CI_TARGET_SYSTEM=windows
-
-export CI_CC="clang"
-export CI_AR="llvm-ar"
-export CI_RANLIB="llvm-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Windows
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/windows/ci_env.i686-w64-mingw32.sh
+++ b/ci/targets/windows/ci_env.i686-w64-mingw32.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=i686
-export CI_TARGET_SYSTEM=mingw32
-
-# The output of `uname -s` on MSYS2 is understandable, and so is
-# CI_TARGET_SYSTEM above, in simplified form. (See also Cygwin.)
-# But aside from that, the Mingw-w64 nomenclature is rather messy.
-export CI_CC="$CI_TARGET_ARCH-w64-mingw32-gcc"
-export CI_AR="$CI_CC-ar"
-export CI_RANLIB="$CI_CC-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Windows
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/windows/ci_env.i686-windows-llvm.sh
+++ b/ci/targets/windows/ci_env.i686-windows-llvm.sh
@@ -1,18 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=i686
-export CI_TARGET_SYSTEM=windows
-
-export CI_CC="clang"
-export CI_AR="llvm-ar"
-export CI_RANLIB="llvm-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Windows
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/windows/ci_env.x86_64-w64-mingw32.sh
+++ b/ci/targets/windows/ci_env.x86_64-w64-mingw32.sh
@@ -1,21 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=x86_64
-export CI_TARGET_SYSTEM=mingw64
-
-# The output of `uname -s` on MSYS2 is understandable, and so is
-# CI_TARGET_SYSTEM above, in simplified form. (See also Cygwin.)
-# But aside from that, the Mingw-w64 nomenclature is rather messy.
-export CI_CC="$CI_TARGET_ARCH-w64-mingw32-gcc"
-export CI_AR="$CI_CC-ar"
-export CI_RANLIB="$CI_CC-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Windows
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/ci/targets/windows/ci_env.x86_64-windows-llvm.sh
+++ b/ci/targets/windows/ci_env.x86_64-windows-llvm.sh
@@ -1,18 +0,0 @@
-# Copyright (c) 2023-2024 Cosmin Truta.
-#
-# Use, modification and distribution are subject to the MIT License.
-# Please see the accompanying file LICENSE_MIT.txt
-#
-# SPDX-License-Identifier: MIT
-
-export CI_TARGET_ARCH=x86_64
-export CI_TARGET_SYSTEM=windows
-
-export CI_CC="clang"
-export CI_AR="llvm-ar"
-export CI_RANLIB="llvm-ranlib"
-
-export CI_CMAKE_VARS="
-    -DCMAKE_SYSTEM_NAME=Windows
-    -DCMAKE_SYSTEM_PROCESSOR=$CI_TARGET_ARCH
-"
--- a/351
+++ b/351
@@ -1,351 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2024-06-19.01; # UTC
-
-# Copyright (C) 1999-2024 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN* | MSYS*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/* | msys/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.lo | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-GNU Automake home page: <https://www.gnu.org/software/automake/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile (GNU Automake) $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
-  clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
--- a/config.guess
+++ b/config.guess
--- a/config.h.in
+++ b/config.h.in
@@ -1,135 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the 'feenableexcept' function. */
-#undef HAVE_FEENABLEEXCEPT
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the 'm' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if you have the 'z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the 'pow' function. */
-#undef HAVE_POW
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Turn on ARM Neon optimizations at run-time */
-#undef PNG_ARM_NEON_API_SUPPORTED
-
-/* Check for ARM Neon support at run-time */
-#undef PNG_ARM_NEON_CHECK_SUPPORTED
-
-/* Enable ARM Neon optimizations */
-#undef PNG_ARM_NEON_OPT
-
-/* Enable Intel SSE optimizations */
-#undef PNG_INTEL_SSE_OPT
-
-/* Enable LOONGARCH LSX optimizations */
-#undef PNG_LOONGARCH_LSX_OPT
-
-/* Turn on MIPS MMI optimizations at run-time */
-#undef PNG_MIPS_MMI_API_SUPPORTED
-
-/* Check for MIPS MMI support at run-time */
-#undef PNG_MIPS_MMI_CHECK_SUPPORTED
-
-/* Enable MIPS MMI optimizations */
-#undef PNG_MIPS_MMI_OPT
-
-/* Turn on MIPS MSA optimizations at run-time */
-#undef PNG_MIPS_MSA_API_SUPPORTED
-
-/* Check for MIPS MSA support at run-time */
-#undef PNG_MIPS_MSA_CHECK_SUPPORTED
-
-/* Enable MIPS MSA optimizations */
-#undef PNG_MIPS_MSA_OPT
-
-/* Turn on POWERPC VSX optimizations at run-time */
-#undef PNG_POWERPC_VSX_API_SUPPORTED
-
-/* Check for POWERPC VSX support at run-time */
-#undef PNG_POWERPC_VSX_CHECK_SUPPORTED
-
-/* Enable POWERPC VSX optimizations */
-#undef PNG_POWERPC_VSX_OPT
-
-/* Define to 1 if all of the C89 standard headers exist (not just the ones
-   required in a freestanding environment). This macro is provided for
-   backward compatibility; new code need not use it. */
-#undef STDC_HEADERS
-
-/* Define to 1 if your <sys/time.h> declares 'struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported only directly.  */
-#undef restrict
-/* Work around a bug in older versions of Sun C++, which did not
-   #define __restrict__ or support _Restrict or __restrict__
-   even though the corresponding Sun C compiler ended up with
-   "#define restrict _Restrict" or "#define restrict __restrict__"
-   in the previous line.  This workaround can be removed once
-   we assume Oracle Developer Studio 12.5 (2016) or later.  */
-#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__
-# define _Restrict
-# define __restrict__
-#endif
--- a/config.sub
+++ b/config.sub
--- a/17940
+++ b/17940
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # configure.ac

-# Copyright (c) 2018-2024 Cosmin Truta
 # Copyright (c) 2004-2016 Glenn Randers-Pehrson
+# Last changed in libpng 1.6.25 [September 1, 2016]

 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
@@ -25,8 +25,8 @@ AC_PREREQ([2.68])

 dnl Version number stuff here:

-AC_INIT([libpng],[1.6.46.git],[png-mng-implement@lists.sourceforge.net])
-AC_CONFIG_MACRO_DIR([scripts/autoconf])
+AC_INIT([libpng],[1.6.30rc02],[png-mng-implement@lists.sourceforge.net])
+AC_CONFIG_MACRO_DIR([scripts])

 # libpng does not follow GNU file name conventions (hence 'foreign')
 # color-tests requires automake 1.11 or later
@@ -46,17 +46,17 @@ dnl automake, so the following is not necessary (and is not defined anyway):
 dnl AM_PREREQ([1.11.2])
 dnl stop configure from automagically running automake

-PNGLIB_VERSION=1.6.46.git
+PNGLIB_VERSION=1.6.30rc02
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=6
-PNGLIB_RELEASE=46
+PNGLIB_RELEASE=30

 dnl End of version number stuff

 AC_CONFIG_SRCDIR([pngget.c])
 AC_CONFIG_HEADERS([config.h])

-# Check the basic programs.
+# Checks for programs.
 AC_LANG([C])
 AC_PROG_CC
 AM_PROG_AS
@@ -72,19 +72,16 @@ dnl compatible later version may be used
 LT_INIT([win32-dll])
 LT_PREREQ([2.4.2])

-dnl Declare the AWK variable.
-AC_ARG_VAR(AWK, [AWK language processor])
-
-# Some awk implementations crash when confronted with pnglibconf.dfa.
-# Run a test now, to make sure this doesn't happen.
-AC_MSG_CHECKING([if awk ($AWK) works])
+# Some awks crash when confronted with pnglibconf.dfa, do a test run now
+# to make sure this doesn't happen
+AC_MSG_CHECKING([that AWK works])
 if ${AWK} -f ${srcdir}/scripts/options.awk out="/dev/null" version=search\
   ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
   ${srcdir}/pngusr.dfa 1>&2
 then
-   AC_MSG_RESULT([yes])
+   AC_MSG_RESULT([ok])
 else
-   AC_MSG_FAILURE([no], 1)
+   AC_MSG_FAILURE([failed], 1)
 fi

 # This is a remnant of the old cc -E validation, where it may have been
@@ -92,29 +89,11 @@ fi
 DFNCPP="$CPP"
 AC_SUBST(DFNCPP)

-AC_ARG_ENABLE([tests],
-   AS_HELP_STRING([--disable-tests],
-      [do not build the test programs (default is to build)]),
-      [enable_tests="$enableval"],
-      [enable_tests=yes])
-
-AM_CONDITIONAL([ENABLE_TESTS],
-   [test "$enable_tests" != "no"])
-
-AC_ARG_ENABLE([tools],
-   AS_HELP_STRING([--disable-tools],
-      [do not build the auxiliary tools (default is to build)]),
-      [enable_tools="$enableval"],
-      [enable_tools=yes])
-
-AM_CONDITIONAL([ENABLE_TOOLS],
-   [test "$enable_tools" != "no"])
-
-# -Werror cannot be passed to GCC in CFLAGS because configure will fail
-# (it checks the compiler with a program that generates a warning).
-# Add the following option to deal with this:
+# -Werror cannot be passed to GCC in CFLAGS because configure will fail (it
+# checks the compiler with a program that generates a warning), add the
+# following option to deal with this
 AC_ARG_VAR(PNG_COPTS,
-   [additional flags for the C compiler, to be used for options that would]
+   [additional flags for the C compiler, use this for options that would]
   [cause configure itself to fail])
 AC_ARG_ENABLE(werror,
   AS_HELP_STRING([[[--enable-werror[=OPT]]]],
@@ -135,10 +114,10 @@ AC_ARG_ENABLE(werror,
      CFLAGS="$sav_CFLAGS"
    fi],)

-# For GCC 5 the default mode for C is -std=gnu11 instead of -std=gnu89.
-# In pngpriv.h we request just the POSIX 1003.1 and C89 APIs by defining
-# _POSIX_SOURCE to 1. This is incompatible with the new default mode, so
-# we test for that and force the "-std=c89" compiler option:
+# For GCC 5 the default mode for C is -std=gnu11 instead of -std=gnu89
+# In pngpriv.h we request just the POSIX 1003.1 and C89 APIs by defining _POSIX_SOURCE to 1
+# This is incompatible with the new default mode, so we test for that and force the 
+# "-std=c89" compiler option:
 AC_MSG_CHECKING([if we need to force back C standard to C89])
 AC_COMPILE_IFELSE(
   [AC_LANG_PROGRAM([
@@ -154,17 +133,23 @@ AC_COMPILE_IFELSE(
   CFLAGS="$CFLAGS -std=c89"
 ])

-# Checks for structures and compiler characteristics.
+# Checks for header files.
+AC_HEADER_STDC
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_SIZE_T
 AC_STRUCT_TM
 AC_C_RESTRICT

 # Checks for library functions.
-AC_CHECK_FUNCS([pow], ,
-  [AC_CHECK_LIB([m], [pow], , [AC_MSG_ERROR([cannot find pow])])])
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([memset], , AC_MSG_ERROR(memset not found in libc))
+AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)) )

-# Some later POSIX 1003.1 functions are required for test programs, failure
-# here is soft (the corresponding test program is not built).
-AC_CHECK_FUNC([clock_gettime], , [AC_MSG_WARN([not building timepng])])
+# Some later POSIX 1003.1 functions are required for test programs, failure here
+# is soft (the corresponding test program is not built).
+AC_CHECK_FUNC([clock_gettime],,[AC_MSG_WARN([not building timepng])])
 AM_CONDITIONAL([HAVE_CLOCK_GETTIME], [test "$ac_cv_func_clock_gettime" = "yes"])

 AC_ARG_WITH(zlib-prefix,
@@ -172,9 +157,8 @@ AC_ARG_WITH(zlib-prefix,
      [prefix that may have been used in installed zlib]),
      [ZPREFIX=${withval}],
      [ZPREFIX='z_'])
-AC_CHECK_LIB([z], [zlibVersion], ,
-  [AC_CHECK_LIB([z], [${ZPREFIX}zlibVersion], ,
-     [AC_MSG_ERROR([zlib not installed])])])
+AC_CHECK_LIB(z, zlibVersion, ,
+    AC_CHECK_LIB(z, ${ZPREFIX}zlibVersion, , AC_MSG_ERROR(zlib not installed)))

 # The following is for pngvalid, to ensure it catches FP errors even on
 # platforms that don't enable FP exceptions, the function appears in the math
@@ -226,9 +210,9 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 if test "$have_ld_version_script" = "yes"; then
    AC_MSG_CHECKING([for symbol prefix])
    SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \
-                  | ${CPP:-${CC:-gcc} -E} - 2>&1 \
-                  | ${EGREP:-grep} "^PREFIX=" \
-                  | ${SED:-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
+                  | ${CPP-${CC-gcc} -E} - 2>&1 \
+                  | ${EGREP-grep} "^PREFIX=" \
+                  | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
    AC_SUBST(SYMBOL_PREFIX)
    AC_MSG_RESULT($SYMBOL_PREFIX)
 fi
@@ -313,82 +297,20 @@ AC_ARG_ENABLE([unversioned-libpng-config],
 AM_CONDITIONAL([DO_INSTALL_LIBPNG_CONFIG],
   [test "$enable_unversioned_libpng_config" != "no"])

-# HOST-SPECIFIC OPTIONS
+# HOST SPECIFIC OPTIONS
 # =====================
 #
-# DEFAULT
-# =======
+# ARM
+# ===
 #
-AC_ARG_ENABLE([hardware-optimizations],
-   AS_HELP_STRING([[[--enable-hardware-optimizations]]],
-      [Enable hardware optimizations: =no/off, yes/on.]),
-   [case "$enableval" in
-      no|off)
-         # disable hardware optimization on all systems:
-         enable_arm_neon=no
-         AC_DEFINE([PNG_ARM_NEON_OPT], [0],
-           [Disable ARM_NEON optimizations])
-         enable_mips_msa=no
-         AC_DEFINE([PNG_MIPS_MSA_OPT], [0],
-           [Disable MIPS_MSA optimizations])
-         enable_mips_mmi=no
-         AC_DEFINE([PNG_MIPS_MMI_OPT], [0],
-           [Disable MIPS_MMI optimizations])
-         enable_powerpc_vsx=no
-         AC_DEFINE([PNG_POWERPC_VSX_OPT], [0],
-           [Disable POWERPC VSX optimizations])
-         enable_intel_sse=no
-         AC_DEFINE([PNG_INTEL_SSE_OPT], [0],
-           [Disable INTEL_SSE optimizations])
-         enable_loongarch_lsx=no
-         AC_DEFINE([PNG_LOONGARCH_LSX_OPT], [0],
-           [Disable LOONGARCH_LSX optimizations])
-         ;;
-      *)
-         # allow enabling hardware optimization on any system:
-         case "$host_cpu" in
-            arm*|aarch64*)
-              enable_arm_neon=yes
-              AC_DEFINE([PNG_ARM_NEON_OPT], [2],
-                [Enable ARM_NEON optimizations])
-              ;;
-            mipsel*|mips64el*)
-              enable_mips_mmi=yes
-              enable_mips_msa=yes
-              AC_DEFINE([PNG_MIPS_MMI_OPT], [1],
-                [Enable MIPS_MMI optimizations])
-              AC_DEFINE([PNG_MIPS_MSA_OPT], [2],
-                [Enable MIPS_MSA optimizations])
-              ;;
-            i?86|x86_64)
-              enable_intel_sse=yes
-              AC_DEFINE([PNG_INTEL_SSE_OPT], [1],
-                [Enable Intel SSE optimizations])
-              ;;
-            powerpc*|ppc64*)
-              enable_powerpc_vsx=yes
-              AC_DEFINE([PNG_POWERPC_VSX_OPT], [2],
-                [Enable POWERPC VSX optimizations])
-              ;;
-            loongarch*)
-              enable_loongarch_lsx=yes
-              AC_DEFINE([PNG_LOONGARCH_LSX_OPT], [1],
-                [Enable LOONGARCH_LSX optimizations])
-              ;;
-         esac
-         ;;
-   esac])
-
-# ARM NEON
-# ========
+# ARM NEON (SIMD) support.

 AC_ARG_ENABLE([arm-neon],
   AS_HELP_STRING([[[--enable-arm-neon]]],
-      [Enable ARM NEON optimizations: =no/off, check, api, yes/on.]
-      [no/off: disable the optimizations;]
-      [check: use internal checking code (deprecated and poorly supported);]
-      [api: disable by default, enable by a call to png_set_option;]
-      [yes/on: turn on unconditionally.]
+      [Enable ARM NEON optimizations: =no/off, check, api, yes/on:]
+      [no/off: disable the optimizations; check: use internal checking code]
+      [(deprecated and poorly supported); api: disable by default, enable by]
+      [a call to png_set_option; yes/on: turn on unconditionally.]
      [If not specified: determined by the compiler.]),
   [case "$enableval" in
      no|off)
@@ -396,7 +318,7 @@ AC_ARG_ENABLE([arm-neon],
         AC_DEFINE([PNG_ARM_NEON_OPT], [0],
                   [Disable ARM Neon optimizations])
         # Prevent inclusion of the assembler files below:
-         enable_arm_neon=no ;;
+         enable_arm_neon=no;;
      check)
         AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [],
                   [Check for ARM Neon support at run-time]);;
@@ -406,35 +328,35 @@ AC_ARG_ENABLE([arm-neon],
      yes|on)
         AC_DEFINE([PNG_ARM_NEON_OPT], [2],
                   [Enable ARM Neon optimizations])
-         AC_MSG_WARN([--enable-arm-neon: please specify 'check' or 'api';]
-            [if you want the optimizations unconditionally,]
-            [pass '-mfpu=neon' to the compiler.]);;
+         AC_MSG_WARN([--enable-arm-neon: please specify 'check' or 'api', if]
+            [you want the optimizations unconditionally pass -mfpu=neon]
+            [to the compiler.]);;
      *)
-         AC_MSG_ERROR([--enable-arm-neon=${enable_arm_neon}:]
-                      [invalid argument])
+         AC_MSG_ERROR([--enable-arm-neon=${enable_arm_neon}: invalid value])
   esac])

-# Add ARM-specific files to all builds where $host_cpu is arm ('arm*') or
-# where ARM optimizations were explicitly requested. (This allows a fallback
-# if a future host CPU does not match 'arm*'.)
+# Add ARM specific files to all builds where the host_cpu is arm ('arm*') or
+# where ARM optimizations were explicitly requested (this allows a fallback if a
+# future host CPU does not match 'arm*')

 AM_CONDITIONAL([PNG_ARM_NEON],
   [test "$enable_arm_neon" != 'no' &&
    case "$host_cpu" in
-      arm*|aarch64*) : ;;
-      *)    test "$enable_arm_neon" != '' ;;
+      arm*|aarch64*) :;;
+      *)    test "$enable_arm_neon" != '';;
    esac])

-# MIPS MSA
-# ========
+# MIPS
+# ===
+#
+# MIPS MSA (SIMD) support.

 AC_ARG_ENABLE([mips-msa],
   AS_HELP_STRING([[[--enable-mips-msa]]],
-      [Enable MIPS MSA optimizations: =no/off, check, api, yes/on.]
-      [no/off: disable the optimizations;]
-      [check: use internal checking code (deprecated and poorly supported);]
-      [api: disable by default, enable by a call to png_set_option;]
-      [yes/on: turn on unconditionally.]
+      [Enable MIPS MSA optimizations: =no/off, check, api, yes/on:]
+      [no/off: disable the optimizations; check: use internal checking code]
+      [(deprecated and poorly supported); api: disable by default, enable by]
+      [a call to png_set_option; yes/on: turn on unconditionally.]
      [If not specified: determined by the compiler.]),
   [case "$enableval" in
      no|off)
@@ -442,7 +364,7 @@ AC_ARG_ENABLE([mips-msa],
         AC_DEFINE([PNG_MIPS_MSA_OPT], [0],
                   [Disable MIPS MSA optimizations])
         # Prevent inclusion of the assembler files below:
-         enable_mips_msa=no ;;
+         enable_mips_msa=no;;
      check)
         AC_DEFINE([PNG_MIPS_MSA_CHECK_SUPPORTED], [],
                   [Check for MIPS MSA support at run-time]);;
@@ -452,75 +374,31 @@ AC_ARG_ENABLE([mips-msa],
      yes|on)
         AC_DEFINE([PNG_MIPS_MSA_OPT], [2],
                   [Enable MIPS MSA optimizations])
-         AC_MSG_WARN([--enable-mips-msa: please specify 'check' or 'api';]
-            [if you want the optimizations unconditionally,]
-            [pass '-mmsa -mfp64' to the compiler.]);;
+         AC_MSG_WARN([--enable-mips-msa: please specify 'check' or 'api', if]
+            [you want the optimizations unconditionally pass '-mmsa -mfp64']
+            [to the compiler.]);;
      *)
-         AC_MSG_ERROR([--enable-mips-msa=${enable_mips_msa}:]
-                      [invalid argument])
+         AC_MSG_ERROR([--enable-mips-msa=${enable_mips_msa}: invalid value])
   esac])

-# Add MIPS-specific files to all builds where $host_cpu is mips ('mips*') or
-# where MIPS optimizations were explicitly requested. (This allows a fallback
-# if a future host CPU does not match 'mips*'.)
+# Add MIPS specific files to all builds where the host_cpu is mips ('mips*') or
+# where MIPS optimizations were explicitly requested (this allows a fallback if a
+# future host CPU does not match 'mips*')

 AM_CONDITIONAL([PNG_MIPS_MSA],
   [test "$enable_mips_msa" != 'no' &&
    case "$host_cpu" in
-      mipsel*|mips64el*) : ;;
+      mipsel*|mips64el*) :;;
    esac])

-# MIPS MMI
-# ========
-
-AC_ARG_ENABLE([mips-mmi],
-   AS_HELP_STRING([[[--enable-mips-mmi]]],
-      [Enable MIPS MMI optimizations: =no/off, check, api, yes/on.]
-      [no/off: disable the optimizations;]
-      [check: use internal checking code (deprecated and poorly supported);]
-      [api: disable by default, enable by a call to png_set_option;]
-      [yes/on: turn on unconditionally.]
-      [If not specified: determined by the compiler.]),
-   [case "$enableval" in
-      no|off)
-         # disable the default enabling on __mips_mmi systems:
-         AC_DEFINE([PNG_MIPS_MMI_OPT], [0],
-                   [Disable MIPS MMI optimizations])
-         # Prevent inclusion of the assembler files below:
-         enable_mips_mmi=no;;
-      check)
-         AC_DEFINE([PNG_MIPS_MMI_CHECK_SUPPORTED], [],
-                   [Check for MIPS MMI support at run-time]);;
-      api)
-         AC_DEFINE([PNG_MIPS_MMI_API_SUPPORTED], [],
-                   [Turn on MIPS MMI optimizations at run-time]);;
-      yes|on)
-         AC_DEFINE([PNG_MIPS_MMI_OPT], [1],
-                   [Enable MIPS MMI optimizations])
-         AC_MSG_WARN([--enable-mips-mmi: please specify 'check' or 'api';]
-            [if you want the optimizations unconditionally]
-            [pass '-mloongson-mmi -march=loongson3a' to the compiler.]);;
-      *)
-         AC_MSG_ERROR([--enable-mips-mmi=${enable_mips_mmi}:]
-                      [invalid argument])
-   esac])
-
-# Add MIPS specific files to all builds where the host_cpu is mips ('mips*') or
-# where MIPS optimizations were explicitly requested. (This allows a fallback
-# if a future host CPU does not match 'mips*'.)
-
-AM_CONDITIONAL([PNG_MIPS_MMI],
-   [test "$enable_mips_mmi" != 'no' &&
-    case "$host_cpu" in
-      mipsel*|mips64el*) : ;;
-    esac])
-
-# INTEL SSE
-# =========
+# INTEL
+# =====
+#
+# INTEL SSE (SIMD) support.

 AC_ARG_ENABLE([intel-sse],
   AS_HELP_STRING([[[--enable-intel-sse]]],
-      [Enable Intel SSE optimizations: =no/off, yes/on.]
+      [Enable Intel SSE optimizations: =no/off, yes/on:]
      [no/off: disable the optimizations;]
      [yes/on: enable the optimizations.]
      [If not specified: determined by the compiler.]),
@@ -530,34 +408,34 @@ AC_ARG_ENABLE([intel-sse],
         AC_DEFINE([PNG_INTEL_SSE_OPT], [0],
                   [Disable Intel SSE optimizations])
         # Prevent inclusion of the assembler files below:
-         enable_intel_sse=no ;;
+         enable_intel_sse=no;;
      yes|on)
         AC_DEFINE([PNG_INTEL_SSE_OPT], [1],
                   [Enable Intel SSE optimizations]);;
      *)
-         AC_MSG_ERROR([--enable-intel-sse=${enable_intel_sse}:]
-                      [invalid argument])
+         AC_MSG_ERROR([--enable-intel-sse=${enable_intel_sse}: invalid value])
   esac])

-# Add Intel-specific files to all builds where $host_cpu is Intel ('x86*') or
-# where Intel optimizations were explicitly requested. (This allows a fallback
-# if a future host CPU does not match 'x86*'.)
+# Add Intel specific files to all builds where the host_cpu is Intel ('x86*')
+# or where Intel optimizations were explicitly requested (this allows a
+# fallback if a future host CPU does not match 'x86*')
 AM_CONDITIONAL([PNG_INTEL_SSE],
   [test "$enable_intel_sse" != 'no' &&
    case "$host_cpu" in
-      i?86|x86_64) : ;;
-      *)    test "$enable_intel_sse" != '' ;;
+      i?86|x86_64) :;;
+      *)    test "$enable_intel_sse" != '';;
    esac])

-# POWERPC VSX
-# ===========
+# PowerPC
+# ===
+#
+# PowerPC VSX (SIMD) support.

 AC_ARG_ENABLE([powerpc-vsx],
 AS_HELP_STRING([[[--enable-powerpc-vsx]]],
-      [Enable POWERPC VSX optimizations: =no/off, check, api, yes/on.]
-      [no/off: disable the optimizations;]
-      [check: use internal checking code;]
-      [api: disable by default, enable by a call to png_set_option;]
+      [Enable POWERPC VSX optimizations: =no/off, check, api, yes/on:]
+      [no/off: disable the optimizations; check: use internal checking code]
+      [api: disable by default, enable by a call to png_set_option]
      [yes/on: turn on unconditionally.]
      [If not specified: determined by the compiler.]),
   [case "$enableval" in
@@ -565,101 +443,36 @@ AS_HELP_STRING([[[--enable-powerpc-vsx]]],
         # disable the default enabling on __ppc64__ systems:
         AC_DEFINE([PNG_POWERPC_VSX_OPT], [0],
                   [Disable POWERPC VSX optimizations])
-         # Prevent inclusion of the platform-specific files below:
-         enable_powerpc_vsx=no ;;
+         # Prevent inclusion of the platform specific files below:
+         enable_powerpc_vsx=no;;
      check)
         AC_DEFINE([PNG_POWERPC_VSX_CHECK_SUPPORTED], [],
                   [Check for POWERPC VSX support at run-time])
-         AC_MSG_WARN([--enable-powerpc-vsx: please see contrib/powerpc/README]
-                     [for the list of supported systems.]);;
+         AC_MSG_WARN([--enable-powerpc-vsx Please check contrib/powerpc/README file]
+            [for the list of supported OSes.]);;
      api)
         AC_DEFINE([PNG_POWERPC_VSX_API_SUPPORTED], [],
                   [Turn on POWERPC VSX optimizations at run-time]);;
      yes|on)
         AC_DEFINE([PNG_POWERPC_VSX_OPT], [2],
                   [Enable POWERPC VSX optimizations])
-         AC_MSG_WARN([--enable-powerpc-vsx: please specify 'check' or 'api';]
-            [if you want the optimizations unconditionally,]
-            [pass '-maltivec -mvsx' or '-mcpu=power8' to the compiler.]);;
+         AC_MSG_WARN([--enable-powerpc-vsx: please specify 'check' or 'api', if]
+            [you want the optimizations unconditionally pass '-maltivec -mvsx']
+            [or '-mcpu=power8'to the compiler.]);;
      *)
-         AC_MSG_ERROR([--enable-powerpc-vsx=${enable_powerpc_vsx}:]
-                      [invalid argument])
+         AC_MSG_ERROR([--enable-powerpc-vsx=${enable_powerpc_vsx}: invalid value])
   esac])

-# Add PowerPC-specific files to all builds where $host_cpu is powerpc
-# ('powerpc*') or where PowerPC optimizations were explicitly requested.
-# (This allows a fallback if a future host CPU does not match 'powerpc*'.)
+# Add PowerPC specific files to all builds where the host_cpu is powerpc('powerpc*') or
+# where POWERPC optimizations were explicitly requested (this allows a fallback if a
+# future host CPU does not match 'powerpc*')

 AM_CONDITIONAL([PNG_POWERPC_VSX],
   [test "$enable_powerpc_vsx" != 'no' &&
    case "$host_cpu" in
-      powerpc*|ppc64*) : ;;
+      powerpc*|ppc64*) :;;
    esac])

-# LOONGARCH LSX
-# =============
-
-AC_ARG_ENABLE([loongarch-lsx],
-   AS_HELP_STRING([[[--enable-loongarch-lsx]]],
-      [Enable LOONGARCH LSX optimizations: =no/off, yes/on:]
-      [no/off: disable the optimizations;]
-      [yes/on: turn on unconditionally.]
-      [If not specified: determined by the compiler.]),
-   [case "$enableval" in
-      no|off)
-         # disable the default enabling on __loongarch_simd systems:
-         AC_DEFINE([PNG_LOONGARCH_LSX_OPT], [0],
-                   [Disable LOONGARCH LSX optimizations])
-         # Prevent inclusion of the assembler files below:
-         enable_loongarch_lsx=no;;
-      yes|on)
-         AC_DEFINE([PNG_LOONGARCH_LSX_OPT], [1],
-                   [Enable LOONGARCH LSX optimizations])
-         ;;
-      *)
-         AC_MSG_ERROR([--enable-loongarch-lsx=${enable_loongarch_lsx}:]
-                      [invalid argument])
-   esac])
-
-if test "$enable_loongarch_lsx" != "no" &&
-   case "$host_cpu" in
-      loongarch*) : ;;
-      *)    test "$enable_loongarch_lsx" != '' ;;
-   esac
-then
-   compiler_support_loongarch_lsx=no
-   AC_MSG_CHECKING(whether to use LoongArch LSX intrinsics)
-   save_CFLAGS="$CFLAGS"
-   LSX_CFLAGS="${LSX_CFLAGS:-"-mlsx"}"
-   CFLAGS="$CFLAGS $LSX_CFLAGS"
-   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-#include <lsxintrin.h>
-int main(){
-   __m128i a, b, c;
-   a = __lsx_vadd_w(b, c);
-   return 0;
-}]])],compiler_support_loongarch_lsx=yes)
-   CFLAGS="$save_CFLAGS"
-   AC_MSG_RESULT($compiler_support_loongarch_lsx)
-   if test "$compiler_support_loongarch_lsx" = "yes"; then
-      AC_DEFINE([PNG_LOONGARCH_LSX_OPT], [1],
-                [Enable LOONGARCH LSX optimizations])
-   else
-      AC_MSG_WARN([Compiler does not support loongarch LSX.])
-   fi
-fi
-
-# Add LoongArch specific files to all builds where the host_cpu is loongarch
-# ('loongarch*') or where LoongArch optimizations were explicitly requested.
-# (This allows a fallback if a future host CPU does not match 'loongarch*'.)
-
-AM_CONDITIONAL([PNG_LOONGARCH_LSX],
-   [test "$enable_loongarch_lsx" != "no" &&
-    test "$compiler_support_loongarch_lsx" = "yes" &&
-    case "$host_cpu" in
-      loongarch*) : ;;
-      *)    test "$enable_loongarch_lsx" != '' ;;
-    esac])

 AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])

--- a/contrib/.editorconfig
+++ b/contrib/.editorconfig
@@ -1,9 +0,0 @@
-# https://editorconfig.org
-
-root = false
-
-[*.[ch]]
-indent_size = unset
-indent_style = unset
-max_doc_length = unset
-max_line_length = unset
--- a/contrib/README.txt
+++ b/contrib/README.txt
@@ -1,5 +1,3 @@
-External contributions to libpng
--------------------------------

 This "contrib" directory contains contributions which are not necessarily under
 the libpng license, although all are open source.  They are not part of
--- a/contrib/arm-neon/android-ndk.c
+++ b/contrib/arm-neon/android-ndk.c
@@ -2,6 +2,7 @@
 *
 * Copyright (c) 2014 Glenn Randers-Pehrson
 * Written by John Bowler, 2014.
+ * Last changed in libpng 1.6.10 [March 6, 2014]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
@@ -23,7 +24,6 @@
 * has been compiled only, not linked: no version of the library has been found,
 * only the header files exist in the NDK.
 */
-
 #include <cpu-features.h>

 static int
--- a/contrib/arm-neon/linux-auxv.c
+++ b/contrib/arm-neon/linux-auxv.c
@@ -2,6 +2,7 @@
 *
 * Copyright (c) 2014 Glenn Randers-Pehrson
 * Written by Mans Rullgard, 2011.
+ * Last changed in libpng 1.6.10 [March 6, 2014]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
@@ -21,7 +22,6 @@
 * This generic __linux__ implementation requires reading /proc/self/auxv and
 * looking at each element for one that records NEON capabilities.
 */
-
 #include <unistd.h> /* for POSIX 1003.1 */
 #include <errno.h>  /* for EINTR */

--- a/contrib/arm-neon/linux.c
+++ b/contrib/arm-neon/linux.c
@@ -1,7 +1,8 @@
 /* contrib/arm-neon/linux.c
 *
- * Copyright (c) 2014, 2017 Glenn Randers-Pehrson
- * Written by John Bowler, 2014, 2017.
+ * Copyright (c) 2014 Glenn Randers-Pehrson
+ * Written by John Bowler, 2014.
+ * Last changed in libpng 1.6.16 [December 22, 2014]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
@@ -18,7 +19,6 @@
 * This code is strict ANSI-C and is probably moderately portable; it does
 * however use <stdio.h> and it assumes that /proc/cpuinfo is never localized.
 */
-
 #include <stdio.h>

 static int
@@ -62,7 +62,7 @@ png_have_neon(png_structp png_ptr)

               counter=0;
               state = Feature;
-               /* FALLTHROUGH */
+               /* FALL THROUGH */

            case Feature:
               /* Match 'FEATURE', ASCII case insensitive. */
@@ -75,7 +75,7 @@ png_have_neon(png_structp png_ptr)

               /* did not match 'feature' */
               state = SkipLine;
-               /* FALLTHROUGH */
+               /* FALL THROUGH */

            case SkipLine:
            skipLine:
@@ -110,7 +110,7 @@ png_have_neon(png_structp png_ptr)

               state = Neon;
               counter = 0;
-               /* FALLTHROUGH */
+               /* FALL THROUGH */

            case Neon:
               /* Look for 'neon' tag */
@@ -122,7 +122,7 @@ png_have_neon(png_structp png_ptr)
               }

               state = SkipTag;
-               /* FALLTHROUGH */
+               /* FALL THROUGH */

            case SkipTag:
               /* Skip non-space characters */
--- a/contrib/conftest/basic.dfa
+++ b/contrib/conftest/basic.dfa
@@ -1,133 +0,0 @@
-# basic.dfa
-#  Build time configuration of libpng
-#
-# Author: John Bowler
-# Copyright: (c) John Bowler, 2024
-# Usage rights:
-#  To the extent possible under law, the author has waived all copyright and
-#  related or neighboring rights to this work.  This work is published from:
-#  United States.
-#
-# Build libpng with basic read and write support.  This enables the lowest
-# level libpng read and write APIs - the "row-by-row" ones.
-#
-# Support is enabled only for those transformations that are observed to be
-# required by widely used apps or are in the v3 specification.
-#
-
-everything = off
-
-# The sequential read code is enabled here; the progressive code can be used
-# instead but there is no point enabling both.
-
-option READ on
-option SEQUENTIAL_READ on
-option EASY_ACCESS on
-option SET_USER_LIMITS on
-option INFO_IMAGE on
-option READ_16BIT on
-
-# Errors: these can be disabled but then there won't be any error messages
-# just failures and the error messages are really needed for apps:
-option WARNINGS on
-option ERROR_TEXT on
-option BENIGN_READ_ERRORS on
-
-# Required for many display programs such as web browsers:
-option PROGRESSIVE_READ on
-
-# Switch on the write code - this makes a minimalist encoder but with
-# interlace support turned on; otherwise png_read_png..png_write_png will
-# fail on an interlaced image.
-option WRITE on
-option WRITE_INTERLACING on
-option WRITE_16BIT on
-
-# Usages of the 'fixed' APIs are relatively rare but they do occur
-# one or the other for both the API and the internal math.
-
-#Fixed point:
-option FIXED_POINT on
-
-#Floating point:
-option FLOATING_POINT on
-option FLOATING_ARITHMETIC on
-
-# Basic error handling, IO and user memory support.  The latter allows the
-# application program to provide its own implementations of 'malloc' and 'free'.
-option SETJMP on
-option STDIO on
-option USER_MEM on
-
-# Gamma handling: this needs to be on for the gamma handling
-option READ_GAMMA on
-
-# The supported chunks
-chunk bKGD on
-chunk cHRM on
-chunk eXIf on
-chunk gAMA on
-chunk iCCP on
-chunk iTXt on
-chunk pHYs on
-chunk sBIT on
-chunk sRGB on
-chunk tEXt on
-chunk tIME on
-chunk tRNS on
-chunk zTXt on
-
-# These don't seem to be used anywhere:
-# chunk pCAL
-# chunk sCAL
-# chunk sPLT
-
-# The rest of this is app dependent: none of these options are required for
-# read/write of the full range of PNG files and the normal chunk handling on
-# read.
-option WRITE_CUSTOMIZE_ZTXT_COMPRESSION on
-option WRITE_CUSTOMIZE_COMPRESSION on
-
-option READ_EXPAND on
-option READ_FILLER on
-option READ_GRAY_TO_RGB on
-option READ_INVERT on
-option READ_PACK on
-option READ_RGB_TO_GRAY on
-option READ_SCALE_16_TO_8 on
-option READ_SHIFT on
-option READ_STRIP_16_TO_8 on
-option READ_STRIP_ALPHA on
-option READ_SWAP on
-
-option CONVERT_tIME on
-
-# optipng
-option IO_STATE on
-option STORE_UNKNOWN_CHUNKS on
-option HANDLE_AS_UNKNOWN on
-
-# pngcrush
-option READ_USER_TRANSFORM on
-option WRITE_FLUSH on
-
-# pnmtopng
-chunk hIST on
-
-# cairo
-option WRITE_PACKSWAP on
-option WRITE_USER_TRANSFORM on
-
-# graphicsmagick
-option READ_USER_CHUNKS on
-
-# Qt5.15 qtgui (gentoo package split) Qt6.6 qtbase
-option READ_BGR on
-option WRITE_BGR on
-option READ_SWAP_ALPHA on
-option WRITE_SWAP_ALPHA on
-chunk oFFs on
-
-# ghostscript-gpl
-option WRITE_INVERT_ALPHA on
-option WRITE_INVERT on
--- a/contrib/conftest/pngcp.dfa
+++ b/contrib/conftest/pngcp.dfa
@@ -33,7 +33,7 @@ option WRITE_16BIT on
 option WRITE_FILTER on

 # pngcp needs this to preserve unknown chunks, switching all these on means that
-# pngcp can work without explicit known chunk reading support
+# pngcp can work without explicit known chunk reading suppport
 option UNKNOWN_CHUNKS on
 option SET_UNKNOWN_CHUNKS on
 option HANDLE_AS_UNKNOWN on
@@ -52,6 +52,6 @@ option TEXT on
 option USER_LIMITS on
 option SET_USER_LIMITS on

-# these are just required for specific customizations
+# these are are just required for specific customizations
 option WRITE_CUSTOMIZE_ZTXT_COMPRESSION on
 option WRITE_CUSTOMIZE_COMPRESSION on
--- a/contrib/examples/README.txt
+++ b/contrib/examples/README.txt
@@ -1,3 +1,4 @@
+
 This directory (contrib/examples) contains examples of libpng usage.

 NO COPYRIGHT RIGHTS ARE CLAIMED TO ANY OF THE FILES IN THIS DIRECTORY.
--- a/contrib/examples/iccfrompng.c
+++ b/contrib/examples/iccfrompng.c
@@ -10,7 +10,7 @@
 * without processing the image.  Notice that some header information may occur
 * after the image data. Textual data and comments are an example; the approach
 * in this file won't work reliably for such data because it only looks for the
- * information in the section of the file that precedes the image data.
+ * information in the section of the file that preceeds the image data.
 *
 * Compile and link against libpng and zlib, plus anything else required on the
 * system you use.
@@ -80,7 +80,7 @@ extract(FILE *fp, png_uint_32 *proflen)
      }

      else
-         result = no_profile;
+	result = no_profile;
   }

   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -155,7 +155,7 @@ extract_one_file(const char *filename)
      }

      else if (verbose && profile == no_profile)
-         printf("%s has no profile\n", filename);
+	printf("%s has no profile\n", filename);
   }

   else
--- a/contrib/examples/pngpixel.c
+++ b/contrib/examples/pngpixel.c
@@ -42,7 +42,7 @@ component(png_const_bytep row, png_uint_32 x, unsigned int c,
   png_uint_32 bit_offset_hi = bit_depth * ((x >> 6) * channels);
   png_uint_32 bit_offset_lo = bit_depth * ((x & 0x3f) * channels + c);

-   row = (png_const_bytep)(((const png_byte (*)[8])row) + bit_offset_hi);
+   row = (png_const_bytep)(((PNG_CONST png_byte (*)[8])row) + bit_offset_hi);
   row += bit_offset_lo >> 3;
   bit_offset_lo &= 0x07;

@@ -73,7 +73,7 @@ static void
 print_pixel(png_structp png_ptr, png_infop info_ptr, png_const_bytep row,
   png_uint_32 x)
 {
-   unsigned int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
+   PNG_CONST unsigned int bit_depth = png_get_bit_depth(png_ptr, info_ptr);

   switch (png_get_color_type(png_ptr, info_ptr))
   {
@@ -87,7 +87,7 @@ print_pixel(png_structp png_ptr, png_infop info_ptr, png_const_bytep row,
       */
      case PNG_COLOR_TYPE_PALETTE:
         {
-            int index = component(row, x, 0, bit_depth, 1);
+            PNG_CONST int index = component(row, x, 0, bit_depth, 1);
            png_colorp palette = NULL;
            int num_palette = 0;

--- a/contrib/examples/pngtopng.c
+++ b/contrib/examples/pngtopng.c
@@ -5,6 +5,8 @@
 * related or neighboring rights to this work.  This work is published from:
 * United States.
 *
+ * Last changed in libpng 1.6.29 [March 16, 2017]
+ *
 * Read a PNG and write it out in a fixed format, using the 'simplified API'
 * that was introduced in libpng-1.6.0.
 *
--- a/contrib/gregbook/readpng2.c
+++ b/contrib/gregbook/readpng2.c
@@ -146,7 +146,7 @@ int readpng2_init(mainprog_info *mainprog_ptr)
        /* These byte strings were copied from png.h.  If a future version
         * of readpng2.c recognizes more chunks, add them to this list.
         */
-        static const png_byte chunks_to_process[] = {
+        static PNG_CONST png_byte chunks_to_process[] = {
            98,  75,  71,  68, '\0',  /* bKGD */
           103,  65,  77,  65, '\0',  /* gAMA */
           115,  82,  71,  66, '\0',  /* sRGB */
--- a/contrib/gregbook/rpng-x.c
+++ b/contrib/gregbook/rpng-x.c
@@ -21,7 +21,7 @@
    - 1.10:  added support for non-default visuals; fixed X pixel-conversion
    - 1.11:  added extra set of parentheses to png_jmpbuf() macro; fixed
              command-line parsing bug
-    - 1.12:  fixed some small X memory leaks (thanks to François Petitjean)
+    - 1.12:  fixed some small X memory leaks (thanks to François Petitjean)
    - 1.13:  fixed XFreeGC() crash bug (thanks to Patrick Welche)
    - 1.14:  added support for X resources (thanks to Gerhard Niklasch)
    - 2.00:  dual-licensed (added GNU GPL)
--- a/contrib/gregbook/rpng2-x.c
+++ b/contrib/gregbook/rpng2-x.c
@@ -27,7 +27,7 @@
    - 1.11:  added -usleep option for demos; fixed command-line parsing bug
    - 1.12:  added -pause option for demos and testing
    - 1.20:  added runtime MMX-enabling/disabling and new -mmx* options
-    - 1.21:  fixed some small X memory leaks (thanks to François Petitjean)
+    - 1.21:  fixed some small X memory leaks (thanks to François Petitjean)
    - 1.22:  fixed XFreeGC() crash bug (thanks to Patrick Welche)
    - 1.23:  added -bgpat 0 mode (std white/gray checkerboard, 8x8 squares)
    - 1.30:  added -loop option for -bgpat (ifdef FEATURE_LOOP); fixed bpp =
--- a/contrib/libtests/gentests.sh
+++ b/contrib/libtests/gentests.sh
@@ -2,6 +2,8 @@
 #
 # Copyright (c) 2013 John Cunningham Bowler
 #
+# Last changed in libpng 1.6.0 [February 14, 2013]
+#
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
--- a/contrib/libtests/makepng.c
+++ b/contrib/libtests/makepng.c
@@ -3,6 +3,8 @@
 /* Copyright: */
 #define COPYRIGHT "\251 2013,2015 John Cunningham Bowler"
 /*
+ * Last changed in libpng 1.6.20 [November 24, 2015]
+ *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
@@ -297,28 +299,25 @@ generate_palette(png_colorp palette, png_bytep trans, int bit_depth,
            unsigned int x, y;
            volatile unsigned int ip = 0;

-            for (x=0; x<size; ++x)
+            for (x=0; x<size; ++x) for (y=0; y<size; ++y)
            {
-               for (y=0; y<size; ++y)
-               {
-                  ip = x + (size * y);
+               ip = x + (size * y);

-                  /* size is at most 16, so the scaled value below fits in 16 bits
-                  */
-#                 define interp(pos, c1, c2) ((pos * c1) + ((size-pos) * c2))
-#                 define xyinterp(x, y, c1, c2, c3, c4) (((size * size / 2) +\
-                     (interp(x, c1, c2) * y + (size-y) * interp(x, c3, c4))) /\
-                     (size*size))
+               /* size is at most 16, so the scaled value below fits in 16 bits
+                */
+#              define interp(pos, c1, c2) ((pos * c1) + ((size-pos) * c2))
+#              define xyinterp(x, y, c1, c2, c3, c4) (((size * size / 2) +\
+                  (interp(x, c1, c2) * y + (size-y) * interp(x, c3, c4))) /\
+                  (size*size))

-                  set_color(palette+ip, trans+ip,
-                     /* color:    green, red,blue,white */
-                     xyinterp(x, y,   0, 255,   0, 255),
-                     xyinterp(x, y, 255,   0,   0, 255),
-                     xyinterp(x, y,   0,   0, 255, 255),
-                     /* alpha:        0, 102, 204, 255) */
-                     xyinterp(x, y,   0, 102, 204, 255),
-                     gamma_table);
-               }
+               set_color(palette+ip, trans+ip,
+                  /* color:    green, red,blue,white */
+                  xyinterp(x, y,   0, 255,   0, 255),
+                  xyinterp(x, y, 255,   0,   0, 255),
+                  xyinterp(x, y,   0,   0, 255, 255),
+                  /* alpha:        0, 102, 204, 255) */
+                  xyinterp(x, y,   0, 102, 204, 255),
+                  gamma_table);
            }

            return ip+1;
@@ -397,7 +396,7 @@ generate_row(png_bytep row, size_t rowbytes, unsigned int y, int color_type,
      image_size_of_type(color_type, bit_depth, colors, small)-1;
   png_uint_32 depth_max = (1U << bit_depth)-1; /* up to 65536 */

-   if (colors[0] == 0 && small)
+   if (colors[0] == 0) if (small)
   {
      unsigned int pixel_depth = pixel_depth_of_type(color_type, bit_depth);

@@ -496,7 +495,7 @@ generate_row(png_bytep row, size_t rowbytes, unsigned int y, int color_type,
         case 32:
         case 48:
         case 64:
-            /* The rows are filled by an algorithm similar to the above, in the
+            /* The rows are filled by an alogorithm similar to the above, in the
             * first row pixel bytes are all equal, increasing from 0 by 1 for
             * each pixel.  In the second row the bytes within a pixel are
             * incremented 1,3,5,7,... from the previous row byte.  Using an odd
@@ -662,7 +661,7 @@ generate_row(png_bytep row, size_t rowbytes, unsigned int y, int color_type,
      {
         case 1:
            {
-               png_uint_32 luma = colors[1];
+               const png_uint_32 luma = colors[1];
               png_uint_32 x;

               for (x=0; x<=size_max; ++x)
@@ -673,8 +672,8 @@ generate_row(png_bytep row, size_t rowbytes, unsigned int y, int color_type,

         case 2:
            {
-               png_uint_32 luma = colors[1];
-               png_uint_32 alpha = colors[2];
+               const png_uint_32 luma = colors[1];
+               const png_uint_32 alpha = colors[2];
               png_uint_32 x;

               for (x=0; x<size_max; ++x)
@@ -689,9 +688,9 @@ generate_row(png_bytep row, size_t rowbytes, unsigned int y, int color_type,

         case 3:
            {
-               png_uint_32 red = colors[1];
-               png_uint_32 green = colors[2];
-               png_uint_32 blue = colors[3];
+               const png_uint_32 red = colors[1];
+               const png_uint_32 green = colors[2];
+               const png_uint_32 blue = colors[3];
               png_uint_32 x;

               for (x=0; x<=size_max; ++x)
@@ -708,10 +707,10 @@ generate_row(png_bytep row, size_t rowbytes, unsigned int y, int color_type,

         case 4:
            {
-               png_uint_32 red = colors[1];
-               png_uint_32 green = colors[2];
-               png_uint_32 blue = colors[3];
-               png_uint_32 alpha = colors[4];
+               const png_uint_32 red = colors[1];
+               const png_uint_32 green = colors[2];
+               const png_uint_32 blue = colors[3];
+               const png_uint_32 alpha = colors[4];
               png_uint_32 x;

               for (x=0; x<=size_max; ++x)
@@ -813,7 +812,7 @@ write_png(const char **name, FILE *fp, int color_type, int bit_depth,
      png_error(png_ptr, "OOM allocating info structure");

   {
-      unsigned int size =
+      const unsigned int size =
         image_size_of_type(color_type, bit_depth, colors, small);
      unsigned int ysize;
      png_fixed_point real_gamma = 45455; /* For sRGB */
@@ -825,7 +824,7 @@ write_png(const char **name, FILE *fp, int color_type, int bit_depth,
       */
      if (small)
      {
-         unsigned int pixel_depth =
+         const unsigned int pixel_depth =
            pixel_depth_of_type(color_type, bit_depth);

         if (pixel_depth <= 8U)
@@ -859,13 +858,10 @@ write_png(const char **name, FILE *fp, int color_type, int bit_depth,
      {
         unsigned int i;

-         if (real_gamma == 45455)
+         if (real_gamma == 45455) for (i=0; i<256; ++i)
         {
-            for (i=0; i<256; ++i)
-            {
-               gamma_table[i] = (png_byte)i;
-               conv = 1.;
-            }
+            gamma_table[i] = (png_byte)i;
+            conv = 1.;
         }

         else
@@ -954,7 +950,7 @@ write_png(const char **name, FILE *fp, int color_type, int bit_depth,
            int passes = 1;
 #        endif /* !WRITE_INTERLACING */
         int pass;
-         size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+         png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);

         row = malloc(rowbytes);

@@ -1098,7 +1094,7 @@ load_file(png_const_charp name, png_bytepp result)
   return 0;
 }

-static size_t
+static png_size_t
 load_fake(png_charp param, png_bytepp profile)
 {
   char *endptr = NULL;
@@ -1168,7 +1164,7 @@ insert_iCCP(png_structp png_ptr, png_infop info_ptr, int nparams,
   {
      case '<':
         {
-            size_t filelen = load_file(params[1]+1, &profile);
+            png_size_t filelen = load_file(params[1]+1, &profile);
            if (filelen > 0xfffffffc) /* Maximum profile length */
            {
               fprintf(stderr, "%s: file too long (%lu) for an ICC profile\n",
@@ -1183,7 +1179,7 @@ insert_iCCP(png_structp png_ptr, png_infop info_ptr, int nparams,
      case '0': case '1': case '2': case '3': case '4':
      case '5': case '6': case '7': case '8': case '9':
         {
-            size_t fake_len = load_fake(params[1], &profile);
+            png_size_t fake_len = load_fake(params[1], &profile);

            if (fake_len > 0) /* else a simple parameter */
            {
@@ -1278,7 +1274,7 @@ set_text(png_structp png_ptr, png_infop info_ptr, png_textp text,
      case '5': case '6': case '7': case '8': case '9':
         {
            png_bytep data = NULL;
-            size_t fake_len = load_fake(param, &data);
+            png_size_t fake_len = load_fake(param, &data);

            if (fake_len > 0) /* else a simple parameter */
            {
@@ -1382,10 +1378,10 @@ static void
 insert_sBIT(png_structp png_ptr, png_infop info_ptr, int nparams,
      png_charpp params)
 {
-   int ct = png_get_color_type(png_ptr, info_ptr);
-   int c = (ct & PNG_COLOR_MASK_COLOR ? 3 : 1) +
+   const int ct = png_get_color_type(png_ptr, info_ptr);
+   const int c = (ct & PNG_COLOR_MASK_COLOR ? 3 : 1) +
      (ct & PNG_COLOR_MASK_ALPHA ? 1 : 0);
-   unsigned int maxval =
+   const unsigned int maxval =
      ct & PNG_COLOR_MASK_PALETTE ? 8U : png_get_bit_depth(png_ptr, info_ptr);
   png_color_8 sBIT;

@@ -1434,13 +1430,10 @@ find_parameters(png_const_charp what, png_charp param, png_charp *list,
   for (i=0; *param && i<nparams; ++i)
   {
      list[i] = param;
-      while (*++param)
+      while (*++param) if (*param == '\n' || *param == ':')
      {
-         if (*param == '\n' || *param == ':')
-         {
-            *param++ = 0; /* Terminate last parameter */
-            break;        /* And start a new one. */
-         }
+         *param++ = 0; /* Terminate last parameter */
+         break;        /* And start a new one. */
      }
   }

@@ -1863,7 +1856,7 @@ main(int argc, char **argv)

   /* Check the colors */
   {
-      unsigned int lim = (color_type == PNG_COLOR_TYPE_PALETTE ? 255U :
+      const unsigned int lim = (color_type == PNG_COLOR_TYPE_PALETTE ? 255U :
         (1U<<bit_depth)-1);
      unsigned int i;

@@ -1876,7 +1869,7 @@ main(int argc, char **argv)
         }
   }

-   /* small and colors are incompatible (will probably crash if both are used at
+   /* small and colors are incomparible (will probably crash if both are used at
    * the same time!)
    */
   if (small && colors[0] != 0)
--- a/contrib/libtests/pngimage.c
+++ b/contrib/libtests/pngimage.c
@@ -1,8 +1,9 @@
 /* pngimage.c
 *
- * Copyright (c) 2021 Cosmin Truta
 * Copyright (c) 2015,2016 John Cunningham Bowler
 *
+ * Last changed in libpng 1.6.24 [August 4, 2016]
+ *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
@@ -11,7 +12,6 @@
 * using png_read_png and then write with png_write_png.  Test all possible
 * transforms.
 */
-
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -317,10 +317,11 @@ transform_name(int t)

   t &= -t; /* first set bit */

-   for (i=0; i<TTABLE_SIZE; ++i)
-      if (transform_info[i].name != NULL)
-         if ((transform_info[i].transform & t) != 0)
-            return transform_info[i].name;
+   for (i=0; i<TTABLE_SIZE; ++i) if (transform_info[i].name != NULL)
+   {
+      if ((transform_info[i].transform & t) != 0)
+         return transform_info[i].name;
+   }

   return "invalid transform";
 }
@@ -337,16 +338,13 @@ validate_T(void)
 {
   unsigned int i;

-   for (i=0; i<TTABLE_SIZE; ++i)
+   for (i=0; i<TTABLE_SIZE; ++i) if (transform_info[i].name != NULL)
   {
-      if (transform_info[i].name != NULL)
-      {
-         if (transform_info[i].when & TRANSFORM_R)
-            read_transforms |= transform_info[i].transform;
+      if (transform_info[i].when & TRANSFORM_R)
+         read_transforms |= transform_info[i].transform;

-         if (transform_info[i].when & TRANSFORM_W)
-            write_transforms |= transform_info[i].transform;
-      }
+      if (transform_info[i].when & TRANSFORM_W)
+         write_transforms |= transform_info[i].transform;
   }

   /* Reversible transforms are those which are supported on both read and
@@ -553,7 +551,7 @@ struct display
   png_structp    original_pp;       /* used on the original read */
   png_infop      original_ip;       /* set by the original read */

-   size_t         original_rowbytes; /* of the original rows: */
+   png_size_t     original_rowbytes; /* of the original rows: */
   png_bytepp     original_rows;     /* from the original read */

   /* Original chunks valid */
@@ -809,7 +807,7 @@ display_cache_file(struct display *dp, const char *filename)

 static void
 buffer_read(struct display *dp, struct buffer *bp, png_bytep data,
-   size_t size)
+   png_size_t size)
 {
   struct buffer_list *last = bp->current;
   size_t read_count = bp->read_count;
@@ -857,7 +855,7 @@ buffer_read(struct display *dp, struct buffer *bp, png_bytep data,
 }

 static void PNGCBAPI
-read_function(png_structp pp, png_bytep data, size_t size)
+read_function(png_structp pp, png_bytep data, png_size_t size)
 {
   buffer_read(get_dp(pp), get_buffer(pp), data, size);
 }
@@ -929,7 +927,7 @@ update_display(struct display *dp)
   png_structp pp;
   png_infop   ip;

-   /* Now perform the initial read with a 0 transform. */
+   /* Now perform the initial read with a 0 tranform. */
   read_png(dp, &dp->original_file, "original read", 0/*no transform*/);

   /* Move the result to the 'original' fields */
@@ -964,24 +962,21 @@ update_display(struct display *dp)
      int bd = dp->bit_depth;
      unsigned int i;

-      for (i=0; i<TTABLE_SIZE; ++i)
+      for (i=0; i<TTABLE_SIZE; ++i) if (transform_info[i].name != NULL)
      {
-         if (transform_info[i].name != NULL)
-         {
-            int transform = transform_info[i].transform;
+         int transform = transform_info[i].transform;

-            if ((transform_info[i].valid_chunks == 0 ||
-                  (transform_info[i].valid_chunks & chunks) != 0) &&
-               (transform_info[i].color_mask_required & ct) ==
-                  transform_info[i].color_mask_required &&
-               (transform_info[i].color_mask_absent & ct) == 0 &&
-               (transform_info[i].bit_depths & bd) != 0 &&
-               (transform_info[i].when & TRANSFORM_R) != 0)
-               active |= transform;
+         if ((transform_info[i].valid_chunks == 0 ||
+               (transform_info[i].valid_chunks & chunks) != 0) &&
+            (transform_info[i].color_mask_required & ct) ==
+               transform_info[i].color_mask_required &&
+            (transform_info[i].color_mask_absent & ct) == 0 &&
+            (transform_info[i].bit_depths & bd) != 0 &&
+            (transform_info[i].when & TRANSFORM_R) != 0)
+            active |= transform;

-            else if ((transform_info[i].when & TRANSFORM_R) != 0)
-               inactive |= transform;
-         }
+         else if ((transform_info[i].when & TRANSFORM_R) != 0)
+            inactive |= transform;
      }

      /* Some transforms appear multiple times in the table; the 'active' status
@@ -1005,9 +1000,8 @@ compare_read(struct display *dp, int applied_transforms)
   int interlace_method, compression_method, filter_method;
   const char *e = NULL;

-   if (!png_get_IHDR(dp->read_pp, dp->read_ip, &width, &height, &bit_depth,
-      &color_type, &interlace_method, &compression_method, &filter_method))
-      display_log(dp, LIBPNG_BUG, "png_get_IHDR failed");
+   png_get_IHDR(dp->read_pp, dp->read_ip, &width, &height, &bit_depth,
+      &color_type, &interlace_method, &compression_method, &filter_method);

 #  define C(item) if (item != dp->item) \
      display_log(dp, APP_WARNING, "IHDR " #item "(%lu) changed to %lu",\
@@ -1018,12 +1012,7 @@ compare_read(struct display *dp, int applied_transforms)
   C(height);
   C(bit_depth);
   C(color_type);
-#  ifdef PNG_WRITE_INTERLACING_SUPPORTED
-      /* If write interlace has been disabled, the PNG file is still
-       * written correctly, but as a regular (not-interlaced) PNG.
-       */
-      C(interlace_method);
-#  endif
+   C(interlace_method);
   C(compression_method);
   C(filter_method);

@@ -1092,9 +1081,8 @@ compare_read(struct display *dp, int applied_transforms)
               size_t x;

               /* Find the first error */
-               for (x=0; x<rowbytes-1; ++x)
-                  if (row[x] != orig[x])
-                     break;
+               for (x=0; x<rowbytes-1; ++x) if (row[x] != orig[x])
+                  break;

               display_log(dp, APP_FAIL,
                  "byte(%lu,%lu) changed 0x%.2x -> 0x%.2x",
@@ -1149,7 +1137,6 @@ compare_read(struct display *dp, int applied_transforms)
               display_log(dp, LIBPNG_ERROR, "invalid colour type %d",
                  color_type);
               /*NOTREACHED*/
-               memset(sig_bits, 0, sizeof(sig_bits));
               bpp = 0;
               break;
         }
@@ -1211,7 +1198,7 @@ compare_read(struct display *dp, int applied_transforms)
               sig_bits[0] = (png_byte)b;
               break;

-            case 4: /* Replicate twice */
+            case 4: /* Relicate twice */
               /* Value is 1, 2, 3 or 4 */
               b = 0xf & ((0xf << 4) >> sig_bits[0]);
               b |= b << 4;
@@ -1280,7 +1267,7 @@ compare_read(struct display *dp, int applied_transforms)
 #ifdef PNG_WRITE_PNG_SUPPORTED
 static void
 buffer_write(struct display *dp, struct buffer *buffer, png_bytep data,
-   size_t size)
+   png_size_t size)
   /* Generic write function used both from the write callback provided to
    * libpng and from the generic read code.
    */
@@ -1324,7 +1311,7 @@ buffer_write(struct display *dp, struct buffer *buffer, png_bytep data,
 }

 static void PNGCBAPI
-write_function(png_structp pp, png_bytep data, size_t size)
+write_function(png_structp pp, png_bytep data, png_size_t size)
 {
   buffer_write(get_dp(pp), get_buffer(pp), data, size);
 }
@@ -1459,7 +1446,7 @@ test_one_file(struct display *dp, const char *filename)
       * unsigned, because some transforms are negative on a 16-bit system.
       */
      unsigned int active = dp->active_transforms;
-      int exhaustive = (dp->options & EXHAUSTIVE) != 0;
+      const int exhaustive = (dp->options & EXHAUSTIVE) != 0;
      unsigned int current = first_transform(active);
      unsigned int bad_transforms = 0;
      unsigned int bad_combo = ~0U;    /* bitwise AND of failing transforms */
@@ -1585,7 +1572,7 @@ do_test(struct display *dp, const char *file)
 }

 int
-main(int argc, char **argv)
+main(const int argc, const char * const * const argv)
 {
   /* For each file on the command line test it with a range of transforms */
   int option_end, ilog = 0;
@@ -1687,7 +1674,7 @@ main(int argc, char **argv)
         /* Here on any return, including failures, except user/internal issues
          */
         {
-            int pass = (d.options & STRICT) ?
+            const int pass = (d.options & STRICT) ?
               RESULT_STRICT(d.results) : RESULT_RELAXED(d.results);

            if (!pass)
@@ -1699,9 +1686,8 @@ main(int argc, char **argv)

               printf("%s: pngimage ", pass ? "PASS" : "FAIL");

-               for (j=1; j<option_end; ++j)
-                  if (j != ilog)
-                     printf("%s ", argv[j]);
+               for (j=1; j<option_end; ++j) if (j != ilog)
+                  printf("%s ", argv[j]);

               printf("%s\n", d.filename);
            }
--- a/contrib/libtests/pngstest.c
+++ b/contrib/libtests/pngstest.c
@@ -1,7 +1,9 @@
-/* pngstest.c
+/*-
+ * pngstest.c
 *
- * Copyright (c) 2021 Cosmin Truta
- * Copyright (c) 2013-2017 John Cunningham Bowler
+ * Copyright (c) 2013-2016 John Cunningham Bowler
+ *
+ * Last changed in libpng 1.6.24 [August 4, 2016]
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
@@ -9,9 +11,8 @@
 *
 * Test for the PNG 'simplified' APIs.
 */
-
 #define _ISOC90_SOURCE 1
-#define MALLOC_CHECK_ 2 /*glibc facility: turn on debugging*/
+#define MALLOC_CHECK_ 2/*glibc facility: turn on debugging*/

 #include <stddef.h>
 #include <stdlib.h>
@@ -372,7 +373,7 @@ print_opts(png_uint_32 opts)
 */
 #define FORMAT_COUNT 64
 #define FORMAT_MASK 0x3f
-static const char * const format_names[FORMAT_COUNT] =
+static PNG_CONST char * PNG_CONST format_names[FORMAT_COUNT] =
 {
   "sRGB-gray",
   "sRGB-gray+alpha",
@@ -578,11 +579,11 @@ typedef struct
   int         stride_extra;
   FILE       *input_file;
   png_voidp   input_memory;
-   size_t      input_memory_size;
+   png_size_t  input_memory_size;
   png_bytep   buffer;
   ptrdiff_t   stride;
-   size_t      bufsize;
-   size_t      allocsize;
+   png_size_t  bufsize;
+   png_size_t  allocsize;
   char        tmpfile_name[32];
   png_uint_16 colormap[256*4];
 }
@@ -665,7 +666,7 @@ static void initimage(Image *image, png_uint_32 opts, const char *file_name,
 static void
 allocbuffer(Image *image)
 {
-   size_t size = PNG_IMAGE_BUFFER_SIZE(image->image, image->stride);
+   png_size_t size = PNG_IMAGE_BUFFER_SIZE(image->image, image->stride);

   if (size+32 > image->bufsize)
   {
@@ -1142,7 +1143,7 @@ get_pixel(png_uint_32 format))(Pixel *p, png_const_voidp pb)
   }
 }

-/* Conversion between pixel formats.  The code above effectively eliminates the
+/* Convertion between pixel formats.  The code above effectively eliminates the
 * component ordering changes leaving three basic changes:
 *
 * 1) Remove an alpha channel by pre-multiplication or compositing on a
@@ -1150,7 +1151,7 @@ get_pixel(png_uint_32 format))(Pixel *p, png_const_voidp pb)
 *
 * 2) Remove color by mapping to grayscale.  (Grayscale to color is a no-op.)
 *
- * 3) Convert between 8-bit and 16-bit components.  (Both directions are
+ * 3) Convert between 8-bit and 16-bit components.  (Both directtions are
 *    relevant.)
 *
 * This gives the following base format conversion matrix:
@@ -2036,7 +2037,7 @@ typedef struct
   /* Precalculated values: */
   int          in_opaque;   /* Value of input alpha that is opaque */
   int          is_palette;  /* Sample values come from the palette */
-   int          accumulate;  /* Accumulate component errors (don't log) */
+   int          accumulate;  /* Accumlate component errors (don't log) */
   int          output_8bit; /* Output is 8-bit (else 16-bit) */

   void (*in_gp)(Pixel*, png_const_voidp);
@@ -2346,8 +2347,8 @@ static int
 logpixel(const Transform *transform, png_uint_32 x, png_uint_32 y,
   const Pixel *in, const Pixel *calc, const Pixel *out, const char *reason)
 {
-   png_uint_32 in_format = transform->in_image->image.format;
-   png_uint_32 out_format = transform->out_image->image.format;
+   const png_uint_32 in_format = transform->in_image->image.format;
+   const png_uint_32 out_format = transform->out_image->image.format;

   png_uint_32 back_format = out_format & ~PNG_FORMAT_FLAG_ALPHA;
   const char *via_linear = "";
@@ -2602,17 +2603,17 @@ compare_two_images(Image *a, Image *b, int via_linear,
   ptrdiff_t strideb = b->stride;
   png_const_bytep rowa = a->buffer+16;
   png_const_bytep rowb = b->buffer+16;
-   png_uint_32 width = a->image.width;
-   png_uint_32 height = a->image.height;
-   png_uint_32 formata = a->image.format;
-   png_uint_32 formatb = b->image.format;
-   unsigned int a_sample = PNG_IMAGE_SAMPLE_SIZE(formata);
-   unsigned int b_sample = PNG_IMAGE_SAMPLE_SIZE(formatb);
+   const png_uint_32 width = a->image.width;
+   const png_uint_32 height = a->image.height;
+   const png_uint_32 formata = a->image.format;
+   const png_uint_32 formatb = b->image.format;
+   const unsigned int a_sample = PNG_IMAGE_SAMPLE_SIZE(formata);
+   const unsigned int b_sample = PNG_IMAGE_SAMPLE_SIZE(formatb);
   int alpha_added, alpha_removed;
   int bchannels;
+   int btoa[4];
   png_uint_32 y;
   Transform tr;
-   int btoa[4]={0,0,0,0};

   /* This should never happen: */
   if (width != b->image.width || height != b->image.height)
@@ -2701,7 +2702,7 @@ compare_two_images(Image *a, Image *b, int via_linear,
            {
               if ((a->opts & ACCUMULATE) == 0)
               {
-                  char pindex[16];
+                  char pindex[9];
                  sprintf(pindex, "%lu[%lu]", (unsigned long)y,
                     (unsigned long)a->image.colormap_entries);
                  logerror(a, a->file_name, ": bad pixel index: ", pindex);
@@ -2712,12 +2713,12 @@ compare_two_images(Image *a, Image *b, int via_linear,
            else if (y >= b->image.colormap_entries)
            {
               if ((b->opts & ACCUMULATE) == 0)
-               {
-                  char pindex[16];
+                  {
+                  char pindex[9];
                  sprintf(pindex, "%lu[%lu]", (unsigned long)y,
                     (unsigned long)b->image.colormap_entries);
                  logerror(b, b->file_name, ": bad pixel index: ", pindex);
-               }
+                  }
               result = 0;
            }

@@ -2726,7 +2727,7 @@ compare_two_images(Image *a, Image *b, int via_linear,
               result = 0;
         }

-         /* If requested, copy the error values back from the Transform. */
+         /* If reqested copy the error values back from the Transform. */
         if (a->opts & ACCUMULATE)
         {
            tr.error_ptr[0] = tr.error[0];
@@ -2745,27 +2746,22 @@ compare_two_images(Image *a, Image *b, int via_linear,
       */
      else if ((a->opts & ACCUMULATE) == 0)
      {
-#        ifdef __GNUC__
-#           define BYTE_CHARS 20 /* 2^32: GCC sprintf warning */
-#        else
-#           define BYTE_CHARS 3 /* 2^8: real maximum value */
-#        endif
         /* Check the original image first,
          * TODO: deal with input images with bad pixel values?
          */
         if (amax >= a->image.colormap_entries)
         {
-            char pindex[3+2*BYTE_CHARS];
-            sprintf(pindex, "%d[%u]", amax,
-               (png_byte)/*SAFE*/a->image.colormap_entries);
+            char pindex[9];
+            sprintf(pindex, "%d[%lu]", amax,
+               (unsigned long)a->image.colormap_entries);
            return logerror(a, a->file_name, ": bad pixel index: ", pindex);
         }

         else if (bmax >= b->image.colormap_entries)
         {
-            char pindex[3+2*BYTE_CHARS];
-            sprintf(pindex, "%d[%u]", bmax,
-               (png_byte)/*SAFE*/b->image.colormap_entries);
+            char pindex[9];
+            sprintf(pindex, "%d[%lu]", bmax,
+               (unsigned long)b->image.colormap_entries);
            return logerror(b, b->file_name, ": bad pixel index: ", pindex);
         }
      }
@@ -2790,7 +2786,8 @@ compare_two_images(Image *a, Image *b, int via_linear,
      (formata & (formatb ^ PNG_FORMAT_FLAG_COLOR) & PNG_FORMAT_FLAG_COLOR)))
   {
      /* Was an alpha channel changed? */
-      png_uint_32 alpha_changed = (formata ^ formatb) & PNG_FORMAT_FLAG_ALPHA;
+      const png_uint_32 alpha_changed = (formata ^ formatb) &
+         PNG_FORMAT_FLAG_ALPHA;

      /* Was an alpha channel removed?  (The third test.)  If so the direct
       * comparison is only possible if the input alpha is opaque.
@@ -2820,11 +2817,8 @@ compare_two_images(Image *a, Image *b, int via_linear,
         bchannels = component_loc(bloc, formatb);

         /* Hence the btoa array. */
-         for (i=0; i<4; ++i)
-         {
-            if (bloc[i] < 4)
-               btoa[bloc[i]] = aloc[i]; /* may be '4' for alpha */
-         }
+         for (i=0; i<4; ++i) if (bloc[i] < 4)
+            btoa[bloc[i]] = aloc[i]; /* may be '4' for alpha */

         if (alpha_added)
            alpha_added = bloc[0]; /* location of alpha channel in image b */
@@ -2887,13 +2881,10 @@ compare_two_images(Image *a, Image *b, int via_linear,
               {
                  case 4:
                     if (pua[btoa[3]] != pub[3]) break;
-                     /* FALLTHROUGH */
                  case 3:
                     if (pua[btoa[2]] != pub[2]) break;
-                     /* FALLTHROUGH */
                  case 2:
                     if (pua[btoa[1]] != pub[1]) break;
-                     /* FALLTHROUGH */
                  case 1:
                     if (pua[btoa[0]] != pub[0]) break;
                     if (alpha_added != 4 && pub[alpha_added] != 65535) break;
@@ -2909,13 +2900,10 @@ compare_two_images(Image *a, Image *b, int via_linear,
               {
                  case 4:
                     if (psa[btoa[3]] != psb[3]) break;
-                     /* FALLTHROUGH */
                  case 3:
                     if (psa[btoa[2]] != psb[2]) break;
-                     /* FALLTHROUGH */
                  case 2:
                     if (psa[btoa[1]] != psb[1]) break;
-                     /* FALLTHROUGH */
                  case 1:
                     if (psa[btoa[0]] != psb[0]) break;
                     if (alpha_added != 4 && psb[alpha_added] != 255) break;
@@ -2934,7 +2922,7 @@ compare_two_images(Image *a, Image *b, int via_linear,
      }
   }

-   /* If requested, copy the error values back from the Transform. */
+   /* If reqested copy the error values back from the Transform. */
   if (a->opts & ACCUMULATE)
   {
      tr.error_ptr[0] = tr.error[0];
@@ -3212,10 +3200,10 @@ write_one_file(Image *output, Image *image, int convert_to_8bit)
   else if (image->opts & USE_FILE)
   {
 #ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
-      static unsigned int counter = 0;
+      static int counter = 0;
      char name[32];

-      sprintf(name, "%s%u.png", tmpf, ++counter);
+      sprintf(name, "%s%d.png", tmpf, ++counter);

      if (png_image_write_to_file(&image->image, name, convert_to_8bit,
         image->buffer+16, (png_int_32)image->stride, image->colormap))
@@ -3499,7 +3487,7 @@ main(int argc, char **argv)
   int retval = 0;
   int c;

-#if PNG_LIBPNG_VER == 10700
+#if PNG_LIBPNG_VER >= 10700
      /* This error should not exist in 1.7 or later: */
      opts |= GBG_ERROR;
 #endif
@@ -3629,7 +3617,7 @@ main(int argc, char **argv)

         if (arg[0] == '-')
         {
-            int term = (arg[1] == '0' ? 0 : '\n');
+            const int term = (arg[1] == '0' ? 0 : '\n');
            unsigned int ich = 0;

            /* Loop reading files, use a static buffer to simplify this and just
--- a/contrib/libtests/pngunknown.c
+++ b/contrib/libtests/pngunknown.c
@@ -1,7 +1,8 @@
+
 /* pngunknown.c - test the read side unknown chunk handling
 *
- * Copyright (c) 2021 Cosmin Truta
- * Copyright (c) 2015,2017 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 2015,2016 Glenn Randers-Pehrson
 * Written by John Cunningham Bowler
 *
 * This code is released under the libpng license.
@@ -55,7 +56,7 @@
   defined(PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED)

 #if PNG_LIBPNG_VER < 10500
-/* This deliberately lacks the const. */
+/* This deliberately lacks the PNG_CONST. */
 typedef png_byte *png_const_bytep;

 /* This is copied from 1.5.1 png.h: */
@@ -84,7 +85,7 @@ typedef png_byte *png_const_bytep;
 #define PNG_WRITE_16BIT_SUPPORTED
 #define PNG_READ_16BIT_SUPPORTED

-/* This comes from pnglibconf.h after 1.5: */
+/* This comes from pnglibconf.h afer 1.5: */
 #define PNG_FP_1 100000
 #define PNG_GAMMA_THRESHOLD_FIXED\
   ((png_fixed_point)(PNG_GAMMA_THRESHOLD * PNG_FP_1))
@@ -113,9 +114,6 @@ typedef png_byte *png_const_bytep;
 #define png_PLTE PNG_U32( 80,  76,  84,  69)
 #define png_bKGD PNG_U32( 98,  75,  71,  68)
 #define png_cHRM PNG_U32( 99,  72,  82,  77)
-#define png_cICP PNG_U32( 99,  73,  67,  80) /* PNGv3 */
-#define png_cLLI PNG_U32( 99,  76,  76,  73) /* PNGv3 */
-#define png_eXIf PNG_U32(101,  88,  73, 102) /* registered July 2017 */
 #define png_fRAc PNG_U32(102,  82,  65,  99) /* registered, not defined */
 #define png_gAMA PNG_U32(103,  65,  77,  65)
 #define png_gIFg PNG_U32(103,  73,  70, 103)
@@ -124,7 +122,6 @@ typedef png_byte *png_const_bytep;
 #define png_hIST PNG_U32(104,  73,  83,  84)
 #define png_iCCP PNG_U32(105,  67,  67,  80)
 #define png_iTXt PNG_U32(105,  84,  88, 116)
-#define png_mDCV PNG_U32(109,  68,  67,  86) /* PNGv3 */
 #define png_oFFs PNG_U32(111,  70,  70, 115)
 #define png_pCAL PNG_U32(112,  67,  65,  76)
 #define png_pHYs PNG_U32(112,  72,  89, 115)
@@ -213,27 +210,6 @@ static struct
         1,
 #     endif
      1,  START, 0 },
-   { "cICP", PNG_INFO_cICP, png_cICP,
-#     ifdef PNG_READ_cICP_SUPPORTED
-         0,
-#     else
-         1,
-#     endif
-      1,  START, 0 },
-   { "cLLI", PNG_INFO_cLLI, png_cLLI,
-#     ifdef PNG_READ_cLLI_SUPPORTED
-         0,
-#     else
-         1,
-#     endif
-      1,  START, 0 },
-   { "eXIf", PNG_INFO_eXIf, png_eXIf,
-#     ifdef PNG_READ_eXIf_SUPPORTED
-         0,
-#     else
-         1,
-#     endif
-      1,  END, 0 },
   { "gAMA", PNG_INFO_gAMA, png_gAMA,
 #     ifdef PNG_READ_gAMA_SUPPORTED
         0,
@@ -262,13 +238,6 @@ static struct
         1,
 #     endif
      1, ABSENT, 0 },
-   { "mDCV", PNG_INFO_mDCV, png_mDCV,
-#     ifdef PNG_READ_mDCV_SUPPORTED
-         0,
-#     else
-         1,
-#     endif
-      1,  START, 0 },
   { "oFFs", PNG_INFO_oFFs, png_oFFs,
 #     ifdef PNG_READ_oFFs_SUPPORTED
         0,
@@ -393,9 +362,7 @@ find_by_flag(png_uint_32 flag)
 {
   int i = NINFO;

-   while (--i >= 0)
-      if (chunk_info[i].flag == flag)
-         return i;
+   while (--i >= 0) if (chunk_info[i].flag == flag) return i;

   fprintf(stderr, "pngunknown: internal error\n");
   exit(4);
@@ -572,30 +539,27 @@ read_callback(png_structp pp, png_unknown_chunkp pc)

      case PNG_HANDLE_CHUNK_AS_DEFAULT:
      case PNG_HANDLE_CHUNK_NEVER:
-         discard = 1; /*handled; discard*/
+         discard = 1/*handled; discard*/;
         break;

      case PNG_HANDLE_CHUNK_IF_SAFE:
      case PNG_HANDLE_CHUNK_ALWAYS:
-         discard = 0; /*not handled; keep*/
+         discard = 0/*not handled; keep*/;
         break;
   }

   /* Also store information about this chunk in the display, the relevant flag
    * is set if the chunk is to be kept ('not handled'.)
    */
-   if (chunk >= 0)
+   if (chunk >= 0) if (!discard) /* stupidity to stop a GCC warning */
   {
-      if (!discard) /* stupidity to stop a GCC warning */
-      {
-         png_uint_32 flag = chunk_info[chunk].flag;
+      png_uint_32 flag = chunk_info[chunk].flag;

-         if (pc->location & PNG_AFTER_IDAT)
-            d->after_IDAT |= flag;
+      if (pc->location & PNG_AFTER_IDAT)
+         d->after_IDAT |= flag;

-         else
-            d->before_IDAT |= flag;
-      }
+      else
+         d->before_IDAT |= flag;
   }

   /* However if there is no support to store unknown chunks don't ask libpng to
@@ -650,7 +614,7 @@ get_unknown(display *d, png_infop info_ptr, int after_IDAT)
                  ++(d->error_count);
                  break;
               }
-               /* FALLTHROUGH */ /* (safe) */
+               /* FALL THROUGH (safe) */
            case PNG_HANDLE_CHUNK_ALWAYS:
               break;
         }
@@ -869,9 +833,8 @@ check(FILE *fp, int argc, const char **argv, png_uint_32p flags/*out*/,
            {
               png_uint_32 y;

-               for (y=0; y<height; ++y)
-                  if (PNG_ROW_IN_INTERLACE_PASS(y, ipass))
-                     png_read_row(d->png_ptr, NULL, NULL);
+               for (y=0; y<height; ++y) if (PNG_ROW_IN_INTERLACE_PASS(y, ipass))
+                  png_read_row(d->png_ptr, NULL, NULL);
            }
         }
      } /* interlaced */
@@ -1120,15 +1083,15 @@ perform_one_test_safe(FILE *fp, int argc, const char **argv,

 static const char *standard_tests[] =
 {
-   "discard", "default=discard", NULL,
-   "save", "default=save", NULL,
-   "if-safe", "default=if-safe", NULL,
-   "vpAg", "vpAg=if-safe", NULL,
-   "sTER", "sTER=if-safe", NULL,
-   "IDAT", "default=discard", "IDAT=save", NULL,
-   "sAPI", "bKGD=save", "cHRM=save", "gAMA=save", "all=discard", "iCCP=save",
-      "sBIT=save", "sRGB=save", "eXIf=save", NULL,
-   NULL /*end*/
+ "discard", "default=discard", 0,
+ "save", "default=save", 0,
+ "if-safe", "default=if-safe", 0,
+ "vpAg", "vpAg=if-safe", 0,
+ "sTER", "sTER=if-safe", 0,
+ "IDAT", "default=discard", "IDAT=save", 0,
+ "sAPI", "bKGD=save", "cHRM=save", "gAMA=save", "all=discard", "iCCP=save",
+   "sBIT=save", "sRGB=save", 0,
+ 0/*end*/
 };

 static PNG_NORETURN void
@@ -1144,7 +1107,7 @@ int
 main(int argc, const char **argv)
 {
   FILE *fp;
-   png_uint_32 default_flags[4]; /*valid,unknown{before,after}*/
+   png_uint_32 default_flags[4/*valid,unknown{before,after}*/];
   int strict = 0, default_tests = 0;
   const char *count_argv = "default=save";
   const char *touch_file = NULL;
@@ -1182,9 +1145,8 @@ main(int argc, const char **argv)
   /* GCC BUG: if (default_tests && argc != 1) triggers some weird GCC argc
    * optimization which causes warnings with -Wstrict-overflow!
    */
-   else if (default_tests)
-      if (argc != 1)
-         usage(d.program, "extra arguments");
+   else if (default_tests) if (argc != 1)
+      usage(d.program, "extra arguments");

   /* The name of the test file is the last argument; remove it. */
   d.file = argv[--argc];
@@ -1246,11 +1208,7 @@ main(int argc, const char **argv)
         const char *result;
         int arg_count = 0;

-         while (*next != NULL)
-         {
-            ++next;
-            ++arg_count;
-         }
+         while (*next) ++next, ++arg_count;

         perform_one_test_safe(fp, arg_count, test, default_flags, &d,
            this_test);
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
--- a/contrib/libtests/readpng.c
+++ b/contrib/libtests/readpng.c
@@ -2,6 +2,8 @@
 *
 * Copyright (c) 2013 John Cunningham Bowler
 *
+ * Last changed in libpng 1.6.1 [March 28, 2013]
+ *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
@@ -58,7 +60,7 @@ read_png(FILE *fp)
   png_read_info(png_ptr, info_ptr);

   {
-      size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+      png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);

      /* Failure to initialize these is harmless */
      row = malloc(rowbytes);
--- a/contrib/libtests/tarith.c
+++ b/contrib/libtests/tarith.c
@@ -1,8 +1,10 @@
+
 /* tarith.c
 *
- * Copyright (c) 2021 Cosmin Truta
 * Copyright (c) 2011-2013 John Cunningham Bowler
 *
+ * Last changed in libpng 1.6.0 [February 14, 2013]
+ *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
@@ -86,7 +88,6 @@ int validation_ascii_to_fp(int count, int argc, char **argv)
   int    minorarith = 0;

   while (--argc > 0)
-   {
      if (strcmp(*++argv, "-a") == 0)
         showall = 1;
      else if (strcmp(*argv, "-e") == 0 && argc > 0)
@@ -104,11 +105,10 @@ int validation_ascii_to_fp(int count, int argc, char **argv)
         fprintf(stderr, "unknown argument %s\n", *argv);
         return 1;
      }
-   }

   do
   {
-      size_t index;
+      png_size_t index;
      int state, failed = 0;
      char buffer[64];

@@ -130,8 +130,8 @@ int validation_ascii_to_fp(int count, int argc, char **argv)
       */
      if (buffer[precision+7] != 71)
      {
-         fprintf(stderr, "%g[%d] -> '%s'[%lu] buffer overflow\n",
-            test, precision, buffer, (unsigned long)strlen(buffer));
+         fprintf(stderr, "%g[%d] -> '%s'[%lu] buffer overflow\n", test,
+            precision, buffer, (unsigned long)strlen(buffer));
         failed = 1;
      }

@@ -146,16 +146,16 @@ int validation_ascii_to_fp(int count, int argc, char **argv)
         if (test >= 0 && strcmp(buffer, "inf") ||
             test <  0 && strcmp(buffer, "-inf"))
         {
-            fprintf(stderr, "%g[%d] -> '%s' but expected 'inf'\n",
-               test, precision, buffer);
+            fprintf(stderr, "%g[%d] -> '%s' but expected 'inf'\n", test,
+               precision, buffer);
            failed = 1;
         }
      }
      else if (!png_check_fp_number(buffer, precision+10, &state, &index) ||
          buffer[index] != 0)
      {
-         fprintf(stderr, "%g[%d] -> '%s' but has bad format ('%c')\n",
-            test, precision, buffer, buffer[index]);
+         fprintf(stderr, "%g[%d] -> '%s' but has bad format ('%c')\n", test,
+         precision, buffer, buffer[index]);
         failed = 1;
      }
      else if (PNG_FP_IS_NEGATIVE(state) && !(test < 0))
@@ -176,7 +176,7 @@ int validation_ascii_to_fp(int count, int argc, char **argv)
      }
      else if (PNG_FP_IS_POSITIVE(state) && !(test > 0))
      {
-         fprintf(stderr, "%g[%d] -> '%s' but positive value not so reported\n",
+         fprintf(stderr, "%g[%d] -> '%s' but postive value not so reported\n",
            test, precision, buffer);
         failed = 1;
         assert(!PNG_FP_IS_NEGATIVE(state));
@@ -187,7 +187,7 @@ int validation_ascii_to_fp(int count, int argc, char **argv)
         /* Check the result against the original. */
         double out = atof(buffer);
         double change = fabs((out - test)/test);
-         double allow = .5 / pow(10,
+         double allow = .5/pow(10,
            (precision >= DBL_DIG) ? DBL_DIG-1 : precision-1);

         /* NOTE: if you hit this error case are you compiling with gcc
@@ -257,9 +257,8 @@ skip:
   }
   while (--count);

-   printf("Tested %d finite values, %d non-finite, %d OK (%d failed) "
-      "%d minor arithmetic errors\n",
-      finite, nonfinite, ok, failcount, minorarith);
+   printf("Tested %d finite values, %d non-finite, %d OK (%d failed) %d minor "
+      "arithmetic errors\n", finite, nonfinite, ok, failcount, minorarith);
   printf(" Error with >=%d digit precision %.2f%%\n", DBL_DIG, max_abs);
   printf(" Error with < %d digit precision %.2f%%\n", DBL_DIG, max);

@@ -330,10 +329,10 @@ static int check_one_character(checkfp_command *co, checkfp_control c, int ch)
 {
   /* Test this character (ch) to ensure the parser does the correct thing.
    */
-   size_t index = 0;
+   png_size_t index = 0;
   const char test = (char)ch;
-   int number_is_valid = png_check_fp_number(&test, 1, &c.state, &index);
-   int character_accepted = (index == 1);
+   const int number_is_valid = png_check_fp_number(&test, 1, &c.state, &index);
+   const int character_accepted = (index == 1);

   if (c.check_state != exponent && isdigit(ch) && ch != '0')
      c.is_zero = 0;
@@ -372,8 +371,8 @@ static int check_one_character(checkfp_command *co, checkfp_control c, int ch)
   /* This should never fail (it's a serious bug if it does): */
   if (index != 0 && index != 1)
   {
-      fprintf(stderr, "%s: read beyond end of string (%lu)\n",
-         co->number, (unsigned long)index);
+      fprintf(stderr, "%s: read beyond end of string (%lu)\n", co->number,
+         (unsigned long)index);
      return 0;
   }

@@ -504,8 +503,8 @@ static int check_one_character(checkfp_command *co, checkfp_control c, int ch)
      if (number_is_valid != c.number_was_valid)
      {
         fprintf(stderr,
-            "%s: character '%c' [0x%.2x] changed number validity\n",
-            co->number, ch, ch);
+            "%s: character '%c' [0x%.2x] changed number validity\n", co->number,
+            ch, ch);
         return 0;
      }

@@ -522,13 +521,10 @@ static int check_all_characters(checkfp_command *co, checkfp_control c)
 {
   int ch;

-   if (c.cnumber+4 < sizeof co->number)
+   if (c.cnumber+4 < sizeof co->number) for (ch=0; ch<256; ++ch)
   {
-      for (ch=0; ch<256; ++ch)
-      {
-         if (!check_one_character(co, c, ch))
-            return 0;
-      }
+      if (!check_one_character(co, c, ch))
+         return 0;
   }

   return 1;
@@ -543,13 +539,10 @@ static int check_some_characters(checkfp_command *co, checkfp_control c,

   if (c.cnumber+4 < sizeof co->number && c.limit >= 0)
   {
-      if (c.limit > 0)
+      if (c.limit > 0) for (i=0; tests[i]; ++i)
      {
-         for (i=0; tests[i]; ++i)
-         {
-            if (!check_one_character(co, c, tests[i]))
-                  return 0;
-         }
+         if (!check_one_character(co, c, tests[i]))
+               return 0;
      }

      /* At the end check all the characters. */
@@ -623,10 +616,10 @@ int validation_muldiv(int count, int argc, char **argv)
   png_int_32 times, div;

   while (--argc > 0)
-   {
-      fprintf(stderr, "unknown argument %s\n", *++argv);
-      return 1;
-   }
+      {
+         fprintf(stderr, "unknown argument %s\n", *++argv);
+         return 1;
+      }

   /* Find out about the random number generator. */
   randbuffer = RAND_MAX;
@@ -694,25 +687,25 @@ int validation_muldiv(int count, int argc, char **argv)
        ok = 0, ++overflow, fpround = fp/*misleading*/;

      if (verbose)
-         fprintf(stderr, "TEST %d * %d / %d -> %lld (%s)\n",
-            a, times, div, fp, ok ? "ok" : "overflow");
+         fprintf(stderr, "TEST %d * %d / %d -> %lld (%s)\n", a, times, div,
+            fp, ok ? "ok" : "overflow");

      ++tested;
      if (png_muldiv(&result, a, times, div) != ok)
      {
         ++error;
         if (ok)
-             fprintf(stderr, "%d * %d / %d -> overflow (expected %lld)\n",
-                a, times, div, fp);
+             fprintf(stderr, "%d * %d / %d -> overflow (expected %lld)\n", a,
+                times, div, fp);
         else
-             fprintf(stderr, "%d * %d / %d -> %d (expected overflow %lld)\n",
-                a, times, div, result, fp);
+             fprintf(stderr, "%d * %d / %d -> %d (expected overflow %lld)\n", a,
+                times, div, result, fp);
      }
      else if (ok && result != fpround)
      {
         ++error;
-         fprintf(stderr, "%d * %d / %d -> %d not %lld\n",
-            a, times, div, result, fp);
+         fprintf(stderr, "%d * %d / %d -> %d not %lld\n", a, times, div, result,
+            fp);
      }
      else
         ++passed;
@@ -728,8 +721,8 @@ int validation_muldiv(int count, int argc, char **argv)
   }
   while (--count > 0);

-   printf("%d tests including %d overflows, %d passed, %d failed "
-      "(%d 64-bit errors)\n", tested, overflow, passed, error, error64);
+   printf("%d tests including %d overflows, %d passed, %d failed (%d 64-bit "
+      "errors)\n", tested, overflow, passed, error, error64);
   return 0;
 }

@@ -828,9 +821,8 @@ int validation_gamma(int argc, char **argv)
         {
            if (error > .68) /* By experiment error is less than .68 */
            {
-               fprintf(stderr,
-                  "16-bit log error: %d: got %u, expected %f error: %f\n",
-                  i, png_log16bit(i), correct, error);
+               fprintf(stderr, "16-bit log error: %d: got %u, expected %f"
+                  " error: %f\n", i, png_log16bit(i), correct, error);
            }
         }
      }
@@ -849,9 +841,8 @@ int validation_gamma(int argc, char **argv)
            maxerr = fabs(error);
         if (fabs(error) > 1883) /* By experiment. */
         {
-            fprintf(stderr,
-               "32-bit exp error: %d: got %u, expected %f error: %f\n",
-               i, png_exp(i), correct, error);
+            fprintf(stderr, "32-bit exp error: %d: got %u, expected %f"
+                  " error: %f\n", i, png_exp(i), correct, error);
         }
      }

@@ -868,9 +859,8 @@ int validation_gamma(int argc, char **argv)
            maxerr = fabs(error);
         if (fabs(error) > .50002) /* By experiment */
         {
-            fprintf(stderr,
-               "8-bit exp error: %d: got %u, expected %f error: %f\n",
-               i, png_exp8bit(i), correct, error);
+            fprintf(stderr, "8-bit exp error: %d: got %u, expected %f"
+                  " error: %f\n", i, png_exp8bit(i), correct, error);
         }
      }

@@ -887,9 +877,8 @@ int validation_gamma(int argc, char **argv)
            maxerr = fabs(error);
         if (fabs(error) > .524) /* By experiment */
         {
-            fprintf(stderr,
-               "16-bit exp error: %d: got %u, expected %f error: %f\n",
-               i, png_exp16bit(i), correct, error);
+            fprintf(stderr, "16-bit exp error: %d: got %u, expected %f"
+                  " error: %f\n", i, png_exp16bit(i), correct, error);
         }
      }

@@ -951,7 +940,7 @@ int validation_gamma(int argc, char **argv)

 /**************************** VALIDATION TESTS ********************************/
 /* Various validation routines are included herein, they require some
- * definition for png_warning and png_error, settings of VALIDATION:
+ * definition for png_warning and png_error, seetings of VALIDATION:
 *
 * 1: validates the ASCII to floating point conversions
 * 2: validates png_muldiv
--- a/contrib/libtests/timepng.c
+++ b/contrib/libtests/timepng.c
@@ -2,6 +2,8 @@
 *
 * Copyright (c) 2013,2016 John Cunningham Bowler
 *
+ * Last changed in libpng 1.6.22 [May 26, 2016]
+ *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
@@ -63,7 +65,7 @@ typedef struct
 }  io_data;

 static PNG_CALLBACK(void, read_and_copy,
-      (png_structp png_ptr, png_bytep buffer, size_t cb))
+      (png_structp png_ptr, png_bytep buffer, png_size_t cb))
 {
   io_data *io = (io_data*)png_get_io_ptr(png_ptr);

@@ -98,7 +100,7 @@ static void read_by_row(png_structp png_ptr, png_infop info_ptr,
   png_read_info(png_ptr, info_ptr);

   {
-      size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+      png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);

      row = voidcast(png_bytep,malloc(rowbytes));
      display = voidcast(png_bytep,malloc(rowbytes));
@@ -526,7 +528,7 @@ int main(int argc, char **argv)
      }
   }

-   else if (nfiles == 0) /* Read from stdin without --dissemble */
+   else if (nfiles == 0) /* Read from stdin withoout --dissemble */
   {
      char filename[FILENAME_MAX+1];

--- a/Show More
+++ b/Show More