upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-29 18:11:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix name conflict

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2016-10-16 15:47:30 +02:00
parent d6f1287ae6
commit 8468212386
No known key found for this signature in database
GPG key ID: 1E152838F164D13B
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/Preview/Generator.php
View file

@ -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()) {