PleaseStand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276470
Change subject: Clean up XCFHandler::getImageSize()
......................................................................
Clean up XCFHandler::getImageSize()
No change in behavior:
* Moved setting of array elements into the initializer.
* Replaced sprintf() with variable interpolation.
* Removed a pointless assertion.
Change-Id: Ie77d26c80d592911b33bc544f831c4d34cc47d0e
---
M includes/media/XCF.php
1 file changed, 9 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/70/276470/1
diff --git a/includes/media/XCF.php b/includes/media/XCF.php
index f8fa252..526b45e 100644
--- a/includes/media/XCF.php
+++ b/includes/media/XCF.php
@@ -68,21 +68,15 @@
# Forge a return array containing metadata information just
like getimagesize()
# See PHP documentation at: http://www.php.net/getimagesize
- $metadata = [];
- $metadata[0] = $header['width'];
- $metadata[1] = $header['height'];
- $metadata[2] = null; # IMAGETYPE constant, none exist for XCF.
- $metadata[3] = sprintf(
- 'height="%s" width="%s"', $header['height'],
$header['width']
- );
- $metadata['mime'] = 'image/x-xcf';
- $metadata['channels'] = null;
- $metadata['bits'] = 8; # Always 8-bits per color
-
- assert( '7 == count($metadata); ' .
- '# return array must contains 7 elements just like
getimagesize() return' );
-
- return $metadata;
+ return [
+ 0 => $header['width'],
+ 1 => $header['height'],
+ 2 => null, # IMAGETYPE constant, none exist for XCF.
+ 3 => "height=\"{$header['height']}\"
width=\"{$header['width']}\"",
+ 'mime' => 'image/x-xcf',
+ 'channels' => null,
+ 'bits' => 8, # Always 8-bits per color
+ ];
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/276470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie77d26c80d592911b33bc544f831c4d34cc47d0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
