[Pkg-owncloud-commits] [owncloud] 18/111: Use dedicated OC_Image loader methods

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit ec51825d318ebc28069e1bf55fe51105d2ec1a0c
Author: Thomas Tanghus <thomas at tanghus.net>
Date:   Wed Nov 13 00:36:42 2013 +0100

    Use dedicated OC_Image loader methods
    
    This prevents excessive logging and disk access
---
 lib/private/preview/image.php           |    4 ++--
 lib/private/preview/movies.php          |    3 ++-
 lib/private/preview/mp3.php             |    6 ++++--
 lib/private/preview/office-cl.php       |    3 ++-
 lib/private/preview/office-fallback.php |    3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index 9aec967..84343df 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 4d85e23..1802a20 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 1eed566..3fc0ab0 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 8f2e06c..b11fed1 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 e69ab0a..f184b31 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;
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git