$meta = new self();
$seg = JpegMetadataExtractor::segmentSplitter( $filename );
+
if ( isset( $seg['COM'] ) && isset( $seg['COM'][0] ) ) {
$meta->addMetadata( [ 'JPEGFileComment' => $seg['COM'] ], 'native' );
}
}
}
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
$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();
}
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 ) {
* @return array Metadata array
*/
public static function GIF( $filename ) {
-
$meta = new self();
$baseArray = GIFMetadataExtractor::getMetadata( $filename );
}
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 ) {