X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2Fmedia%2FBitmapMetadataHandler.php;h=9e0fc3db36e2b7ae368fea6aabeb2ef6d490c3bc;hb=0c712ce564e0bd53e28f2581a714ee8cd04b614c;hp=35c97518ea66705aaadbe57b16ccddbbae5ff65f;hpb=64b83bdb3afd0ee4f8fc1893a865409c198e601e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php index 35c97518ea..9e0fc3db36 100644 --- a/includes/media/BitmapMetadataHandler.php +++ b/includes/media/BitmapMetadataHandler.php @@ -170,7 +170,7 @@ class BitmapMetadataHandler { } } if ( isset( $seg['XMP'] ) && $showXMP ) { - $xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ) ); + $xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ), $filename ); $xmp->parse( $seg['XMP'] ); foreach ( $seg['XMP_ext'] as $xmpExt ) { /* Support for extended xmp in jpeg files @@ -205,7 +205,7 @@ class BitmapMetadataHandler { if ( isset( $array['text']['xmp']['x-default'] ) && $array['text']['xmp']['x-default'] !== '' && $showXMP ) { - $xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ) ); + $xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ), $filename ); $xmp->parse( $array['text']['xmp']['x-default'] ); $xmpRes = $xmp->getResults(); foreach ( $xmpRes as $type => $xmpSection ) { @@ -238,7 +238,7 @@ class BitmapMetadataHandler { } if ( $baseArray['xmp'] !== '' && XMPReader::isSupported() ) { - $xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ) ); + $xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ), $filename ); $xmp->parse( $baseArray['xmp'] ); $xmpRes = $xmp->getResults(); foreach ( $xmpRes as $type => $xmpSection ) { @@ -292,7 +292,7 @@ class BitmapMetadataHandler { * Read the first 2 bytes of a tiff file to figure out * Little Endian or Big Endian. Needed for exif stuff. * - * @param string $filename The filename + * @param string $filename * @return string 'BE' or 'LE' or false */ static function getTiffByteOrder( $filename ) {