X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FBitmapMetadataHandler.php;h=35c97518ea66705aaadbe57b16ccddbbae5ff65f;hb=2f15b22b91c0426b06e9ece9ffd2aa14fbdaa621;hp=7999bbbf8614b6740a2896969d93d57662587fb0;hpb=b5906606e1aa1a795231fb813b766818b1dd6c25;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php index 7999bbbf86..35c97518ea 100644 --- a/includes/media/BitmapMetadataHandler.php +++ b/includes/media/BitmapMetadataHandler.php @@ -160,6 +160,7 @@ class BitmapMetadataHandler { $meta = new self(); $seg = JpegMetadataExtractor::segmentSplitter( $filename ); + if ( isset( $seg['COM'] ) && isset( $seg['COM'][0] ) ) { $meta->addMetadata( [ 'JPEGFileComment' => $seg['COM'] ], 'native' ); } @@ -182,9 +183,8 @@ class BitmapMetadataHandler { $meta->addMetadata( $array, $type ); } } - if ( isset( $seg['byteOrder'] ) ) { - $meta->getExif( $filename, $seg['byteOrder'] ); - } + + $meta->getExif( $filename, isset( $seg['byteOrder'] ) ? $seg['byteOrder'] : 'BE' ); return $meta->getMetadataArray(); } @@ -230,7 +230,6 @@ class BitmapMetadataHandler { * @return array Metadata array */ public static function GIF( $filename ) { - $meta = new self(); $baseArray = GIFMetadataExtractor::getMetadata( $filename );