Index: branches/RC/core/units/images/image_tag_processor.php
===================================================================
diff -u -r9638 -r9760
--- branches/RC/core/units/images/image_tag_processor.php	(.../image_tag_processor.php)	(revision 9638)
+++ branches/RC/core/units/images/image_tag_processor.php	(.../image_tag_processor.php)	(revision 9760)
@@ -194,7 +194,15 @@
 			$max_width = $this->getImageDimension('Width', $params);
 			$max_height = $this->getImageDimension('Height', $params);
 
-			if ($max_width > 0 || $max_height > 0) {
+			// user watermarks from format param
+			if (!$max_width) {
+				$max_width = $params['format'];
+				if ($max_width) {
+					$max_height = null;
+				}
+			}
+
+			if ($max_width > 0 || $max_height > 0 || $params['format']) {
 				$image_helper =& $this->Application->recallObject('ImageHelper');
 				/* @var $image_helper ImageHelper */