'SpatialFrequencyResponse' => MW_EXIF_UNDEFINED, # Spatial frequency response
'FocalPlaneXResolution' => MW_EXIF_RATIONAL, # Focal plane X resolution
'FocalPlaneYResolution' => MW_EXIF_RATIONAL, # Focal plane Y resolution
- 'FocalPlaneResolutionUnit' => MW_EXIF_SHORT, # Focal plane resolution unit
+ 'FocalPlaneResolutionUnit' => MW_EXIF_SHORT, # Focal plane resolution unit #p46
'SubjectLocation' => MW_EXIF_SHORT, # Subject location
'ExposureIndex' => MW_EXIF_RATIONAL, # Exposure index
'SensingMethod' => MW_EXIF_SHORT, # Sensing method #p46
* @return bool
*/
function isByte( $in ) {
- if ( sprintf('%d', $in) === $in && $in >= 0 && $in <= 255 ) {
+ if ( sprintf('%d', $in) == $in && $in >= 0 && $in <= 255 ) {
$this->debug( $in, __FUNCTION__, true );
return true;
} else {
}
function isShort( $in ) {
- if ( sprintf('%d', $in) === $in && $in >= 0 && $in <= 65536 ) {
+ if ( sprintf('%d', $in) == $in && $in >= 0 && $in <= 65536 ) {
$this->debug( $in, __FUNCTION__, true );
return true;
} else {
- $this->debug( $in, __FUNCTION__, true );
+ $this->debug( $in, __FUNCTION__, false );
return false;
}
}
function isLong( $in ) {
- if ( sprintf('%d', $in) === $in && $in >= 0 && $in <= 4294967296 ) {
+ if ( sprintf('%d', $in) == $in && $in >= 0 && $in <= 4294967296 ) {
$this->debug( $in, __FUNCTION__, true );
return true;
} else {
}
function isRational( $in ) {
- if ( preg_match( "/^(\d+)\/(\d+[1-9]|[1-9]\d*)$/", $in, $m ) ) { # Avoid division by zero
+ if ( @preg_match( "/^(\d+)\/(\d+[1-9]|[1-9]\d*)$/", $in, $m ) ) { # Avoid division by zero
return $this->isLong( $m[1] ) && $this->isLong( $m[2] );
} else {
$this->debug( $in, __FUNCTION__, 'fed a non-fraction value' );
}
function isUndefined( $in ) {
- $this->debug( $in, __FUNCTION__ );
if ( preg_match( "/^\d{4}$/", $in ) ) { // Allow ExifVersion and FlashpixVersion
+ $this->debug( $in, __FUNCTION__, true );
return true;
} else {
+ $this->debug( $in, __FUNCTION__, false );
return false;
}
}
* @return bool
*/
function validate( $tag, $val ) {
+ $debug = "tag is '$tag'";
// Fucks up if not typecast
switch( (string)$this->mFlatExifTags[$tag] ) {
case (string)MW_EXIF_BYTE:
+ $this->debug( $val, __FUNCTION__, $debug );
return $this->isByte( $val );
case (string)MW_EXIF_ASCII:
+ $this->debug( $val, __FUNCTION__, $debug );
return $this->isASCII( $val );
case (string)MW_EXIF_SHORT:
+ $this->debug( $val, __FUNCTION__, $debug );
return $this->isShort( $val );
case (string)MW_EXIF_LONG:
+ $this->debug( $val, __FUNCTION__, $debug );
return $this->isLong( $val );
case (string)MW_EXIF_RATIONAL:
+ $this->debug( $val, __FUNCTION__, $debug );
return $this->isRational( $val );
case (string)MW_EXIF_UNDEFINED:
+ $this->debug( $val, __FUNCTION__, $debug );
return $this->isUndefined( $val );
case (string)MW_EXIF_SLONG:
+ $this->debug( $val, __FUNCTION__, $debug );
return $this->isSlong( $val );
case (string)MW_EXIF_SRATIONAL:
+ $this->debug( $val, __FUNCTION__, $debug );
return $this->isSrational( $val );
case (string)MW_EXIF_SHORT.','.MW_EXIF_LONG:
+ $this->debug( $val, __FUNCTION__, $debug );
return $this->isShort( $val ) || $this->isLong( $val );
default:
$this->debug( $val, __FUNCTION__, "The tag '$tag' is unknown" );
* @access private
*/
var $mExif;
-
+
/**
* Constructor
*
$tags[$tag] = $val;
break;
}
+ break;
case 'PhotometricInterpretation':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'Orientation':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'PlanarConfiguration':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
// TODO: YCbCrSubSampling
// TODO: YCbCrPositioning
$tags[$tag] = $val;
break;
}
+ break;
// TODO: YCbCrCoefficients #p27 (see annex E)
case 'ExifVersion': case 'FlashpixVersion':
$tags[$tag] = $val;
break;
}
+ break;
case 'ComponentsConfiguration':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'DateTime':
case 'DateTimeOriginal':
$tags[$tag] = $val;
break;
}
+ break;
case 'MeteringMode':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'LightSource':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
// TODO: Flash
+ case 'FocalPlaneResolutionUnit':
+ switch( $val ) {
+ case 2:
+ $tags[$tag] = $this->msg( $tag, $val );
+ break;
+ default:
+ $tags[$tag] = $val;
+ break;
+ }
+ break;
+
case 'SensingMethod':
switch( $val ) {
case 1: case 2: case 3: case 4: case 5: case 7: case 8:
$tags[$tag] = $val;
break;
}
+ break;
case 'FileSource':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'SceneType':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'CustomRendered':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'ExposureMode':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'WhiteBalance':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'SceneCaptureType':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'GainControl':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'Contrast':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'Saturation':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'Sharpness':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'SubjectDistanceRange':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'GPSLatitudeRef':
case 'GPSDestLatitudeRef':
$tags[$tag] = $val;
break;
}
+ break;
case 'GPSLongitudeRef':
case 'GPSDestLongitudeRef':
$tags[$tag] = $val;
break;
}
+ break;
case 'GPSStatus':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'GPSMeasureMode':
switch( $val ) {
$tags[$tag] = $val;
break;
}
+ break;
case 'GPSSpeedRef':
case 'GPSDestDistanceRef':
$tags[$tag] = $val;
break;
}
+ break;
case 'GPSTrackRef':
case 'GPSImgDirectionRef':
$tags[$tag] = $val;
break;
}
+ break;
case 'GPSDateStamp':
$tags[$tag] = $wgLang->date( substr( $val, 0, 4 ) . substr( $val, 5, 2 ) . substr( $val, 8, 2 ) . '000000' );