Fix watermark layout

This is what I'd like to push for 1.2. Either as it is (2 commits) and we'll revert the second commit after 1.2 freeze or both commits squashed.

As said on the mailing list this new implementation will be easier to maintain and will be the
base of the support for scale based on larger/smaller border which makes a style independent of the image orientation.

What do you think?