1 files changed, 5 insertions, 37 deletions

diff --git a/lib/private/preview/bitmap.php b/lib/private/preview/bitmap.php
index 748a63a6afa..46322853486 100644
--- a/lib/private/preview/bitmap.php
+++ b/lib/private/preview/bitmap.php
@@ -9,10 +9,6 @@ namespace OC\Preview;
 
 use Imagick;
 
-if (extension_loaded('imagick')) {
-
-	$checkImagick = new Imagick();
-
 	class Bitmap extends Provider {
 
 		public function getMimeType() {
@@ -23,11 +19,11 @@ if (extension_loaded('imagick')) {
 			$tmpPath = $fileview->toTmpFile($path);
 
 			//create imagick object from bitmap or vector file
-			try{
+			try {
 				// Layer 0 contains either the bitmap or
 				// a flat representation of all vector layers
 				$bp = new Imagick($tmpPath . '[0]');
-				
+
 				$bp->setImageFormat('png');
 			} catch (\Exception $e) {
 				\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
@@ -35,17 +31,14 @@ if (extension_loaded('imagick')) {
 			}
 
 			unlink($tmpPath);
-			
+
 			//new bitmap image object
 			$image = new \OC_Image($bp);
 			//check if image object is valid
 			return $image->valid() ? $image : false;
 		}
-
 	}
-	
-	if(count($checkImagick->queryFormats('PDF')) === 1) {
-	
+
 		//.pdf
 		class PDF extends Bitmap {
 
@@ -54,12 +47,7 @@ if (extension_loaded('imagick')) {
 			}
 
 		}
-		
-		\OC\Preview::registerProvider('OC\Preview\PDF');
-	}
-	
-	if(count($checkImagick->queryFormats('TIFF')) === 1) {
-	
+
 		//.tiff
 		class TIFF extends Bitmap {
 
@@ -68,12 +56,7 @@ if (extension_loaded('imagick')) {
 			}
 
 		}
-		
-		\OC\Preview::registerProvider('OC\Preview\TIFF');
-	}
 
-	if(count($checkImagick->queryFormats('AI')) === 1) {
-	
 		//.ai
 		class Illustrator extends Bitmap {
 
@@ -82,12 +65,6 @@ if (extension_loaded('imagick')) {
 			}
 
 		}
-		
-		\OC\Preview::registerProvider('OC\Preview\Illustrator');
-	}
-	
-	// Requires adding 'eps' => array('application/postscript', null), to lib/private/mimetypes.list.php
-	if(count($checkImagick->queryFormats('EPS')) === 1) {
 
 		//.eps
 		class Postscript extends Bitmap {
@@ -98,11 +75,6 @@ if (extension_loaded('imagick')) {
 
 		}
 
-		\OC\Preview::registerProvider('OC\Preview\Postscript');
-	}
-	
-	if(count($checkImagick->queryFormats('PSD')) === 1) {
-	
 		//.psd
 		class Photoshop extends Bitmap {
 
@@ -111,7 +83,3 @@ if (extension_loaded('imagick')) {
 			}
 
 		}
-		
-		\OC\Preview::registerProvider('OC\Preview\Photoshop');
-	}
-}