From fc1a14eab749d0a0bacd5598a9e1d4875e2fa8c8 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sun, 22 Apr 2007 17:34:09 +0000
Subject: [PATCH] Add support for microsoft bmp format. It simply give out the
 height and size, we might want to transform them to png automaticly.

---
 includes/AutoLoader.php      |  1 +
 includes/DefaultSettings.php |  1 +
 includes/media/BMP.php       | 29 +++++++++++++++++++++++++++++
 includes/media/Generic.php   |  1 +
 4 files changed, 32 insertions(+)
 create mode 100644 includes/media/BMP.php

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 596e6f805a..a83216f153 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -251,6 +251,7 @@ function __autoload($className) {
 
 		# Media
 		'BitmapHandler' => 'includes/media/Bitmap.php',
+		'BmpHandler' => 'includes/media/BMP.php',
 		'DjVuHandler' => 'includes/media/DjVu.php',
 		'MediaHandler' => 'includes/media/Generic.php',
 		'ImageHandler' => 'includes/media/Generic.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b80b201438..3b7bfc9245 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1460,6 +1460,7 @@ $wgMediaHandlers = array(
 	'image/jpeg' => 'BitmapHandler',
 	'image/png' => 'BitmapHandler',
 	'image/gif' => 'BitmapHandler',
+	'image/x-ms-bmp' => 'BmpHandler',
 	'image/svg+xml' => 'SvgHandler',
 	'image/vnd.djvu' => 'DjVuHandler',
 );
diff --git a/includes/media/BMP.php b/includes/media/BMP.php
new file mode 100644
index 0000000000..e867819f85
--- /dev/null
+++ b/includes/media/BMP.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Handler for Microsoft bitmap format (bmp). It inherits most of the methods
+ * from ImageHandler, some of them had to be overriden cause gd does not
+ * support this format.
+ */
+class BmpHandler extends BitmapHandler {
+
+	/*
+	 * Get width and height from the bmp header.
+	 */
+	function getImageSize( $image, $filename ) {
+		$f = fopen( $filename, 'r' );
+		if(!$f) return false;
+		$header = fread( $f, 54 );
+		fclose($f);
+
+		// Extract binary form of width and height from the header
+		$w = substr( $header, 18, 4);
+		$h = substr( $header, 22, 4);
+
+		// Convert the unsigned long 32 bits (little endian):
+		$w = unpack( 'V' , $w );
+		$h = unpack( 'V' , $h );
+		return array( $w[1], $h[1] );
+	}
+}
+
+?>
diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index 44c08d7cc2..ba4e32e270 100644
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -21,6 +21,7 @@ abstract class MediaHandler {
 	static function getHandler( $type ) {
 		global $wgMediaHandlers;
 		if ( !isset( $wgMediaHandlers[$type] ) ) {
+			wfDebug( __METHOD__ . ": no handler found for $type.\n");
 			return false;
 		}
 		$class = $wgMediaHandlers[$type];
-- 
2.20.1