CHG - round megapixels to two digits, and restore watermark toggle functionality lost in r5822

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@5823 c08608d7-6e46-0410-86ca-f2a6f1370df5