Merge pull request #16382 from oparoz/providers-are-responsible-for-t…

…he-size-of-their-preview

Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly

lib/private/image.php

@@ -952,6 +952,8 @@ public function crop($x, $y, $w, $h) {
 	/**
 	 * Resizes the image to fit within a boundary while preserving ratio.
 	 *
+	 * Warning: Images smaller than $maxWidth x $maxHeight will end up being scaled up
+	 *
 	 * @param integer $maxWidth
 	 * @param integer $maxHeight
 	 * @return bool
@@ -972,6 +974,28 @@ public function fitIn($maxWidth, $maxHeight) {
 		return true;
 	}
 
+	/**
+	 * Shrinks larger images to fit within specified boundaries while preserving ratio.
+	 *
+	 * @param integer $maxWidth
+	 * @param integer $maxHeight
+	 * @return bool
+	 */
+	public function scaleDownToFit($maxWidth, $maxHeight) {
+		if (!$this->valid()) {
+			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			return false;
+		}
+		$widthOrig = imageSX($this->resource);
+		$heightOrig = imageSY($this->resource);
+
+		if ($widthOrig > $maxWidth || $heightOrig > $maxHeight) {
+			return $this->fitIn($maxWidth, $maxHeight);
+		}
+
+		return false;
+	}
+
 	/**
 	 * Destroys the current image and resets the object
 	 */