summaryrefslogtreecommitdiff
path: root/includes/media/BitmapMetadataHandler.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-12-17 09:15:42 +0100
committerPierre Schmitz <pierre@archlinux.de>2015-12-17 09:44:51 +0100
commita1789ddde42033f1b05cc4929491214ee6e79383 (patch)
tree63615735c4ddffaaabf2428946bb26f90899f7bf /includes/media/BitmapMetadataHandler.php
parent9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff)
Update to MediaWiki 1.26.0
Diffstat (limited to 'includes/media/BitmapMetadataHandler.php')
-rw-r--r--includes/media/BitmapMetadataHandler.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/includes/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php
index c8d37bbb..a5cddac9 100644
--- a/includes/media/BitmapMetadataHandler.php
+++ b/includes/media/BitmapMetadataHandler.php
@@ -21,6 +21,8 @@
* @ingroup Media
*/
+use MediaWiki\Logger\LoggerFactory;
+
/**
* Class to deal with reconciling and extracting metadata from bitmap images.
* This is meant to comply with http://www.metadataworkinggroup.org/pdf/mwg_guidance.pdf
@@ -167,7 +169,7 @@ class BitmapMetadataHandler {
}
}
if ( isset( $seg['XMP'] ) && $showXMP ) {
- $xmp = new XMPReader();
+ $xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ) );
$xmp->parse( $seg['XMP'] );
foreach ( $seg['XMP_ext'] as $xmpExt ) {
/* Support for extended xmp in jpeg files
@@ -203,7 +205,7 @@ class BitmapMetadataHandler {
if ( isset( $array['text']['xmp']['x-default'] )
&& $array['text']['xmp']['x-default'] !== '' && $showXMP
) {
- $xmp = new XMPReader();
+ $xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ) );
$xmp->parse( $array['text']['xmp']['x-default'] );
$xmpRes = $xmp->getResults();
foreach ( $xmpRes as $type => $xmpSection ) {
@@ -237,7 +239,7 @@ class BitmapMetadataHandler {
}
if ( $baseArray['xmp'] !== '' && XMPReader::isSupported() ) {
- $xmp = new XMPReader();
+ $xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ) );
$xmp->parse( $baseArray['xmp'] );
$xmpRes = $xmp->getResults();
foreach ( $xmpRes as $type => $xmpSection ) {