* @deprecated
*/
function getMetadata( $image, $filename ) {
- wfDeprected( __METHOD__ );
+ wfDeprecated( __METHOD__ );
global $wgShowEXIF;
if ( $wgShowEXIF && file_exists( $filename ) ) {
$exif = new Exif( $filename );
$showXMP = function_exists( 'xml_parser_create_ns' );
$meta = new self();
$meta->getExif( $filename );
- $seg = Array();
+
$seg = JpegMetadataExtractor::segmentSplitter( $filename );
if ( isset( $seg['COM'] ) && isset( $seg['COM'][0] ) ) {
$meta->addMetadata( Array( 'JPEGFileComment' => $seg['COM'] ), 'native' );
}
} elseif ($extension_code == 0xFE) {
// Comment block(s).
- $data = '';
-
$data = self::readBlock( $fh );
if ( $data === "" ) {
throw new Exception( 'Read error, zero-length comment block' );
*/
function convertMetadataVersion( $metadata, $version = 1 ) {
if ( !is_array( $metadata ) ) {
+
//unserialize to keep return parameter consistent.
wfSuppressWarnings();
- return unserialize( $metadata );
+ $ret = unserialize( $metadata );
wfRestoreWarnings();
+ return $ret;
}
return $metadata;
}
* @param $charset String: The charset
*/
private static function convIPTC ( $data, $charset ) {
- global $wgLang;
if ( is_array( $data ) ) {
foreach ($data as &$val) {
$val = self::convIPTCHelper( $val, $charset );
// the +12 is the length of an empty item.
while ( $offset + 12 <= $appLen ) {
- $valid = true;
- $id = false;
- $lenName = false;
- $lenData = false;
-
if ( substr( $app13, $offset, 4 ) !== '8BIM' ) {
// its supposed to be 8BIM
// but apparently sometimes isn't esp. in
/* Other potentially useful things - Document */
);
- $showXMP = function_exists( 'xml_parser_create_ns' );
-
$frameCount = 0;
$loopCount = 1;
$text = array();
} elseif ( $chunk_type == 'tEXt' ) {
$buf = self::read( $fh, $chunk_size );
- $keyword = '';
- $content = '';
list( $keyword, $content ) = explode( "\x00", $buf, 2 );
if ( $keyword === '' || $content === '' ) {
} elseif ( $chunk_type == 'zTXt' ) {
if ( function_exists( 'gzuncompress' ) ) {
$buf = self::read( $fh, $chunk_size );
- $keyword = '';
- $postKeyword = '';
list( $keyword, $postKeyword ) = explode( "\x00", $buf, 2 );
if ( $keyword === '' || $postKeyword === '' ) {