upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

increase preview_max_memory and make it easier to debug

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2022-12-21 20:01:19 +01:00
parent c1a99ca58f
commit bfb3b2af9f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/config.sample.php
View file

@ -1171,9 +1171,9 @@ $CONFIG = [
* If creating the image would allocate more memory, preview generation will
* be disabled and the default mimetype icon is shown. Set to -1 for no limit.
*
* Defaults to ``128`` megabytes
* Defaults to ``256`` megabytes
*/
'preview_max_memory' => 128,
'preview_max_memory' => 256,
/**
* custom path for LibreOffice/OpenOffice binary

6
lib/private/legacy/OC_Image.php
View file

@ -50,8 +50,8 @@ use OCP\IImage;
*/
class OC_Image implements \OCP\IImage {
// Default memory limit for images to load (128 MBytes).
protected const DEFAULT_MEMORY_LIMIT = 128;
// Default memory limit for images to load (256 MBytes).
protected const DEFAULT_MEMORY_LIMIT = 256;
// Default quality for jpeg images
protected const DEFAULT_JPEG_QUALITY = 80;
@ -585,7 +585,7 @@ class OC_Image implements \OCP\IImage {
// Assume 32 bits per pixel.
if ($width * $height * 4 > $memory_limit * 1024 * 1024) {
$this->logger->debug('Image size of ' . $width . 'x' . $height . ' would exceed allowed memory limit of ' . $memory_limit);
$this->logger->info('Image size of ' . $width . 'x' . $height . ' would exceed allowed memory limit of ' . $memory_limit . '. You may increase the preview_max_memory in your config.php if you need previews of this image.');
return false;
}

4
tests/lib/ImageTest.php
View file

@ -144,8 +144,8 @@ class ImageTest extends \Test\TestCase {
->willReturn(null);
$config->expects($this->once())
->method('getSystemValueInt')
->with('preview_max_memory', 128)
->willReturn(128);
->with('preview_max_memory', 256)
->willReturn(256);
$img = new \OC_Image(null, null, $config);
$img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.jpg');
$raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));