A few more places where large images cause int overflows...