From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 5 Dec 2013 20:55:30 +0000 (+0100)
Subject: Some more formatting fixes for media classes
X-Git-Tag: 1.31.0-rc.0~17708^2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=24a20602533d9ce5ca92b4015d77c249375372fb;p=lhc%2Fweb%2Fwiklou.git

Some more formatting fixes for media classes

Based on Brian's review of https://gerrit.wikimedia.org/r/#/c/99344/

Change-Id: I35aea90da837d17bf8be5c29d22f5f0a3bcef145
---

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index d93168f2ae..eeb8078715 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -67,7 +67,7 @@ class BitmapHandler extends ImageHandler {
 
 			if ( $srcWidth * $srcHeight > $wgMaxImageArea
 				&& !( $image->getMimeType() == 'image/jpeg'
-				&& self::getScalerType( false, false ) == 'im' )
+					&& self::getScalerType( false, false ) == 'im' )
 			) {
 				# Only ImageMagick can efficiently downsize jpg images without loading
 				# the entire file in memory
diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php
index 3272fef4cf..3700556bfe 100644
--- a/includes/media/XMPInfo.php
+++ b/includes/media/XMPInfo.php
@@ -53,20 +53,21 @@ class XMPInfo {
 	 * each containing an array of tags
 	 * each tag is an array of information about the
 	 * tag, including:
-	 *   * map_group - what group (used for precedence during conflicts)
-	 *   * mode - What type of item (self::MODE_SIMPLE usually, see above
-	 *     for all values)
-	 *   * validate - method to validate input. Could also post-process the
+	 *   * map_group - What group (used for precedence during conflicts).
+	 *   * mode - What type of item (self::MODE_SIMPLE usually, see above for
+	 *     all values).
+	 *   * validate - Method to validate input. Could also post-process the
 	 *     input. A string value is assumed to be a static method of
 	 *     XMPValidate. Can also take a array( 'className', 'methodName' ).
-	 *   * choices  - array of potential values (format of 'value' => true ).
-	 *     Only used with validateClosed
-	 *   * rangeLow and rangeHigh - alternative to choices for numeric ranges.
+	 *   * choices - Array of potential values (format of 'value' => true ).
+	 *     Only used with validateClosed.
+	 *   * rangeLow and rangeHigh - Alternative to choices for numeric ranges.
 	 *     Again for validateClosed only.
-	 *     * children - for MODE_STRUCT items, allowed children.
-	 *   * structPart - Indicates that this element can only appear as a member of a structure.
+	 *   * children - For MODE_STRUCT items, allowed children.
+	 *   * structPart - Indicates that this element can only appear as a member
+	 *     of a structure.
 	 *
-	 * Currently this just has a bunch of exif values as this class is only half-done
+	 * Currently this just has a bunch of EXIF values as this class is only half-done.
 	 */
 	static private $items = array(
 		'http://ns.adobe.com/exif/1.0/' => array(