Further fix for the watermark placement.

This makes the watermark not depending of the orientation of the image.