}
$c = '';
- //charset info contained in tag 1:90.
+ // charset info contained in tag 1:90.
if ( isset( $parsed['1#090'] ) && isset( $parsed['1#090'][0] ) ) {
$c = self::getCharset( $parsed['1#090'][0] );
if ( $c === false ) {
- //Unknown charset. refuse to parse.
- //note: There is a different between
- //unknown and no charset specified.
+ // Unknown charset. refuse to parse.
+ // note: There is a different between
+ // unknown and no charset specified.
return array();
}
unset( $parsed['1#090'] );
$software = self::convIPTC( $val, $c );
if ( count( $software ) !== 1 ) {
- //according to iim standard this cannot have multiple values
- //so if there is more than one, something weird is happening,
- //and we skip it.
+ // according to iim standard this cannot have multiple values
+ // so if there is more than one, something weird is happening,
+ // and we skip it.
wfDebugLog( 'iptc', 'IPTC: Wrong count on 2:65 Software field' );
break;
}
if ( isset( $parsed['2#070'] ) ) {
- //if a version is set for the software.
+ // if a version is set for the software.
$softwareVersion = self::convIPTC( $parsed['2#070'], $c );
unset( $parsed['2#070'] );
$data['Software'] = array( array( $software[0], $softwareVersion[0] ) );
// according to spec.
// Should potentially store timezone as well.
case '2#055':
- //Date created (not date digitized).
- //Maps to exif DateTimeOriginal
+ // Date created (not date digitized).
+ // Maps to exif DateTimeOriginal
if ( isset( $parsed['2#060'] ) ) {
$time = $parsed['2#060'];
} else {
break;
case '2#062':
- //Date converted to digital representation.
- //Maps to exif DateTimeDigitized
+ // Date converted to digital representation.
+ // Maps to exif DateTimeDigitized
if ( isset( $parsed['2#063'] ) ) {
$time = $parsed['2#063'];
} else {
break;
case '2#030':
- //Date released.
+ // Date released.
if ( isset( $parsed['2#035'] ) ) {
$time = $parsed['2#035'];
} else {
break;
case '2#037':
- //Date expires.
+ // Date expires.
if ( isset( $parsed['2#038'] ) ) {
$time = $parsed['2#038'];
} else {
case '2#000': /* iim version */
// unlike other tags, this is a 2-byte binary number.
- //technically this is required if there is iptc data
- //but in practise it isn't always there.
+ // technically this is required if there is iptc data
+ // but in practise it isn't always there.
if ( strlen( $val[0] ) == 2 ) {
- //if is just to be paranoid.
+ // if is just to be paranoid.
$versionValue = ord( substr( $val[0], 0, 1 ) ) * 256;
$versionValue += ord( substr( $val[0], 1, 1 ) );
$data['iimVersion'] = $versionValue;
case '2#085':
case '2#038':
case '2#035':
- //ignore. Handled elsewhere.
+ // ignore. Handled elsewhere.
break;
default:
*/
private static function timeHelper( $date, $time, $c ) {
if ( count( $date ) === 1 ) {
- //the standard says this should always be 1
- //just double checking.
+ // the standard says this should always be 1
+ // just double checking.
list( $date ) = self::convIPTC( $date, $c );
} else {
return null;
list( $time ) = self::convIPTC( $time, $c );
$dateOnly = false;
} else {
- $time = '000000+0000'; //placeholder
+ $time = '000000+0000'; // placeholder
$dateOnly = true;
}
&& substr( $date, 4, 2 ) !== '00'
&& substr( $date, 6, 2 ) !== '00'
) ) {
- //something wrong.
+ // something wrong.
// Note, this rejects some valid dates according to iptc spec
// for example: the date 00000400 means the photo was taken in
// April, but the year and day is unknown. We don't process these
return null;
}
if ( $dateOnly ) {
- //return the date only
+ // return the date only
return substr( $finalTimestamp, 0, 10 );
} else {
return $finalTimestamp;
wfDebugLog( 'iptc', __METHOD__ . " Error converting iptc data charset $charset to utf-8" );
}
} else {
- //treat as utf-8 if is valid utf-8. otherwise pretend its windows-1252
+ // treat as utf-8 if is valid utf-8. otherwise pretend its windows-1252
// most of the time if there is no 1:90 tag, it is either ascii, latin1, or utf-8
$oldData = $data;
- UtfNormal\Validator::quickIsNFCVerify( $data ); //make $data valid utf-8
+ UtfNormal\Validator::quickIsNFCVerify( $data ); // make $data valid utf-8
if ( $data === $oldData ) {
- return $data; //if validation didn't change $data
+ return $data; // if validation didn't change $data
} else {
return self::convIPTCHelper( $oldData, 'Windows-1252' );
}
*/
static function getCharset( $tag ) {
- //According to iim standard, charset is defined by the tag 1:90.
- //in which there are iso 2022 escape sequences to specify the character set.
- //the iim standard seems to encourage that all necessary escape sequences are
- //in the 1:90 tag, but says it doesn't have to be.
+ // According to iim standard, charset is defined by the tag 1:90.
+ // in which there are iso 2022 escape sequences to specify the character set.
+ // the iim standard seems to encourage that all necessary escape sequences are
+ // in the 1:90 tag, but says it doesn't have to be.
- //This is in need of more testing probably. This is definitely not complete.
- //however reading the docs of some other iptc software, it appears that most iptc software
- //only recognizes utf-8. If 1:90 tag is not present content is
+ // This is in need of more testing probably. This is definitely not complete.
+ // however reading the docs of some other iptc software, it appears that most iptc software
+ // only recognizes utf-8. If 1:90 tag is not present content is
// usually ascii or iso-8859-1 (and sometimes utf-8), but no guarantee.
- //This also won't work if there are more than one escape sequence in the 1:90 tag
- //or if something is put in the G2, or G3 charsets, etc. It will only reliably recognize utf-8.
+ // This also won't work if there are more than one escape sequence in the 1:90 tag
+ // or if something is put in the G2, or G3 charsets, etc. It will only reliably recognize utf-8.
// This is just going through the charsets mentioned in appendix C of the iim standard.
// \x1b = ESC.
switch ( $tag ) {
- case "\x1b%G": //utf-8
- //Also call things that are compatible with utf-8, utf-8 (e.g. ascii)
+ case "\x1b%G": // utf-8
+ // Also call things that are compatible with utf-8, utf-8 (e.g. ascii)
case "\x1b(B": // ascii
case "\x1b(@": // iso-646-IRV (ascii in latest version, $ different in older version)
$c = 'UTF-8';
break;
- case "\x1b(A": //like ascii, but british.
+ case "\x1b(A": // like ascii, but british.
$c = 'ISO646-GB';
break;
- case "\x1b(C": //some obscure sweedish/finland encoding
+ case "\x1b(C": // some obscure sweedish/finland encoding
$c = 'ISO-IR-8-1';
break;
case "\x1b(D":
$c = 'ISO-IR-8-2';
break;
- case "\x1b(E": //some obscure danish/norway encoding
+ case "\x1b(E": // some obscure danish/norway encoding
$c = 'ISO-IR-9-1';
break;
case "\x1b(F":
case "\x1b(K":
$c = "ISO646-DE";
break;
- case "\x1b(N": //crylic
+ case "\x1b(N": // crylic
$c = "ISO_5427";
break;
- case "\x1b(`": //iso646-NO
+ case "\x1b(`": // iso646-NO
$c = "NS_4551-1";
break;
- case "\x1b(f": //iso646-FR
+ case "\x1b(f": // iso646-FR
$c = "NF_Z_62-010";
break;
case "\x1b(g":
- $c = "PT2"; //iso646-PT2
+ $c = "PT2"; // iso646-PT2
break;
case "\x1b(h":
$c = "ES2";
break;
- case "\x1b(i": //iso646-HU
+ case "\x1b(i": // iso646-HU
$c = "MSZ_7795.3";
break;
case "\x1b(w":
break;
default:
wfDebugLog( 'iptc', __METHOD__ . 'Unknown charset in iptc 1:90: ' . bin2hex( $tag ) );
- //at this point just give up and refuse to parse iptc?
+ // at this point just give up and refuse to parse iptc?
$c = false;
}
return $c;
dépôts / lhc / web / wiklou.git / blobdiff