| Index: branches/img_metadata/phase3/includes/media/FormatMetadata.php |
| — | — | @@ -74,7 +74,7 @@ |
| 75 | 75 | $type = $tags[$tag]['_type']; |
| 76 | 76 | unset( $vals['_type'] ); |
| 77 | 77 | } else { |
| 78 | | - $type = 'ul'; // default unorcdered list. |
| | 78 | + $type = 'ul'; // default unordered list. |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | //This is done differently as the tag is an array. |
| — | — | @@ -444,7 +444,7 @@ |
| 445 | 445 | } |
| 446 | 446 | break; |
| 447 | 447 | |
| 448 | | - //The GPS...Ref values are kept for compatability, probably won't be reached. |
| | 448 | + //The GPS...Ref values are kept for compatibility, probably won't be reached. |
| 449 | 449 | case 'GPSLatitudeRef': |
| 450 | 450 | case 'GPSDestLatitudeRef': |
| 451 | 451 | switch( $val ) { |
| — | — | @@ -760,7 +760,7 @@ |
| 761 | 761 | * @param $vals Array array of values |
| 762 | 762 | * @param $type Type of array (either lang, ul, ol). |
| 763 | 763 | * lang = language assoc array with keys being the lang code |
| 764 | | - * ul = unorded list, ol = ordered list |
| | 764 | + * ul = unordered list, ol = ordered list |
| 765 | 765 | * type can also come from the '_type' member of $vals. |
| 766 | 766 | * @return String single value (in wiki-syntax). |
| 767 | 767 | */ |
| — | — | @@ -789,7 +789,7 @@ |
| 790 | 790 | case 'lang': |
| 791 | 791 | global $wgContLang; |
| 792 | 792 | // Display default, followed by ContLang, |
| 793 | | - // followed by the rest in no paticular |
| | 793 | + // followed by the rest in no particular |
| 794 | 794 | // order. |
| 795 | 795 | |
| 796 | 796 | // Todo: hide some items if really long list. |
| — | — | @@ -1075,7 +1075,7 @@ |
| 1076 | 1076 | // Note: We run this through htmlspecialchars |
| 1077 | 1077 | // partially to be consistent, and partially |
| 1078 | 1078 | // because people often insert >, etc into |
| 1079 | | - // the metadata which should not be interperted |
| | 1079 | + // the metadata which should not be interpreted |
| 1080 | 1080 | // but we still want to auto-link urls. |
| 1081 | 1081 | foreach( $vals as &$val ) { |
| 1082 | 1082 | $val = htmlspecialchars( $val ); |
| — | — | @@ -1154,7 +1154,7 @@ |
| 1155 | 1155 | /** For compatability with old FormatExif class |
| 1156 | 1156 | * which some extensions use. |
| 1157 | 1157 | * |
| 1158 | | - *@deprected |
| | 1158 | + *@deprecated |
| 1159 | 1159 | * |
| 1160 | 1160 | **/ |
| 1161 | 1161 | class FormatExif { |
| Index: branches/img_metadata/phase3/includes/media/Exif.php |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | * @fixme the following are broke: |
| 101 | 101 | * SubjectArea. Need to test the more obscure tags. |
| 102 | 102 | * |
| 103 | | - * DigitalZoomRatio = 0/0 is rejected. need to determine if thats valid. |
| | 103 | + * DigitalZoomRatio = 0/0 is rejected. need to determine if that's valid. |
| 104 | 104 | * possibly should treat 0/0 = 0. need to read exif spec on that. |
| 105 | 105 | */ |
| 106 | 106 | function __construct( $file ) { |
| — | — | @@ -226,7 +226,7 @@ |
| 227 | 227 | 'Saturation' => Exif::SHORT, # Saturation #p50 |
| 228 | 228 | 'Sharpness' => Exif::SHORT, # Sharpness #p50 |
| 229 | 229 | 'DeviceSettingDescription' => Exif::IGNORE, |
| 230 | | - # Desice settings description. This could maybe be supported. Need to find an |
| | 230 | + # Device settings description. This could maybe be supported. Need to find an |
| 231 | 231 | # example file that uses this to see if it has stuff of interest in it. |
| 232 | 232 | 'SubjectDistanceRange' => Exif::SHORT, # Subject distance range #p51 |
| 233 | 233 | |
| — | — | @@ -325,7 +325,7 @@ |
| 326 | 326 | /** |
| 327 | 327 | * Collapse some fields together. |
| 328 | 328 | * This converts some fields from exif form, to a more friendly form. |
| 329 | | - * For example GPS lattitude to a single number. |
| | 329 | + * For example GPS latitude to a single number. |
| 330 | 330 | * |
| 331 | 331 | * The rationale behind this is that we're storing data, not presenting to the user |
| 332 | 332 | * For example a longitude is a single number describing how far away you are from |
| — | — | @@ -429,7 +429,7 @@ |
| 430 | 430 | break; |
| 431 | 431 | } |
| 432 | 432 | // This could possibly check to see if iconv is really installed |
| 433 | | - // or if we're using the compatability wraper in globalFunctions.php |
| | 433 | + // or if we're using the compatibility wrapper in globalFunctions.php |
| 434 | 434 | if ($charset) { |
| 435 | 435 | $val = iconv($charset, 'UTF-8//IGNORE', $val); |
| 436 | 436 | } else { |
| Index: branches/img_metadata/phase3/includes/media/IPTC.php |
| — | — | @@ -10,12 +10,12 @@ |
| 11 | 11 | * form that can be handled by mediawiki. Generally called from |
| 12 | 12 | * BitmapMetadataHandler::doApp13. |
| 13 | 13 | * |
| 14 | | - * At the moment this is more of an outline, and is definitly |
| | 14 | + * At the moment this is more of an outline, and is definitely |
| 15 | 15 | * not complete. |
| 16 | 16 | * @todo finish for other iptc values |
| 17 | 17 | * @see http://www.iptc.org/std/IIM/4.1/specification/IIMV4.1.pdf |
| 18 | 18 | * |
| 19 | | - * @param String $data app13 block from jpeg containg iptc/iim data |
| | 19 | + * @param String $data app13 block from jpeg containing iptc/iim data |
| 20 | 20 | * @return Array iptc metadata array |
| 21 | 21 | */ |
| 22 | 22 | static function parse( $rawData ) { |
| — | — | @@ -55,7 +55,7 @@ |
| 56 | 56 | * like how exif does it with |
| 57 | 57 | * Title, person. Not sure if this is best |
| 58 | 58 | * approach since we no longer have the two fields |
| 59 | | - * seperate. each byline title entry corresponds to a |
| | 59 | + * separate. each byline title entry corresponds to a |
| 60 | 60 | * specific byline. */ |
| 61 | 61 | |
| 62 | 62 | $bylines = self::convIPTC( $val, $c ); |
| — | — | @@ -113,10 +113,10 @@ |
| 114 | 114 | case '2#007': /* edit status (lead, correction, etc) */ |
| 115 | 115 | $data['EditStatus'] = self::convIPTC( $val, $c ); |
| 116 | 116 | break; |
| 117 | | - case '2#015': /* category. deprected. max 3 letters in theory, often more */ |
| | 117 | + case '2#015': /* category. deprecated. max 3 letters in theory, often more */ |
| 118 | 118 | $data['iimCategory'] = self::convIPTC( $val, $c ); |
| 119 | 119 | break; |
| 120 | | - case '2#020': /* category. deprected. */ |
| | 120 | + case '2#020': /* category. deprecated. */ |
| 121 | 121 | $data['iimSupplementalCategory'] = self::convIPTC( $val, $c ); |
| 122 | 122 | break; |
| 123 | 123 | case '2#010': /*urgency (1-8. 1 most, 5 normal, 8 low priority)*/ |
| — | — | @@ -134,7 +134,7 @@ |
| 135 | 135 | $data['LocationDestCode'] = self::convIPTC( $val, $c ); |
| 136 | 136 | break; |
| 137 | 137 | case '2#027': |
| 138 | | - /* Content location name. Full prinatable name |
| | 138 | + /* Content location name. Full printable name |
| 139 | 139 | * of location of photo. */ |
| 140 | 140 | $data['LocationDest'] = self::convIPTC( $val, $c ); |
| 141 | 141 | break; |
| — | — | @@ -179,7 +179,7 @@ |
| 180 | 180 | case '2#103': |
| 181 | 181 | /* original transmission ref. |
| 182 | 182 | * "A code representing the location of original transmission ac- |
| 183 | | - * cording to practices of the provider." |
| | 183 | + * cording to practises of the provider." |
| 184 | 184 | */ |
| 185 | 185 | $data['OriginalTransmissionRef'] = self::convIPTC( $val, $c ); |
| 186 | 186 | break; |
| — | — | @@ -341,7 +341,7 @@ |
| 342 | 342 | //something wrong. |
| 343 | 343 | // Note, this rejects some valid dates according to iptc spec |
| 344 | 344 | // for example: the date 00000400 means the photo was taken in |
| 345 | | - // april, but the year and day is unknown. We don't process these |
| | 345 | + // April, but the year and day is unknown. We don't process these |
| 346 | 346 | // types of incomplete dates atm. |
| 347 | 347 | wfDebugLog( 'iptc', "IPTC: invalid time ( $time ) or date ( $date )"); |
| 348 | 348 | return null; |
| — | — | @@ -423,15 +423,15 @@ |
| 424 | 424 | */ |
| 425 | 425 | static function getCharset($tag) { |
| 426 | 426 | |
| 427 | | - //Acording to iim standard, charset is defined by the tag 1:90. |
| | 427 | + //According to iim standard, charset is defined by the tag 1:90. |
| 428 | 428 | //in which there are iso 2022 escape sequences to specify the character set. |
| 429 | | - //the iim standard seems to encourage that all neccesary escape sequences are |
| | 429 | + //the iim standard seems to encourage that all necessary escape sequences are |
| 430 | 430 | //in the 1:90 tag, but says it doesn't have to be. |
| 431 | 431 | |
| 432 | | - //This is in need of more testing probably. This is definitly not complete. |
| | 432 | + //This is in need of more testing probably. This is definitely not complete. |
| 433 | 433 | //however reading the docs of some other iptc software, it appears that most iptc software |
| 434 | 434 | //only recognizes utf-8. If 1:90 tag is not present content is |
| 435 | | - // usually ascii or iso-8859-1 (and sometimes utf-8), but no garuntees. |
| | 435 | + // usually ascii or iso-8859-1 (and sometimes utf-8), but no guarantee. |
| 436 | 436 | |
| 437 | 437 | //This also won't work if there are more than one escape sequence in the 1:90 tag |
| 438 | 438 | //or if something is put in the G2, or G3 charsets, etc. It will only reliably recognize utf-8. |
| — | — | @@ -539,7 +539,7 @@ |
| 540 | 540 | $c = 'CSN_369103'; |
| 541 | 541 | break; |
| 542 | 542 | default: |
| 543 | | - wfDebugLog('iptc', __METHOD__ . 'Unkown charset in iptc 1:90: ' . bin2hex( $tag ) ); |
| | 543 | + wfDebugLog('iptc', __METHOD__ . 'Unknown charset in iptc 1:90: ' . bin2hex( $tag ) ); |
| 544 | 544 | //at this point just give up and refuse to parse iptc? |
| 545 | 545 | $c = false; |
| 546 | 546 | } |
| Index: branches/img_metadata/phase3/includes/media/XMP.php |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | <?php |
| 3 | | -/** Class for reading xmp data containing properties relevent to |
| | 3 | +/** Class for reading xmp data containing properties relevant to |
| 4 | 4 | * images, and spitting out an array that FormatExif accepts. |
| 5 | 5 | * |
| 6 | 6 | * It should be noted this is not done yet |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | /* |
| 42 | 42 | * These are various mode constants. |
| 43 | 43 | * they are used to figure out what to do |
| 44 | | - * with an element when its encoutered. |
| | 44 | + * with an element when its encountered. |
| 45 | 45 | * |
| 46 | 46 | * For example, MODE_IGNORE is used when processing |
| 47 | 47 | * a property we're not interested in. So if a new |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | // $items array to denote what type of property the item is. |
| 58 | 58 | const MODE_SIMPLE = 10; |
| 59 | 59 | const MODE_STRUCT = 11; // structure (associative array) |
| 60 | | - const MODE_SEQ = 12; // orderd list |
| | 60 | + const MODE_SEQ = 12; // ordered list |
| 61 | 61 | const MODE_BAG = 13; // unordered list |
| 62 | 62 | const MODE_LANG = 14; |
| 63 | 63 | const MODE_ALT = 15; // non-language alt. Currently not implemented, and not needed atm. |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | |
| 69 | 69 | /** Constructor. |
| 70 | 70 | * |
| 71 | | - * Primary job is to intialize the XMLParser |
| | 71 | + * Primary job is to initialize the XMLParser |
| 72 | 72 | */ |
| 73 | 73 | function __construct() { |
| 74 | 74 | |
| — | — | @@ -107,7 +107,7 @@ |
| 108 | 108 | |
| 109 | 109 | /** Destroy the xml parser |
| 110 | 110 | * |
| 111 | | - * not sure if this is actualy needed. |
| | 111 | + * not sure if this is actually needed. |
| 112 | 112 | */ |
| 113 | 113 | function __destruct() { |
| 114 | 114 | // not sure if this is needed. |
| — | — | @@ -208,7 +208,7 @@ |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | } else { |
| 212 | | - // standard specificly says, if no bom assume utf-8 |
| | 212 | + // standard specifically says, if no bom assume utf-8 |
| 213 | 213 | $this->charset = 'UTF-8'; |
| 214 | 214 | } |
| 215 | 215 | } |
| — | — | @@ -241,7 +241,7 @@ |
| 242 | 242 | * @todo In serious need of testing |
| 243 | 243 | * @see http://www.adobe.ge/devnet/xmp/pdfs/XMPSpecificationPart3.pdf XMP spec part 3 page 20 |
| 244 | 244 | * @param String $content XMPExtended block minus the namespace signature |
| 245 | | - * @return Boolean If it succeded. |
| | 245 | + * @return Boolean If it succeeded. |
| 246 | 246 | */ |
| 247 | 247 | public function parseExtended( $content ) { |
| 248 | 248 | // FIXME: This is untested. Hard to find example files |
| — | — | @@ -492,7 +492,7 @@ |
| 493 | 493 | |
| 494 | 494 | if ( $elm === self::NS_RDF . ' type' ) { |
| 495 | 495 | // these aren't really supported properly yet. |
| 496 | | - wfDebugLog( 'XMP', __METHOD__ . ' encoutered <rdf:type>' ); |
| | 496 | + wfDebugLog( 'XMP', __METHOD__ . ' encountered <rdf:type>' ); |
| 497 | 497 | } |
| 498 | 498 | |
| 499 | 499 | if ( strpos( $elm, ' ' ) === false ) { |
| — | — | @@ -548,7 +548,7 @@ |
| 549 | 549 | |
| 550 | 550 | /** Hit an opening element while in MODE_IGNORE |
| 551 | 551 | * |
| 552 | | - * Mostly ignores, unless we encouter the element that we are ignoring. |
| | 552 | + * Mostly ignores, unless we encounter the element that we are ignoring. |
| 553 | 553 | * |
| 554 | 554 | * @param $elm String namespace . ' ' . tag name |
| 555 | 555 | */ |
| — | — | @@ -562,7 +562,7 @@ |
| 563 | 563 | * this should always be <rdf:Bag> |
| 564 | 564 | * |
| 565 | 565 | * @param $elm String namespace . ' ' . tag |
| 566 | | - * @throws MWException if we have an element thats not <rdf:Bag> |
| | 566 | + * @throws MWException if we have an element that's not <rdf:Bag> |
| 567 | 567 | */ |
| 568 | 568 | private function startElementModeBag( $elm ) { |
| 569 | 569 | if ( $elm === self::NS_RDF . ' Bag' ) { |
| — | — | @@ -576,7 +576,7 @@ |
| 577 | 577 | * this should always be <rdf:Seq> |
| 578 | 578 | * |
| 579 | 579 | * @param $elm String namespace . ' ' . tag |
| 580 | | - * @throws MWException if we have an element thats not <rdf:Seq> |
| | 580 | + * @throws MWException if we have an element that's not <rdf:Seq> |
| 581 | 581 | */ |
| 582 | 582 | private function startElementModeSeq( $elm ) { |
| 583 | 583 | if ( $elm === self::NS_RDF . ' Seq' ) { |
| — | — | @@ -590,7 +590,7 @@ |
| 591 | 591 | * this should always be <rdf:Alt> |
| 592 | 592 | * |
| 593 | 593 | * @param $elm String namespace . ' ' . tag |
| 594 | | - * @throws MWException if we have an element thats not <rdf:Alt> |
| | 594 | + * @throws MWException if we have an element that's not <rdf:Alt> |
| 595 | 595 | */ |
| 596 | 596 | private function startElementModeLang( $elm ) { |
| 597 | 597 | if ( $elm === self::NS_RDF . ' Alt' ) { |
| — | — | @@ -605,7 +605,7 @@ |
| 606 | 606 | * already opened has a child element. Could happen for a |
| 607 | 607 | * qualified element. |
| 608 | 608 | * |
| 609 | | - * @param $elm String namespace and tag names seperated by space. |
| | 609 | + * @param $elm String namespace and tag names separated by space. |
| 610 | 610 | */ |
| 611 | 611 | private function startElementModeSimple( $elm, $attribs ) { |
| 612 | 612 | if ( $elm === self::NS_RDF . ' Description' ) { |
| — | — | @@ -623,7 +623,7 @@ |
| 624 | 624 | |
| 625 | 625 | } else { |
| 626 | 626 | // something else we don't recognize, like a qualifier maybe. |
| 627 | | - wfDebugLog( 'XMP', __METHOD__ . " Encoutered element <$elm> where only expecting character data as value of " . $this->curItem[0] ); |
| | 627 | + wfDebugLog( 'XMP', __METHOD__ . " Encountered element <$elm> where only expecting character data as value of " . $this->curItem[0] ); |
| 628 | 628 | array_unshift( $this->mode, self::MODE_IGNORE ); |
| 629 | 629 | array_unshift( $this->curItem, $elm ); |
| 630 | 630 | |
| — | — | @@ -666,7 +666,7 @@ |
| 667 | 667 | // a child of a struct), then something weird is |
| 668 | 668 | // happening, so ignore this element and its children. |
| 669 | 669 | |
| 670 | | - wfDebugLog( 'XMP', "Encoutered <$ns:$tag> outside" |
| | 670 | + wfDebugLog( 'XMP', "Encountered <$ns:$tag> outside" |
| 671 | 671 | . " of its expected parent. Ignoring." ); |
| 672 | 672 | |
| 673 | 673 | array_unshift( $this->mode, self::MODE_IGNORE ); |
| — | — | @@ -809,7 +809,7 @@ |
| 810 | 810 | // |
| 811 | 811 | // also it seems as if exiv2 and exiftool do not support |
| 812 | 812 | // this either (That or I misunderstand the standard) |
| 813 | | - wfDebugLog( 'XMP', __METHOD__ . ' Encoutered <rdf:type> which isn\'t currently supported' ); |
| | 813 | + wfDebugLog( 'XMP', __METHOD__ . ' Encountered <rdf:type> which isn\'t currently supported' ); |
| 814 | 814 | } |
| 815 | 815 | |
| 816 | 816 | if ( strpos( $elm, ' ' ) === false ) { |
| — | — | @@ -880,14 +880,14 @@ |
| 881 | 881 | && $val === 'Resource' |
| 882 | 882 | && $this->mode[0] === self::MODE_SIMPLE ) |
| 883 | 883 | { |
| 884 | | - // this is equivelent to having an inner rdf:Description |
| | 884 | + // this is equivalent to having an inner rdf:Description |
| 885 | 885 | $this->mode[0] = self::MODE_QDESC; |
| 886 | 886 | } |
| 887 | 887 | |
| 888 | 888 | if ( strpos( $name, ' ' ) === false ) { |
| 889 | 889 | // This shouldn't happen, but so far some old software forgets namespace |
| 890 | 890 | // on rdf:about. |
| 891 | | - wfDebugLog( 'XMP', __METHOD__ . ' Encoutered non-namespaced attribute: ' |
| | 891 | + wfDebugLog( 'XMP', __METHOD__ . ' Encountered non-namespaced attribute: ' |
| 892 | 892 | . " $name=\"$val\". Skipping. " ); |
| 893 | 893 | continue; |
| 894 | 894 | } |
| — | — | @@ -928,8 +928,8 @@ |
| 929 | 929 | |
| 930 | 930 | if ( is_callable( $validate ) ) { |
| 931 | 931 | call_user_func_array( $validate, array( $info, &$val, true ) ); |
| 932 | | - // the resoning behind using &$val instead of using the return value |
| 933 | | - // is to be consistant between here and validating structures. |
| | 932 | + // the reasoning behind using &$val instead of using the return value |
| | 933 | + // is to be consistent between here and validating structures. |
| 934 | 934 | if ( is_null( $val ) ) { |
| 935 | 935 | wfDebugLog( 'XMP', __METHOD__ . " <$ns:$tag> failed validation." ); |
| 936 | 936 | return; |
| Index: branches/img_metadata/phase3/includes/media/BitmapMetadataHandler.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | 20 => Array( 'other' ), |
| 17 | 17 | 40 => Array( 'native' ), |
| 18 | 18 | 60 => Array( 'iptc-good-hash', 'iptc-no-hash' ), |
| 19 | | - 70 => Array( 'xmp-deprected' ), |
| | 19 | + 70 => Array( 'xmp-deprecated' ), |
| 20 | 20 | 80 => Array( 'xmp-general' ), |
| 21 | 21 | 90 => Array( 'xmp-exif' ), |
| 22 | 22 | 100 => Array( 'iptc-bad-hash' ), |
| Index: branches/img_metadata/phase3/includes/media/Bitmap.php |
| — | — | @@ -350,7 +350,7 @@ |
| 351 | 351 | * all that similar and usually have different |
| 352 | 352 | * metadata needs. |
| 353 | 353 | * |
| 354 | | - * @deprected |
| | 354 | + * @deprecated |
| 355 | 355 | */ |
| 356 | 356 | function getMetadata( $image, $filename ) { |
| 357 | 357 | wfDeprected( __METHOD__ ); |
| Index: branches/img_metadata/phase3/includes/media/XMPValidate.php |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | * This contains some static methods for |
| 5 | 5 | * validating XMP properties. See XMPInfo and XMPReader classes. |
| 6 | 6 | * |
| 7 | | -* Each of these functions take the stame parameters |
| | 7 | +* Each of these functions take the same parameters |
| 8 | 8 | * * an info array which is a subset of the XMPInfo::items array |
| 9 | 9 | * * A value (passed as reference) to validate. This can be either a |
| 10 | 10 | * simple value or an array |
| — | — | @@ -159,7 +159,7 @@ |
| 160 | 160 | && isset( $val['RedEyeMode'] ) |
| 161 | 161 | && isset( $val['Return'] ) |
| 162 | 162 | ) ) { |
| 163 | | - wfDebugLog( 'XMP', __METHOD__ . " Flash structure did not have all the required compoenents" ); |
| | 163 | + wfDebugLog( 'XMP', __METHOD__ . " Flash structure did not have all the required components" ); |
| 164 | 164 | $val = null; |
| 165 | 165 | } else { |
| 166 | 166 | $val = ( "\0" | ( $val['Fired'] === 'True' ) |
| — | — | @@ -215,7 +215,7 @@ |
| 216 | 216 | $val = null; |
| 217 | 217 | } else { |
| 218 | 218 | /* |
| 219 | | - * $res is formated as follows: |
| | 219 | + * $res is formatted as follows: |
| 220 | 220 | * 0 -> full date. |
| 221 | 221 | * 1 -> year, 2-> month, 3-> day, 4-> hour, 5-> minute, 6->second |
| 222 | 222 | * 7-> Timezone specifier (Z or something like +12:30 ) |
| — | — | @@ -231,7 +231,7 @@ |
| 232 | 232 | return; |
| 233 | 233 | } |
| 234 | 234 | //if hour is set, so is minute or regex above will fail. |
| 235 | | - //Extra check for empty string neccesary due to TZ but no second case. |
| | 235 | + //Extra check for empty string necessary due to TZ but no second case. |
| 236 | 236 | $res[6] = isset( $res[6] ) && $res[6] != '' ? $res[6] : '00'; |
| 237 | 237 | |
| 238 | 238 | if ( !isset( $res[7] ) || $res[7] === 'Z' || $res[1] >= '2038' || $res[1] < '1902' ) { |
| Index: branches/img_metadata/phase3/includes/media/XMPInfo.php |
| — | — | @@ -25,11 +25,11 @@ |
| 26 | 26 | * tag, including: |
| 27 | 27 | * * map_group - what group (used for precedence during conflicts) |
| 28 | 28 | * * mode - What type of item (self::MODE_SIMPLE usually, see above for all values) |
| 29 | | - * * validate - method to validate input. Could also post-process the input. A string value is assumed to be a static mthod of XMPValidate. Can also take a array( 'className', 'methodName' ). |
| | 29 | + * * validate - method to validate input. Could also post-process the input. A string value is assumed to be a static method of XMPValidate. Can also take a array( 'className', 'methodName' ). |
| 30 | 30 | * * choices - array of potential values (format of 'value' => true ). Only used with validateClosed |
| 31 | 31 | * * rangeLow and rangeHigh - alternative to choices for numeric ranges. Again for validateClosed only. |
| 32 | 32 | * * children - for MODE_STRUCT items, allowed children. |
| 33 | | - * * structPart - Indicates that this element can only appear as a memeber of a structure. |
| | 33 | + * * structPart - Indicates that this element can only appear as a member of a structure. |
| 34 | 34 | * |
| 35 | 35 | * currently this just has a bunch of exif values as this class is only half-done |
| 36 | 36 | */ |
| — | — | @@ -616,7 +616,7 @@ |
| 617 | 617 | ), |
| 618 | 618 | 'creator' => array( |
| 619 | 619 | 'map_group' => 'general', |
| 620 | | - 'map_name' => 'Artist', //map with exif Artist, iptc bylin (2:80) |
| | 620 | + 'map_name' => 'Artist', //map with exif Artist, iptc byline (2:80) |
| 621 | 621 | 'mode' => XMPReader::MODE_SEQ, |
| 622 | 622 | ), |
| 623 | 623 | 'date' => array( |
| — | — | @@ -630,7 +630,7 @@ |
| 631 | 631 | ), |
| 632 | 632 | /* Do not extract dc:format, as we've got better ways to determine mimetype */ |
| 633 | 633 | 'identifier' => array( |
| 634 | | - 'map_group' => 'deprected', |
| | 634 | + 'map_group' => 'deprecated', |
| 635 | 635 | 'map_name' => 'Identifier', |
| 636 | 636 | 'mode' => XMPReader::MODE_SIMPLE, |
| 637 | 637 | ), |
| — | — | @@ -705,7 +705,7 @@ |
| 706 | 706 | 'MetadataDate' => array( |
| 707 | 707 | 'map_group' => 'general', |
| 708 | 708 | 'mode' => XMPReader::MODE_SIMPLE, |
| 709 | | - // map_name to be consistant with other date names. |
| | 709 | + // map_name to be consistent with other date names. |
| 710 | 710 | 'map_name' => 'DateTimeMetadata', |
| 711 | 711 | 'validate' => 'validateDate', |
| 712 | 712 | ), |
| — | — | @@ -791,29 +791,29 @@ |
| 792 | 792 | ), |
| 793 | 793 | ), |
| 794 | 794 | /* Note, in iptc schemas, the legacy properties are denoted |
| 795 | | - * as deprected, since other properties should used instead, |
| 796 | | - * and properties marked as deprected in the standard are |
| | 795 | + * as deprecated, since other properties should used instead, |
| | 796 | + * and properties marked as deprecated in the standard are |
| 797 | 797 | * are marked as general here as they don't have replacements |
| 798 | 798 | */ |
| 799 | 799 | 'http://ns.adobe.com/photoshop/1.0/' => array( |
| 800 | 800 | 'City' => array( |
| 801 | | - 'map_group' => 'deprected', |
| | 801 | + 'map_group' => 'deprecated', |
| 802 | 802 | 'mode' => XMPReader::MODE_SIMPLE, |
| 803 | 803 | 'map_name' => 'CityDest', |
| 804 | 804 | ), |
| 805 | 805 | 'Country' => array( |
| 806 | | - 'map_group' => 'deprected', |
| | 806 | + 'map_group' => 'deprecated', |
| 807 | 807 | 'mode' => XMPReader::MODE_SIMPLE, |
| 808 | 808 | 'map_name' => 'CountryDest', |
| 809 | 809 | ), |
| 810 | 810 | 'State' => array( |
| 811 | | - 'map_group' => 'deprected', |
| | 811 | + 'map_group' => 'deprecated', |
| 812 | 812 | 'mode' => XMPReader::MODE_SIMPLE, |
| 813 | 813 | 'map_name' => 'ProvinceOrStateDest', |
| 814 | 814 | ), |
| 815 | 815 | 'DateCreated' => array( |
| 816 | | - 'map_group' => 'deprected', |
| 817 | | - // marking as deprected as the xmp prop prefered |
| | 816 | + 'map_group' => 'deprecated', |
| | 817 | + // marking as deprecated as the xmp prop preferred |
| 818 | 818 | 'mode' => XMPReader::MODE_SIMPLE, |
| 819 | 819 | 'map_name' => 'DateTimeOriginal', |
| 820 | 820 | 'validate' => 'validateDate', |
| — | — | @@ -855,7 +855,7 @@ |
| 856 | 856 | 'mode' => XMPReader::MODE_SIMPLE, |
| 857 | 857 | ), |
| 858 | 858 | 'Category' => array( |
| 859 | | - // Note, this prop is deprected, but in general |
| | 859 | + // Note, this prop is deprecated, but in general |
| 860 | 860 | // group since it doesn't have a replacement. |
| 861 | 861 | 'map_group' => 'general', |
| 862 | 862 | 'mode' => XMPReader::MODE_SIMPLE, |
| — | — | @@ -869,7 +869,7 @@ |
| 870 | 870 | ), |
| 871 | 871 | 'http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/' => array( |
| 872 | 872 | 'CountryCode' => array( |
| 873 | | - 'map_group' => 'deprected', |
| | 873 | + 'map_group' => 'deprecated', |
| 874 | 874 | 'mode' => XMPReader::MODE_SIMPLE, |
| 875 | 875 | 'map_name' => 'CountryDestCode', |
| 876 | 876 | ), |
| — | — | @@ -880,7 +880,7 @@ |
| 881 | 881 | /* Note: Scene not done. */ |
| 882 | 882 | /* Note: SubjectCode (iim 2:12) not done. */ |
| 883 | 883 | 'Location' => array( |
| 884 | | - 'map_group' => 'deprected', |
| | 884 | + 'map_group' => 'deprecated', |
| 885 | 885 | 'mode' => XMPReader::MODE_SIMPLE, |
| 886 | 886 | 'map_name' => 'SublocationDest', |
| 887 | 887 | ), |
| — | — | @@ -920,7 +920,7 @@ |
| 921 | 921 | 'mode' => XMPReader::MODE_SIMPLE, |
| 922 | 922 | 'structPart'=> true, |
| 923 | 923 | ), |
| 924 | | - 'CiEmailWork' => array( /* email (possibly seperated by ',') */ |
| | 924 | + 'CiEmailWork' => array( /* email (possibly separated by ',') */ |
| 925 | 925 | 'map_group' => 'general', |
| 926 | 926 | 'mode' => XMPReader::MODE_SIMPLE, |
| 927 | 927 | 'structPart'=> true, |
| — | — | @@ -940,7 +940,7 @@ |
| 941 | 941 | 'mode' => XMPReader::MODE_SIMPLE, |
| 942 | 942 | 'structPart'=> true, |
| 943 | 943 | ), |
| 944 | | - 'CiUrlWork' => array( /* url. Multiple may be seperated by comma. */ |
| | 944 | + 'CiUrlWork' => array( /* url. Multiple may be separated by comma. */ |
| 945 | 945 | 'map_group' => 'general', |
| 946 | 946 | 'mode' => XMPReader::MODE_SIMPLE, |
| 947 | 947 | 'structPart'=> true, |
| Index: branches/img_metadata/phase3/includes/media/JpegMetadataExtractor.php |
| — | — | @@ -11,7 +11,7 @@ |
| 12 | 12 | // A jpeg file should never even remotely have |
| 13 | 13 | // that many segments. Your average file has about 10. |
| 14 | 14 | |
| 15 | | - /** Function to extract metadata segmants of interest from jpeg files |
| | 15 | + /** Function to extract metadata segments of interest from jpeg files |
| 16 | 16 | * based on GIFMetadataExtractor. |
| 17 | 17 | * |
| 18 | 18 | * we can almost use getimagesize to do this |
| — | — | @@ -142,7 +142,7 @@ |
| 143 | 143 | |
| 144 | 144 | if ( substr( $app13, $offset, 4 ) !== '8BIM' ) { |
| 145 | 145 | // its supposed to be 8BIM |
| 146 | | - // but apperently sometimes isn't esp. in |
| | 146 | + // but apparently sometimes isn't esp. in |
| 147 | 147 | // really old jpg's |
| 148 | 148 | $valid = false; |
| 149 | 149 | } |