| Index: trunk/phase3/includes/media/IPTC.php |
| — | — | @@ -5,24 +5,24 @@ |
| 6 | 6 | */ |
| 7 | 7 | class IPTC { |
| 8 | 8 | |
| 9 | | - /** |
| 10 | | - * This takes the results of iptcparse() and puts it into a |
| 11 | | - * form that can be handled by mediawiki. Generally called from |
| 12 | | - * BitmapMetadataHandler::doApp13. |
| 13 | | - * |
| 14 | | - * @see http://www.iptc.org/std/IIM/4.1/specification/IIMV4.1.pdf |
| 15 | | - * |
| 16 | | - * @param String $data app13 block from jpeg containing iptc/iim data |
| 17 | | - * @return Array iptc metadata array |
| 18 | | - */ |
| 19 | | - static function parse( $rawData ) { |
| 20 | | - $parsed = iptcparse( $rawData ); |
| 21 | | - $data = Array(); |
| 22 | | - if (!is_array($parsed)) { |
| 23 | | - return $data; |
| 24 | | - } |
| | 9 | + /** |
| | 10 | + * This takes the results of iptcparse() and puts it into a |
| | 11 | + * form that can be handled by mediawiki. Generally called from |
| | 12 | + * BitmapMetadataHandler::doApp13. |
| | 13 | + * |
| | 14 | + * @see http://www.iptc.org/std/IIM/4.1/specification/IIMV4.1.pdf |
| | 15 | + * |
| | 16 | + * @param String $data app13 block from jpeg containing iptc/iim data |
| | 17 | + * @return Array iptc metadata array |
| | 18 | + */ |
| | 19 | + static function parse( $rawData ) { |
| | 20 | + $parsed = iptcparse( $rawData ); |
| | 21 | + $data = Array(); |
| | 22 | + if (!is_array($parsed)) { |
| | 23 | + return $data; |
| | 24 | + } |
| 25 | 25 | |
| 26 | | - $c = ''; |
| | 26 | + $c = ''; |
| 27 | 27 | //charset info contained in tag 1:90. |
| 28 | 28 | if (isset($parsed['1#090']) && isset($parsed['1#090'][0])) { |
| 29 | 29 | $c = self::getCharset($parsed['1#090'][0]); |