Merge "Fix Postgres support"

[lhc/web/wiklou.git] / includes / media / PNGMetadataExtractor.php

diff --git a/includes/media/PNGMetadataExtractor.php b/includes/media/PNGMetadataExtractor.php
index f4f29dd..c12ca0b 100644 (file)
--- a/includes/media/PNGMetadataExtractor.php
+++ b/includes/media/PNGMetadataExtractor.php
@@ -47,7 +47,7 @@ class PNGMetadataExtractor {
                self::$pngSig = pack( "C8", 137, 80, 78, 71, 13, 10, 26, 10 );
                self::$crcSize = 4;
                /* based on list at http://owl.phy.queensu.ca/~phil/exiftool/TagNames/PNG.html#TextualData
-                * and http://www.w3.org/TR/PNG/#11keywords
+                * and https://www.w3.org/TR/PNG/#11keywords
                 */
                self::$textChunks = [
                        'xml:com.adobe.xmp' => 'xmp',
@@ -121,9 +121,11 @@ class PNGMetadataExtractor {
                                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
-                               // http://www.w3.org/TR/PNG/#11IHDR
+                               // https://www.w3.org/TR/PNG/#11IHDR
                                switch ( ord( substr( $buf, 9, 1 ) ) ) {
                                        case 0:
                                                $colorType = 'greyscale';