Fix typo in variable name - watermark is working again
masks: new calling convention for dt_xyz_get_mask_roi()

output buffer needs to be supplied by the calling routine
Merge branch 'master' of ssh://github.com/darktable-org/darktable