Merge branch 'hotfix_libpng2' into 'master'

Fixing more C interface problems for libpng

See merge request https://code.ornl.gov/futility/Futility/-/merge_requests/424