Well, OK, so perhaps it is complete in a way:
line 657 is covered by the patch only for libpng 1.5 (I'm testing it with 1.4),
if it was in the form 'longjmp (png_jmpbuf(png_ptr), 1);', it would still work for >=libpng-1.2
It's bit silly though, as later lines use png_jmpbuf without any guards
The other line is a different matter, likely unrelated to libpng upgrade.
Feel free to re-resolved it as fixed, unless you want to address this.