Follow up r108248, r108141: use wfUnpack() so we don't duplicate logic. Could also...

diff --git a/includes/media/XCF.php b/includes/media/XCF.php
index b113d70..ff23334 100644 (file)
--- a/includes/media/XCF.php
+++ b/includes/media/XCF.php
@@ -78,18 +78,16 @@ class XCFHandler extends BitmapHandler {
                #                         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;
                }