Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/99468
Change subject: Some more formatting fixes for media classes ...................................................................... Some more formatting fixes for media classes Based on Brian's review of https://gerrit.wikimedia.org/r/#/c/99344/ Change-Id: I35aea90da837d17bf8be5c29d22f5f0a3bcef145 --- M includes/media/Bitmap.php M includes/media/XMPInfo.php 2 files changed, 15 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/68/99468/1 diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index f50c3e5..3273b1b 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -63,7 +63,7 @@ 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 03d8505..5850a00 100644 --- a/includes/media/XMPInfo.php +++ b/includes/media/XMPInfo.php @@ -53,15 +53,21 @@ * 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 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. 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. + * * 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. + * 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. * - * 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( -- To view, visit https://gerrit.wikimedia.org/r/99468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I35aea90da837d17bf8be5c29d22f5f0a3bcef145 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Siebrand <siebr...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
