diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php index 9aec967282d5768c29941ec4367da06a73c825a0..84343df2608b1ad3129fceacaba84f081a0470ee 100644 --- a/lib/private/preview/image.php +++ b/lib/private/preview/image.php @@ -21,11 +21,11 @@ class Image extends Provider { return false; } + $image = new \OC_Image(); //check if file is encrypted if($fileInfo['encrypted'] === true) { - $image = new \OC_Image(stream_get_contents($fileview->fopen($path, 'r'))); + $image->loadFromData(stream_get_contents($fileview->fopen($path, 'r'))); }else{ - $image = new \OC_Image(); $image->loadFromFile($fileview->getLocalFile($path)); } diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php index 4d85e23c63cf1ebda94ebd3e187407f99741f1e8..1802a20711ebd0f8ffa0e5764847aaffdcb4ba98 100644 --- a/lib/private/preview/movies.php +++ b/lib/private/preview/movies.php @@ -36,7 +36,8 @@ if (!\OC_Util::runningOnWindows()) { shell_exec($cmd); - $image = new \OC_Image($tmpPath); + $image = new \OC_Image(); + $image->loadFromFile($tmpPath); unlink($absPath); unlink($tmpPath); diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php index 1eed566315c7bb187f25cb35b1b69b0695760efe..3fc0ab0490cadfff428346b11fdaa58669cdb3f9 100644 --- a/lib/private/preview/mp3.php +++ b/lib/private/preview/mp3.php @@ -25,7 +25,8 @@ class MP3 extends Provider { if(isset($tags['id3v2']['APIC'][0]['data'])) { $picture = @$tags['id3v2']['APIC'][0]['data']; unlink($tmpPath); - $image = new \OC_Image($picture); + $image = new \OC_Image(); + $image->loadFromData($picture); return $image->valid() ? $image : $this->getNoCoverThumbnail(); } @@ -39,7 +40,8 @@ class MP3 extends Provider { return false; } - $image = new \OC_Image($icon); + $image = new \OC_Image(); + $image->loadFromFile($icon); return $image->valid() ? $image : false; } diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php index 8f2e06c050be1a00b5278632f0ad30dfca11e4b3..b11fed13ba1ad5c145a8fb293b191e895aaea309 100644 --- a/lib/private/preview/office-cl.php +++ b/lib/private/preview/office-cl.php @@ -48,7 +48,8 @@ if (!\OC_Util::runningOnWindows()) { return false; } - $image = new \OC_Image($pdf); + $image = new \OC_Image(); + $image->loadFromData($pdf); unlink($absPath); unlink($absPath . '.pdf'); diff --git a/lib/private/preview/office-fallback.php b/lib/private/preview/office-fallback.php index e69ab0ab8cbe95b3e663ed40de633d2c0a29738c..f184b3149d58801b17a4a77d1025808b73aebd76 100644 --- a/lib/private/preview/office-fallback.php +++ b/lib/private/preview/office-fallback.php @@ -80,7 +80,8 @@ class MSOfficeExcel extends Provider { unlink($absPath); unlink($tmpPath); - $image = new \OC_Image($pdf); + $image = new \OC_Image(); + $image->loadFromData($pdf); return $image->valid() ? $image : false; }