Re-Add support for PNG or PNM as watermark images, which was broken