Fixed some doxygen warnings

[lhc/web/wiklou.git] / includes / DjVuImage.php

diff --git a/includes/DjVuImage.php b/includes/DjVuImage.php
index f14d8d6..c202024 100644 (file)
--- a/includes/DjVuImage.php
+++ b/includes/DjVuImage.php
@@ -1,8 +1,8 @@
 <?php
-
 /**
+ * DjVu image handler
  *
- * Copyright (C) 2006 Brion Vibber <brion@pobox.com>
+ * Copyright © 2006 Brion Vibber <brion@pobox.com>
  * http://www.mediawiki.org/
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  */
 
 /**
@@ -247,17 +248,12 @@ class DjVuImage {
                        wfProfileIn( 'djvutxt' );
                        $cmd = wfEscapeShellArg( $wgDjvuTxt ) . ' --detail=page ' . wfEscapeShellArg( $this->mFilename ) ;
                        wfDebug( __METHOD__.": $cmd\n" );
+                       $retval = '';
                        $txt = wfShellExec( $cmd, $retval );
                        wfProfileOut( 'djvutxt' );
                        if( $retval == 0) {
                                # Get rid of invalid UTF-8, strip control characters
-                               if( is_callable( 'iconv' ) ) {
-                                       wfSuppressWarnings();
-                                       $txt = iconv( "UTF-8","UTF-8//IGNORE", $txt );
-                                       wfRestoreWarnings();
-                               } else {
-                                       $txt = UtfNormal::cleanUp( $txt );
-                               }
+                               $txt = UtfNormal::cleanUp( $txt );
                                $txt = preg_replace( "/[\013\035\037]/", "", $txt );
                                $reg = <<<EOR
                                        /\(page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*"