Thanks for the feedback! Yes, photoshop does this automatically, plus I completely correct the geometry by hand using the "deformation" tool.