aboutsummaryrefslogtreecommitdiffstats
path: root/includes/media
diff options
context:
space:
mode:
Diffstat (limited to 'includes/media')
-rw-r--r--includes/media/DjVuImage.php5
-rw-r--r--includes/media/Exif.php14
-rw-r--r--includes/media/GIFMetadataExtractor.php6
-rw-r--r--includes/media/IPTC.php6
-rw-r--r--includes/media/ImageHandler.php6
-rw-r--r--includes/media/JpegMetadataExtractor.php5
-rw-r--r--includes/media/PNGMetadataExtractor.php18
-rw-r--r--includes/media/SVGReader.php5
-rw-r--r--includes/media/SvgHandler.php5
9 files changed, 42 insertions, 28 deletions
diff --git a/includes/media/DjVuImage.php b/includes/media/DjVuImage.php
index de842fba3e7a..fe086b8c19aa 100644
--- a/includes/media/DjVuImage.php
+++ b/includes/media/DjVuImage.php
@@ -26,6 +26,7 @@
use MediaWiki\MediaWikiServices;
use MediaWiki\Shell\Shell;
+use Wikimedia\AtEase\AtEase;
/**
* Support for detecting/validating DjVu image files and getting
@@ -123,9 +124,9 @@ class DjVuImage {
}
private function getInfo() {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$file = fopen( $this->mFilename, 'rb' );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
if ( $file === false ) {
wfDebug( __METHOD__ . ": missing or failed file read" );
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index c2d80c48831b..29c8d595401a 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -25,6 +25,8 @@
* @file
*/
+use Wikimedia\AtEase\AtEase;
+
/**
* Class to extract and validate Exif data from jpeg (and possibly tiff) files.
* @ingroup Media
@@ -292,9 +294,9 @@ class Exif {
$this->debugFile( __FUNCTION__, true );
if ( function_exists( 'exif_read_data' ) ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$data = exif_read_data( $this->file, 0, true );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
} else {
throw new MWException( "Internal error: exif_read_data not present. " .
"\$wgShowEXIF may be incorrectly set or not checked by an extension." );
@@ -474,17 +476,17 @@ class Exif {
break;
}
if ( $charset ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$val = iconv( $charset, 'UTF-8//IGNORE', $val );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
} else {
// if valid utf-8, assume that, otherwise assume windows-1252
$valCopy = $val;
UtfNormal\Validator::quickIsNFCVerify( $valCopy ); // validates $valCopy.
if ( $valCopy !== $val ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$val = iconv( 'Windows-1252', 'UTF-8//IGNORE', $val );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
}
}
diff --git a/includes/media/GIFMetadataExtractor.php b/includes/media/GIFMetadataExtractor.php
index 24f3734443c6..ed9852bab017 100644
--- a/includes/media/GIFMetadataExtractor.php
+++ b/includes/media/GIFMetadataExtractor.php
@@ -26,6 +26,8 @@
* @ingroup Media
*/
+use Wikimedia\AtEase\AtEase;
+
/**
* GIF frame counter.
*
@@ -172,9 +174,9 @@ class GIFMetadataExtractor {
UtfNormal\Validator::quickIsNFCVerify( $dataCopy );
if ( $dataCopy !== $data ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$data = iconv( 'windows-1252', 'UTF-8', $data );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
}
$commentCount = count( $comment );
diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index db711dd1bb0d..fd0db3769fad 100644
--- a/includes/media/IPTC.php
+++ b/includes/media/IPTC.php
@@ -21,6 +21,8 @@
* @ingroup Media
*/
+use Wikimedia\AtEase\AtEase;
+
/**
* Class for some IPTC functions.
*
@@ -429,9 +431,9 @@ class IPTC {
*/
private static function convIPTCHelper( $data, $charset ) {
if ( $charset ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$data = iconv( $charset, "UTF-8//IGNORE", $data );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
if ( $data === false ) {
$data = "";
wfDebugLog( 'iptc', __METHOD__ . " Error converting iptc data charset $charset to utf-8" );
diff --git a/includes/media/ImageHandler.php b/includes/media/ImageHandler.php
index e9088d463d4f..0ff7157439ab 100644
--- a/includes/media/ImageHandler.php
+++ b/includes/media/ImageHandler.php
@@ -21,6 +21,8 @@
* @ingroup Media
*/
+use Wikimedia\AtEase\AtEase;
+
/**
* Media handler abstract base class for images
*
@@ -221,9 +223,9 @@ abstract class ImageHandler extends MediaHandler {
}
public function getImageSize( $image, $path ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$gis = getimagesize( $path );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
return $gis;
}
diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php
index 86e87f1b15f5..5d4e020084db 100644
--- a/includes/media/JpegMetadataExtractor.php
+++ b/includes/media/JpegMetadataExtractor.php
@@ -21,6 +21,7 @@
* @ingroup Media
*/
+use Wikimedia\AtEase\AtEase;
use Wikimedia\XMPReader\Reader as XMPReader;
/**
@@ -103,9 +104,9 @@ class JpegMetadataExtractor {
// turns $com to valid utf-8.
// thus if no change, its utf-8, otherwise its something else.
if ( $com !== $oldCom ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$com = $oldCom = iconv( 'windows-1252', 'UTF-8//IGNORE', $oldCom );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
}
// Try it again, if its still not a valid string, then probably
// binary junk or some really weird encoding, so don't extract.
diff --git a/includes/media/PNGMetadataExtractor.php b/includes/media/PNGMetadataExtractor.php
index d18a05a37179..5efee62e8d87 100644
--- a/includes/media/PNGMetadataExtractor.php
+++ b/includes/media/PNGMetadataExtractor.php
@@ -25,6 +25,8 @@
* @ingroup Media
*/
+use Wikimedia\AtEase\AtEase;
+
/**
* PNG frame counter.
*
@@ -201,9 +203,9 @@ class PNGMetadataExtractor {
// if compressed
if ( $items[2] == "\x01" ) {
if ( function_exists( 'gzuncompress' ) && $items[4] === "\x00" ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$items[5] = gzuncompress( $items[5] );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
if ( $items[5] === false ) {
// decompression failed
@@ -242,9 +244,9 @@ class PNGMetadataExtractor {
// Don't recognize chunk, so skip.
continue;
}
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
if ( $content === false ) {
wfDebug( __METHOD__ . ": Read error (error with iconv)" );
@@ -281,9 +283,9 @@ class PNGMetadataExtractor {
continue;
}
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$content = gzuncompress( $content );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
if ( $content === false ) {
// decompression failed
@@ -291,9 +293,9 @@ class PNGMetadataExtractor {
continue;
}
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
if ( $content === false ) {
wfDebug( __METHOD__ . ": iconv error in zTXt chunk" );
diff --git a/includes/media/SVGReader.php b/includes/media/SVGReader.php
index 883f7b6d0db4..e5bfef1ed88c 100644
--- a/includes/media/SVGReader.php
+++ b/includes/media/SVGReader.php
@@ -27,6 +27,7 @@
*/
use MediaWiki\MediaWikiServices;
+use Wikimedia\AtEase\AtEase;
/**
* @ingroup Media
@@ -99,7 +100,7 @@ class SVGReader {
// Because we cut off the end of the svg making an invalid one. Complicated
// try catch thing to make sure warnings get restored. Seems like there should
// be a better way.
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
try {
$this->read();
} catch ( Exception $e ) {
@@ -108,7 +109,7 @@ class SVGReader {
throw $e;
} finally {
libxml_disable_entity_loader( $oldDisable );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
}
}
diff --git a/includes/media/SvgHandler.php b/includes/media/SvgHandler.php
index 935080375d30..b621fd7e64eb 100644
--- a/includes/media/SvgHandler.php
+++ b/includes/media/SvgHandler.php
@@ -23,6 +23,7 @@
use MediaWiki\MediaWikiServices;
use MediaWiki\Shell\Shell;
+use Wikimedia\AtEase\AtEase;
use Wikimedia\RequestTimeout\TimeoutException;
use Wikimedia\ScopedCallback;
@@ -277,10 +278,10 @@ class SvgHandler extends ImageHandler {
$ok = symlink( $srcPath, $lnPath );
/** @noinspection PhpUnusedLocalVariableInspection */
$cleaner = new ScopedCallback( static function () use ( $tmpDir, $lnPath ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
unlink( $lnPath );
rmdir( $tmpDir );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
} );
if ( !$ok ) {
wfDebugLog( 'thumbnail',
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 06:18:13 +0000