Merge "Remove $wgBug34832TransitionalRollback"

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

diff --git a/includes/media/BMP.php b/includes/media/BMP.php
index ce1b036..a515c63 100644 (file)
--- a/includes/media/BMP.php
+++ b/includes/media/BMP.php
@@ -1,5 +1,22 @@
 <?php
 /**
+ * Handler for Microsoft's bitmap format.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup Media
  */
@@ -12,12 +29,38 @@
  */
 class BmpHandler extends BitmapHandler {
 
-       /*
+       /**
+        * @param $file
+        * @return bool
+        */
+       function mustRender( $file ) {
+               return true;
+       }
+
+       /**
+        * Render files as PNG
+        *
+        * @param $text
+        * @param $mime
+        * @param $params
+        * @return array
+        */
+       function getThumbType( $text, $mime, $params = null ) {
+               return array( 'png', 'image/png' );
+       }
+
+       /**
         * Get width and height from the bmp header.
+        *
+        * @param $image
+        * @param $filename
+        * @return array
         */
        function getImageSize( $image, $filename ) {
-               $f = fopen( $filename, 'r' );
-               if(!$f) return false;
+               $f = fopen( $filename, 'rb' );
+               if( !$f ) {
+                       return false;
+               }
                $header = fread( $f, 54 );
                fclose($f);
 
@@ -26,8 +69,12 @@ class BmpHandler extends BitmapHandler {
                $h = substr( $header, 22, 4);
 
                // Convert the unsigned long 32 bits (little endian):
-               $w = unpack( 'V' , $w );
-               $h = unpack( 'V' , $h );
+               try {
+                       $w = wfUnpack( 'V', $w, 4 );
+                       $h = wfUnpack( 'V', $h, 4 );
+               } catch ( MWException $e ) {
+                       return false;
+               }
                return array( $w[1], $h[1] );
        }
 }