Bug 1060381 - test_gallery_crop_photo is failing - refactor to reference...

... image metadata
:+1:  this logic is much easier to understand. I like the idea of checking for both height and width to modify according to the crop aspect we choose.