nextcloud / server

lib/private/Preview/Bitmap.php

Indentation +81 added lines, -81 removed lines

@@ -35,86 +35,86 @@
  */
 abstract class Bitmap extends Provider {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-
-		$tmpPath = $fileview->toTmpFile($path);
-		if (!$tmpPath) {
-			return false;
-		}
-
-		// Creates \Imagick object from bitmap or vector file
-		try {
-			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $fileview->getAbsolutePath($path) . ' Imagick says:',
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return false;
-		}
-
-		unlink($tmpPath);
-
-		//new bitmap image object
-		$image = new \OC_Image();
-		$image->loadFromData($bp);
-		//check if image object is valid
-		return $image->valid() ? $image : false;
-	}
-
-	/**
-	 * Returns a preview of maxX times maxY dimensions in PNG format
-	 *
-	 *    * The default resolution is already 72dpi, no need to change it for a bitmap output
-	 *    * It's possible to have proper colour conversion using profileimage().
-	 *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
-	 *    * It's possible to Gamma-correct an image via gammaImage()
-	 *
-	 * @param string $tmpPath the location of the file to convert
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function getResizedPreview($tmpPath, $maxX, $maxY) {
-		$bp = new Imagick();
-
-		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
-
-		$bp = $this->resize($bp, $maxX, $maxY);
-
-		$bp->setImageFormat('png');
-
-		return $bp;
-	}
-
-	/**
-	 * Returns a resized \Imagick object
-	 *
-	 * If you want to know more on the various methods available to resize an
-	 * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
-	 *
-	 * @param \Imagick $bp
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function resize($bp, $maxX, $maxY) {
-		list($previewWidth, $previewHeight) = array_values($bp->getImageGeometry());
-
-		// We only need to resize a preview which doesn't fit in the maximum dimensions
-		if ($previewWidth > $maxX || $previewHeight > $maxY) {
-			// TODO: LANCZOS is the default filter, CATROM could bring similar results faster
-			$bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true);
-		}
-
-		return $bp;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+
+        $tmpPath = $fileview->toTmpFile($path);
+        if (!$tmpPath) {
+            return false;
+        }
+
+        // Creates \Imagick object from bitmap or vector file
+        try {
+            $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'File: ' . $fileview->getAbsolutePath($path) . ' Imagick says:',
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return false;
+        }
+
+        unlink($tmpPath);
+
+        //new bitmap image object
+        $image = new \OC_Image();
+        $image->loadFromData($bp);
+        //check if image object is valid
+        return $image->valid() ? $image : false;
+    }
+
+    /**
+     * Returns a preview of maxX times maxY dimensions in PNG format
+     *
+     *    * The default resolution is already 72dpi, no need to change it for a bitmap output
+     *    * It's possible to have proper colour conversion using profileimage().
+     *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
+     *    * It's possible to Gamma-correct an image via gammaImage()
+     *
+     * @param string $tmpPath the location of the file to convert
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function getResizedPreview($tmpPath, $maxX, $maxY) {
+        $bp = new Imagick();
+
+        // Layer 0 contains either the bitmap or a flat representation of all vector layers
+        $bp->readImage($tmpPath . '[0]');
+
+        $bp = $this->resize($bp, $maxX, $maxY);
+
+        $bp->setImageFormat('png');
+
+        return $bp;
+    }
+
+    /**
+     * Returns a resized \Imagick object
+     *
+     * If you want to know more on the various methods available to resize an
+     * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
+     *
+     * @param \Imagick $bp
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function resize($bp, $maxX, $maxY) {
+        list($previewWidth, $previewHeight) = array_values($bp->getImageGeometry());
+
+        // We only need to resize a preview which doesn't fit in the maximum dimensions
+        if ($previewWidth > $maxX || $previewHeight > $maxY) {
+            // TODO: LANCZOS is the default filter, CATROM could bring similar results faster
+            $bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true);
+        }
+
+        return $bp;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
 		} catch (\Exception $e) {
 			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $fileview->getAbsolutePath($path) . ' Imagick says:',
+				'message' => 'File: '.$fileview->getAbsolutePath($path).' Imagick says:',
 				'level' => ILogger::ERROR,
 				'app' => 'core',
 			]);
@@ -84,7 +84,7 @@ 
 		$bp = new Imagick();
 
 		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
+		$bp->readImage($tmpPath.'[0]');
 
 		$bp = $this->resize($bp, $maxX, $maxY);