X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fmedia%2FExifBitmap.php;h=426721095c2c58f149114edda74dcc86643fee34;hp=cf4b12ef3ba646a1e8d0d7c927184e65a1d94bd1;hb=39f0f919c5708f4c672a8eb7e0891f50bf16883e;hpb=06657e715ae1ca3a9afc602724d0c113713e22c0

diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php
index cf4b12ef3b..426721095c 100644
--- a/includes/media/ExifBitmap.php
+++ b/includes/media/ExifBitmap.php
@@ -99,9 +99,9 @@ class ExifBitmapHandler extends BitmapHandler {
 		if ( $metadata === self::BROKEN_FILE ) {
 			return self::METADATA_GOOD;
 		}
-		MediaWiki\suppressWarnings();
+		Wikimedia\suppressWarnings();
 		$exif = unserialize( $metadata );
-		MediaWiki\restoreWarnings();
+		Wikimedia\restoreWarnings();
 		if ( !isset( $exif['MEDIAWIKI_EXIF_VERSION'] )
 			|| $exif['MEDIAWIKI_EXIF_VERSION'] != Exif::version()
 		) {
@@ -223,9 +223,9 @@ class ExifBitmapHandler extends BitmapHandler {
 		if ( !$data ) {
 			return 0;
 		}
-		MediaWiki\suppressWarnings();
+		Wikimedia\suppressWarnings();
 		$data = unserialize( $data );
-		MediaWiki\restoreWarnings();
+		Wikimedia\restoreWarnings();
 		if ( isset( $data['Orientation'] ) ) {
 			# See http://sylvana.net/jpegcrop/exif_orientation.html
 			switch ( $data['Orientation'] ) {
@@ -242,36 +242,4 @@ class ExifBitmapHandler extends BitmapHandler {
 
 		return 0;
 	}
-
-	/**
-	* Get useful response headers for GET/HEAD requests for a file with the given metadata
-	* @param $metadata Array Contains this handler's unserialized getMetadata() for a file
-	* @return Array
-	*/
-	public function getContentHeaders( $metadata ) {
-		if ( !isset( $metadata['Width'] ) || !isset( $metadata['Height'] ) ) {
-			return [];
-		}
-
-		$dimensionsMetadata = [];
-
-		if ( $this->autoRotateEnabled() && isset( $metadata['Orientation'] ) ) {
-			switch ( $metadata['Orientation'] ) {
-				case 5: // CCW flipped
-				case 6: // CCW
-				case 7: // CW flipped
-				case 8: // CW
-					$dimensionsMetadata['width'] = $metadata['Height'];
-					$dimensionsMetadata['height'] = $metadata['Width'];
-					break;
-			}
-		}
-
-		if ( !isset( $dimensionsMetadata['width'] ) ) {
-			$dimensionsMetadata['width'] = $metadata['Width'];
-			$dimensionsMetadata['height'] = $metadata['Height'];
-		}
-
-		return parent::getContentHeaders( $dimensionsMetadata );
-	}
 }