X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FDjVuImage.php;h=8ae60cc8fa5682774dc15b9b213fb221279bcedf;hb=b126e82f168f8bc1ad56c16b0bd3b69e309003c0;hp=099375bfce5863715b7e22626ff27bf4c481ef20;hpb=05b8af8b91dac965c67571668187d1dc2511ae03;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/DjVuImage.php b/includes/media/DjVuImage.php
index 099375bfce..8ae60cc8fa 100644
--- a/includes/media/DjVuImage.php
+++ b/includes/media/DjVuImage.php
@@ -88,7 +88,7 @@ class DjVuImage {
 		// something that explicitly initializes local variables.
 		extract( unpack( 'a4magic/a4chunk/NchunkLength', $header ) );
 		/** @var string $chunk
-		 *  @var string $chunkLength */
+		 * @var string $chunkLength */
 		echo "$chunk $chunkLength\n";
 		$this->dumpForm( $file, $chunkLength, 1 );
 		fclose( $file );
@@ -107,7 +107,7 @@ class DjVuImage {
 			// something that explicitly initializes local variables.
 			extract( unpack( 'a4chunk/NchunkLength', $chunkHeader ) );
 			/** @var string $chunk
-			 *  @var string $chunkLength */
+			 * @var string $chunkLength */
 			echo str_repeat( ' ', $indent * 4 ) . "$chunk $chunkLength\n";
 
 			if ( $chunk == 'FORM' ) {
@@ -143,9 +143,9 @@ class DjVuImage {
 			extract( unpack( 'a4magic/a4form/NformLength/a4subtype', $header ) );
 
 			/** @var string $magic
-			 *  @var string $subtype
-			 *  @var string $formLength
-			 *  @var string $formType */
+			 * @var string $subtype
+			 * @var string $formLength
+			 * @var string $formType */
 			if ( $magic != 'AT&T' ) {
 				wfDebug( __METHOD__ . ": not a DjVu file\n" );
 			} elseif ( $subtype == 'DJVU' ) {
@@ -173,7 +173,7 @@ class DjVuImage {
 			extract( unpack( 'a4chunk/Nlength', $header ) );
 
 			/** @var string $chunk
-			 *  @var string $length */
+			 * @var string $length */
 			return array( $chunk, $length );
 		}
 	}
@@ -249,12 +249,12 @@ class DjVuImage {
 		# Newer files have rotation info in byte 10, but we don't use it yet.
 
 		/** @var string $width
-		 *  @var string $height
-		 *  @var string $major
-		 *  @var string $minor
-		 *  @var string $resolution
-		 *  @var string $length
-		 *  @var string $gamma */
+		 * @var string $height
+		 * @var string $major
+		 * @var string $minor
+		 * @var string $resolution
+		 * @var string $length
+		 * @var string $gamma */
 		return array(
 			'width' => $width,
 			'height' => $height,
@@ -265,11 +265,14 @@ class DjVuImage {
 
 	/**
 	 * Return an XML string describing the DjVu image
-	 * @return string
+	 * @return string|bool
 	 */
 	function retrieveMetaData() {
 		global $wgDjvuToXML, $wgDjvuDump, $wgDjvuTxt;
-		wfProfileIn( __METHOD__ );
+
+		if ( !$this->isValid() ) {
+			return false;
+		}
 
 		if ( isset( $wgDjvuDump ) ) {
 			# djvudump is faster as of version 3.5
@@ -316,7 +319,6 @@ EOR;
 				$xml = $xml . $txt . '</mw-djvu>';
 			}
 		}
-		wfProfileOut( __METHOD__ );
 
 		return $xml;
 	}