From 8468212386fa577a60df238c10243b8297e962fc Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sun, 16 Oct 2016 15:47:30 +0200 Subject: Fix name conflict Signed-off-by: Roeland Jago Douma --- lib/private/Preview/Generator.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php index 6a2e2a4717e..08ab37057aa 100644 --- a/lib/private/Preview/Generator.php +++ b/lib/private/Preview/Generator.php @@ -32,7 +32,7 @@ use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\IConfig; use OCP\IImage; -use OCP\Image; +use OCP\Image as img; use OCP\IPreview; use OCP\Preview\IProvider; @@ -297,13 +297,13 @@ class Generator { * @param int $width * @param int $height * @param bool $crop - * @param int $maxWidth, + * @param int $maxWidth * @param int $maxHeight * @return ISimpleFile * @throws NotFoundException */ private function generatePreview(ISimpleFolder $previewFolder, ISimpleFile $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight) { - $preview = new Image($maxPreview->getContent()); + $preview = new img($maxPreview->getContent()); if ($crop) { if ($height !== $preview->height() && $width !== $preview->width()) { -- cgit v1.2.3