diff options
Diffstat (limited to 'includes/media/BitmapMetadataHandler.php')
| -rw-r--r-- | includes/media/BitmapMetadataHandler.php | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/includes/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php index 0a195547..7c39c814 100644 --- a/includes/media/BitmapMetadataHandler.php +++ b/includes/media/BitmapMetadataHandler.php @@ -47,14 +47,14 @@ class BitmapMetadataHandler { private $iptcType = 'iptc-no-hash'; /** - * This does the photoshop image resource app13 block - * of interest, IPTC-IIM metadata is stored here. - * - * Mostly just calls doPSIR and doIPTC - * - * @param String $app13 String containing app13 block from jpeg file - */ - private function doApp13 ( $app13 ) { + * This does the photoshop image resource app13 block + * of interest, IPTC-IIM metadata is stored here. + * + * Mostly just calls doPSIR and doIPTC + * + * @param string $app13 String containing app13 block from jpeg file + */ + private function doApp13( $app13 ) { try { $this->iptcType = JpegMetadataExtractor::doPSIR( $app13 ); } catch ( MWException $e ) { @@ -69,7 +69,6 @@ class BitmapMetadataHandler { $this->addMetadata( $iptc, $this->iptcType ); } - /** * Get exif info using exif class. * Basically what used to be in BitmapHandler::getMetadata(). @@ -80,7 +79,7 @@ class BitmapMetadataHandler { * @param $filename string * @param $byteOrder string */ - function getExif ( $filename, $byteOrder ) { + function getExif( $filename, $byteOrder ) { global $wgShowEXIF; if ( file_exists( $filename ) && $wgShowEXIF ) { $exif = new Exif( $filename, $byteOrder ); @@ -91,12 +90,12 @@ class BitmapMetadataHandler { } } /** Add misc metadata. Warning: atm if the metadata category - * doesn't have a priority, it will be silently discarded. - * - * @param Array $metaArray array of metadata values - * @param string $type type. defaults to other. if two things have the same type they're merged - */ - function addMetadata ( $metaArray, $type = 'other' ) { + * doesn't have a priority, it will be silently discarded. + * + * @param array $metaArray array of metadata values + * @param string $type type. defaults to other. if two things have the same type they're merged + */ + function addMetadata( $metaArray, $type = 'other' ) { if ( isset( $this->metadata[$type] ) ) { /* merge with old data */ $metaArray = $metaArray + $this->metadata[$type]; @@ -106,15 +105,15 @@ class BitmapMetadataHandler { } /** - * Merge together the various types of metadata - * the different types have different priorites, - * and are merged in order. - * - * This function is generally called by the media handlers' getMetadata() - * - * @return Array metadata array - */ - function getMetadataArray () { + * Merge together the various types of metadata + * the different types have different priorites, + * and are merged in order. + * + * This function is generally called by the media handlers' getMetadata() + * + * @return Array metadata array + */ + function getMetadataArray() { // this seems a bit ugly... This is all so its merged in right order // based on the MWG recomendation. $temp = Array(); @@ -144,11 +143,11 @@ class BitmapMetadataHandler { /** Main entry point for jpeg's. * - * @param $filename string filename (with full path) + * @param string $filename filename (with full path) * @return array metadata result array. * @throws MWException on invalid file. */ - static function Jpeg ( $filename ) { + static function Jpeg( $filename ) { $showXMP = function_exists( 'xml_parser_create_ns' ); $meta = new self(); @@ -157,7 +156,7 @@ class BitmapMetadataHandler { $meta->addMetadata( Array( 'JPEGFileComment' => $seg['COM'] ), 'native' ); } if ( isset( $seg['PSIR'] ) && count( $seg['PSIR'] ) > 0 ) { - foreach( $seg['PSIR'] as $curPSIRValue ) { + foreach ( $seg['PSIR'] as $curPSIRValue ) { $meta->doApp13( $curPSIRValue ); } } @@ -187,10 +186,10 @@ class BitmapMetadataHandler { * merge the png various tEXt chunks to that * are interesting, but for now it only does XMP * - * @param $filename String full path to file + * @param string $filename full path to file * @return Array Array for storage in img_metadata. */ - static public function PNG ( $filename ) { + public static function PNG( $filename ) { $showXMP = function_exists( 'xml_parser_create_ns' ); $meta = new self(); @@ -216,10 +215,10 @@ class BitmapMetadataHandler { * They don't really have native metadata, so just merges together * XMP and image comment. * - * @param $filename string full path to file + * @param string $filename full path to file * @return Array metadata array */ - static public function GIF ( $filename ) { + public static function GIF( $filename ) { $meta = new self(); $baseArray = GIFMetadataExtractor::getMetadata( $filename ); @@ -240,7 +239,7 @@ class BitmapMetadataHandler { unset( $baseArray['comment'] ); unset( $baseArray['xmp'] ); - + $baseArray['metadata'] = $meta->getMetadataArray(); $baseArray['metadata']['_MW_GIF_VERSION'] = GIFMetadataExtractor::VERSION; return $baseArray; @@ -257,9 +256,10 @@ class BitmapMetadataHandler { * * The various exceptions this throws are caught later. * @param $filename String + * @throws MWException * @return Array The metadata. */ - static public function Tiff ( $filename ) { + public static function Tiff( $filename ) { if ( file_exists( $filename ) ) { $byteOrder = self::getTiffByteOrder( $filename ); if ( !$byteOrder ) { @@ -281,16 +281,18 @@ class BitmapMetadataHandler { * Read the first 2 bytes of a tiff file to figure out * Little Endian or Big Endian. Needed for exif stuff. * - * @param $filename String The filename + * @param string $filename The filename * @return String 'BE' or 'LE' or false */ static function getTiffByteOrder( $filename ) { $fh = fopen( $filename, 'rb' ); - if ( !$fh ) return false; + if ( !$fh ) { + return false; + } $head = fread( $fh, 2 ); fclose( $fh ); - switch( $head ) { + switch ( $head ) { case 'II': return 'LE'; // II for intel. case 'MM': @@ -300,6 +302,4 @@ class BitmapMetadataHandler { } } - - } |