From 1ff67403c85b898caa8cd9faaf42227cabb2d413 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@users.mediawiki.org>
Date: Tue, 19 Jan 2010 17:23:29 +0000
Subject: [PATCH] if available, use iconv because it requires less memory
 (fixes bug 21809) (follow up to r55768 and r55843)

---
 includes/DjVuImage.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/includes/DjVuImage.php b/includes/DjVuImage.php
index 544a455bdf..75df0fd59f 100644
--- a/includes/DjVuImage.php
+++ b/includes/DjVuImage.php
@@ -251,7 +251,13 @@ class DjVuImage {
 			wfProfileOut( 'djvutxt' );
 			if( $retval == 0) {
 				# Get rid of invalid UTF-8, strip control characters
-				$txt = UtfNormal::cleanUp( $txt );
+				if( is_callable( 'iconv' ) ) {
+					wfSuppressWarnings();
+					$txt = iconv( "UTF-8","UTF-8//IGNORE", $txt );
+					wfRestoreWarnings();
+				} else {
+					$txt = UtfNormal::cleanUp( $txt );
+				}
 				$txt = preg_replace( "/[\013\035\037]/", "", $txt );
 				$txt = htmlspecialchars($txt);
 				$txt = preg_replace( "/\((page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*\&quot;([^<]*?)\&quot;\s*|)\)/s", "<PAGE value=\"$2\" />", $txt  );
-- 
2.20.1