Merge "Added some lock()/unlock() support for SQLite using lock file emulation"

[lhc/web/wiklou.git] / includes / media / Tiff.php

diff --git a/includes/media/Tiff.php b/includes/media/Tiff.php
index 0042208..6964170 100644 (file)
--- a/includes/media/Tiff.php
+++ b/includes/media/Tiff.php
@@ -27,7 +27,6 @@
  * @ingroup Media
  */
 class TiffHandler extends ExifBitmapHandler {
-
        /**
         * Conversion to PNG for inline display can be disabled here...
         * Note scaling should work with ImageMagick, but may not with GD scaling.
@@ -36,22 +35,21 @@ class TiffHandler extends ExifBitmapHandler {
         * InstantCommons will have thumbnails managed from the remote instance,
         * so we can skip this check.
         *
-        * @param $file
-        *
+        * @param File $file
         * @return bool
         */
        function canRender( $file ) {
                global $wgTiffThumbnailType;
+
                return (bool)$wgTiffThumbnailType
-                       || ($file->getRepo() instanceof ForeignAPIRepo);
+                       || $file->getRepo() instanceof ForeignAPIRepo;
        }
 
        /**
         * Browsers don't support TIFF inline generally...
         * For inline display, we need to convert to PNG.
         *
-        * @param $file
-        *
+        * @param File $file
         * @return bool
         */
        function mustRender( $file ) {
@@ -59,13 +57,14 @@ class TiffHandler extends ExifBitmapHandler {
        }
 
        /**
-        * @param $ext
-        * @param $mime
-        * @param $params
+        * @param string $ext
+        * @param string $mime
+        * @param array $params
         * @return bool
         */
        function getThumbType( $ext, $mime, $params = null ) {
                global $wgTiffThumbnailType;
+
                return $wgTiffThumbnailType;
        }
 
@@ -85,12 +84,13 @@ class TiffHandler extends ExifBitmapHandler {
                                        throw new MWException( 'Metadata array is not an array' );
                                }
                                $meta['MEDIAWIKI_EXIF_VERSION'] = Exif::version();
+
                                return serialize( $meta );
-                       }
-                       catch ( MWException $e ) {
+                       } catch ( MWException $e ) {
                                // BitmapMetadataHandler throws an exception in certain exceptional
                                // cases like if file does not exist.
                                wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
+
                                return ExifBitmapHandler::BROKEN_FILE;
                        }
                } else {