https://www.mediawiki.org/wiki/Special:Code/MediaWiki/108253
Revision: 108253
Author: demon
Date: 2012-01-06 16:58:38 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
Follow up r108248, r108141: use wfUnpack() so we don't duplicate logic. Could
also pass $length for sanity, but someone else can do that
Modified Paths:
--------------
trunk/phase3/includes/media/XCF.php
Modified: trunk/phase3/includes/media/XCF.php
===================================================================
--- trunk/phase3/includes/media/XCF.php 2012-01-06 16:28:11 UTC (rev 108252)
+++ trunk/phase3/includes/media/XCF.php 2012-01-06 16:58:38 UTC (rev 108253)
@@ -78,18 +78,16 @@
# 1: Grayscale
# 2: Indexed color
# (enum GimpImageBaseType in libgimpbase/gimpbaseenums.h)
- wfSuppressWarnings();
- $header = unpack(
- "A9magic" # A: space padded
- . "/a5version" # a: zero padded
- . "/Nwidth" # \
- . "/Nheight" # N: unsigned long 32bit big endian
- . "/Nbase_type" # /
- , $binaryHeader
- );
- wfRestoreWarnings();
-
- if( $header === false ) {
+ try {
+ $header = wfUnpack(
+ "A9magic" # A: space padded
+ . "/a5version" # a: zero padded
+ . "/Nwidth" # \
+ . "/Nheight" # N: unsigned long 32bit big
endian
+ . "/Nbase_type" # /
+ , $binaryHeader
+ );
+ } catch( MWException $mwe ) {
return false;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
