dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "resourceloader: Move mw.user skeleton from startup to base"
[lhc/web/wiklou.git]
/
includes
/
media
/
PNGMetadataExtractor.php
diff --git
a/includes/media/PNGMetadataExtractor.php
b/includes/media/PNGMetadataExtractor.php
index
d0517d7
..
78ed0bc
100644
(file)
--- a/
includes/media/PNGMetadataExtractor.php
+++ b/
includes/media/PNGMetadataExtractor.php
@@
-121,6
+121,8
@@
class PNGMetadataExtractor {
if ( !$buf || strlen( $buf ) < $chunk_size ) {
throw new Exception( __METHOD__ . ": Read error" );
}
if ( !$buf || strlen( $buf ) < $chunk_size ) {
throw new Exception( __METHOD__ . ": Read error" );
}
+ $width = unpack( 'N', substr( $buf, 0, 4 ) )[1];
+ $height = unpack( 'N', substr( $buf, 4, 4 ) )[1];
$bitDepth = ord( substr( $buf, 8, 1 ) );
// Detect the color type in British English as per the spec
// https://www.w3.org/TR/PNG/#11IHDR
$bitDepth = ord( substr( $buf, 8, 1 ) );
// Detect the color type in British English as per the spec
// https://www.w3.org/TR/PNG/#11IHDR
@@
-200,9
+202,9
@@
class PNGMetadataExtractor {
// if compressed
if ( $items[2] == "\x01" ) {
if ( function_exists( 'gzuncompress' ) && $items[4] === "\x00" ) {
// if compressed
if ( $items[2] == "\x01" ) {
if ( function_exists( 'gzuncompress' ) && $items[4] === "\x00" ) {
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$items[5] = gzuncompress( $items[5] );
$items[5] = gzuncompress( $items[5] );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $items[5] === false ) {
// decompression failed
if ( $items[5] === false ) {
// decompression failed
@@
-244,9
+246,9
@@
class PNGMetadataExtractor {
fseek( $fh, self::$crcSize, SEEK_CUR );
continue;
}
fseek( $fh, self::$crcSize, SEEK_CUR );
continue;
}
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $content === false ) {
throw new Exception( __METHOD__ . ": Read error (error with iconv)" );
if ( $content === false ) {
throw new Exception( __METHOD__ . ": Read error (error with iconv)" );
@@
-284,9
+286,9
@@
class PNGMetadataExtractor {
continue;
}
continue;
}
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$content = gzuncompress( $content );
$content = gzuncompress( $content );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $content === false ) {
// decompression failed
if ( $content === false ) {
// decompression failed
@@
-295,9
+297,9
@@
class PNGMetadataExtractor {
continue;
}
continue;
}
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
$content = iconv( 'ISO-8859-1', 'UTF-8', $content );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $content === false ) {
throw new Exception( __METHOD__ . ": Read error (error with iconv)" );
if ( $content === false ) {
throw new Exception( __METHOD__ . ": Read error (error with iconv)" );