diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-10-16 15:47:30 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-11-03 14:00:33 +0100 |
| commit | 8468212386fa577a60df238c10243b8297e962fc (patch) | |
| tree | 6735c8f0c1101a64a3fe51cc6661816f7601f49b | |
| parent | d6f1287ae6407a8f1ef0d018fe197e0f920ed192 (diff) | |
| download | nextcloud-server-8468212386fa577a60df238c10243b8297e962fc.tar.gz nextcloud-server-8468212386fa577a60df238c10243b8297e962fc.zip | |
Fix name conflict
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| -rw-r--r-- | lib/private/Preview/Generator.php | 6 |
1 files 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()) { |