upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 28

Merge pull request #32696 from nextcloud/fix/use-image-from-ocp

Browse source 
Use Image class from public API
This commit is contained in:
blizzz 2022-06-02 13:42:05 +02:00 committed by GitHub
commit 01bb642901
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/lib/CardDAV/PhotoCache.php
View file

@ -133,7 +133,7 @@ class PhotoCache {
throw new NotFoundException;
}
$photo = new \OC_Image();
$photo = new \OCP\Image();
/** @var ISimpleFile $file */
$file = $folder->getFile('photo.' . $ext);
$photo->loadFromData($file->getContent());

2
apps/settings/lib/UserMigration/AccountMigrator.php
View file

@ -153,7 +153,7 @@ class AccountMigrator implements IMigrator, ISizeEstimationMigrator {
$output->writeln('Importing avatar from ' . $importPath . '…');
$stream = $importSource->getFileAsStream($importPath);
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromFileHandle($stream);
try {

6
core/Controller/AvatarController.php
View file

@ -201,7 +201,7 @@ class AvatarController extends Controller {
}
try {
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData($content);
$image->readExif($content);
$image->fixOrientation();
@ -260,7 +260,7 @@ class AvatarController extends Controller {
Http::STATUS_NOT_FOUND);
}
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData($tmpAvatar);
$resp = new DataDisplayResponse(
@ -296,7 +296,7 @@ class AvatarController extends Controller {
Http::STATUS_BAD_REQUEST);
}
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData($tmpAvatar);
$image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
try {

5
lib/private/Avatar/Avatar.php
View file

@ -38,7 +38,6 @@ namespace OC\Avatar;
use Imagick;
use OC\Color;
use OC_Image;
use OCP\Files\NotFoundException;
use OCP\IAvatar;
use Psr\Log\LoggerInterface;
@ -106,7 +105,7 @@ abstract class Avatar implements IAvatar {
return false;
}
$avatar = new OC_Image();
$avatar = new \OCP\Image();
$avatar->loadFromData($file->getContent());
return $avatar;
}
@ -148,7 +147,7 @@ abstract class Avatar implements IAvatar {
$avatar->setFont($font);
$avatar->readImageBlob($svg);
$avatar->setImageFormat('png');
$image = new OC_Image();
$image = new \OCP\Image();
$image->loadFromData((string)$avatar);
$data = $image->data();
return $data === null ? false : $data;

5
lib/private/Avatar/UserAvatar.php
View file

@ -31,7 +31,6 @@ namespace OC\Avatar;
use OC\NotSquareException;
use OC\User\User;
use OC_Image;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Files\SimpleFS\ISimpleFile;
@ -130,7 +129,7 @@ class UserAvatar extends Avatar {
return $data;
}
$img = new OC_Image();
$img = new \OCP\Image();
if (
(is_resource($data) && get_resource_type($data) === 'gd') ||
(is_object($data) && get_class($data) === \GdImage::class)
@ -279,7 +278,7 @@ class UserAvatar extends Avatar {
$data = $this->generateAvatar($this->getDisplayName(), $size);
}
} else {
$avatar = new OC_Image();
$avatar = new \OCP\Image();
$file = $this->folder->getFile('avatar.' . $ext);
$avatar->loadFromData($file->getContent());
$avatar->resize($size);

2
lib/private/Preview/Bitmap.php
View file

@ -68,7 +68,7 @@ abstract class Bitmap extends ProviderV2 {
$this->cleanTmpFiles();
//new bitmap image object
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData((string) $bp);
//check if image object is valid
return $image->valid() ? $image : null;

2
lib/private/Preview/Bundled.php
View file

@ -43,7 +43,7 @@ abstract class Bundled extends ProviderV2 {
$zip = new ZIP($sourceTmp);
$zip->extractFile($path, $targetTmp);
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromFile($targetTmp);
$image->fixOrientation();

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

@ -217,7 +217,7 @@ class Generator {
// Free memory being used by the embedded image resource. Without this the image is kept in memory indefinitely.
// Garbage Collection does NOT free this memory. We have to do it ourselves.
if ($maxPreviewImage instanceof \OC_Image) {
if ($maxPreviewImage instanceof \OCP\Image) {
$maxPreviewImage->destroy();
}

2
lib/private/Preview/HEIC.php
View file

@ -89,7 +89,7 @@ class HEIC extends ProviderV2 {
$this->cleanTmpFiles();
//new bitmap image object
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData((string) $bp);
//check if image object is valid
return $image->valid() ? $image : null;

2
lib/private/Preview/Image.php
View file

@ -45,7 +45,7 @@ abstract class Image extends ProviderV2 {
return null;
}
$image = new \OC_Image();
$image = new \OCP\Image();
$fileName = $this->getLocalFile($file);

2
lib/private/Preview/MP3.php
View file

@ -56,7 +56,7 @@ class MP3 extends ProviderV2 {
}
if (!is_null($picture)) {
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData($picture);
if ($image->valid()) {

2
lib/private/Preview/MarkDown.php
View file

@ -137,7 +137,7 @@ class MarkDown extends TXT {
}
}
$imageObject = new \OC_Image();
$imageObject = new \OCP\Image();
$imageObject->setResource($image);
return $imageObject->valid() ? $imageObject : null;

2
lib/private/Preview/Movie.php
View file

@ -145,7 +145,7 @@ class Movie extends ProviderV2 {
exec($cmd, $output, $returnCode);
if ($returnCode === 0) {
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromFile($tmpPath);
if ($image->valid()) {
unlink($tmpPath);

2
lib/private/Preview/Office.php
View file

@ -83,7 +83,7 @@ abstract class Office extends ProviderV2 {
return null;
}
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData((string) $png);
$this->cleanTmpFiles();

2
lib/private/Preview/SVG.php
View file

@ -68,7 +68,7 @@ class SVG extends ProviderV2 {
}
//new image object
$image = new \OC_Image();
$image = new \OCP\Image();
$image->loadFromData((string) $svg);
//check if image object is valid
if ($image->valid()) {

2
lib/private/Preview/TXT.php
View file

@ -103,7 +103,7 @@ class TXT extends ProviderV2 {
}
}
$imageObject = new \OC_Image();
$imageObject = new \OCP\Image();
$imageObject->setResource($image);
return $imageObject->valid() ? $imageObject : null;