Adapt for libpng changes