diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-07 05:11:09 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-07 05:11:09 -0700 |
| commit | 4a6775f5d34d1f26eac7e7c70e12c54cf2d330ec (patch) | |
| tree | da5285eb79ce80e2d134ec8f6a7f6cc9530656a5 /modules/exif/lib/makers/fujifilm.php | |
| parent | 097ef934c6fe188cc368905ee72b7cca6ad2f755 (diff) | |
| parent | 1d91e1b2dc8456681f9e38baaca1d191cff1ac7a (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/exif/lib/makers/fujifilm.php')
| -rw-r--r-- | modules/exif/lib/makers/fujifilm.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/modules/exif/lib/makers/fujifilm.php b/modules/exif/lib/makers/fujifilm.php index a88e51c3..a1f2f416 100644 --- a/modules/exif/lib/makers/fujifilm.php +++ b/modules/exif/lib/makers/fujifilm.php @@ -44,7 +44,6 @@ function lookup_Fujifilm_tag($tag) { case "1021": $tag = "FocusMode";break; case "1030": $tag = "SlowSync";break; case "1031": $tag = "PictureMode";break; - case "1032": $tag = "Unknown";break; case "1100": $tag = "ContinuousTakingBracket";break; case "1200": $tag = "Unknown";break; case "1300": $tag = "BlurWarning";break; @@ -66,22 +65,14 @@ function formatFujifilmData($type,$tag,$intel,$data) { } else if($type=="URATIONAL" || $type=="SRATIONAL") { - $data = bin2hex($data); - if($intel==1) $data = intel2Moto($data); - $top = hexdec(substr($data,8,8)); - $bottom = hexdec(substr($data,0,8)); - if($bottom!=0) $data=$top/$bottom; - else if($top==0) $data = 0; - else $data=$top."/".$bottom; + $data = unRational($data,$type,$intel); if($tag=="1011") { //FlashStrength $data=$data." EV"; } } else if($type=="USHORT" || $type=="SSHORT" || $type=="ULONG" || $type=="SLONG" || $type=="FLOAT" || $type=="DOUBLE") { - $data = bin2hex($data); - if($intel==1) $data = intel2Moto($data); - $data=hexdec($data); + $data =rational($data,$type,$intel); if($tag=="1001") { //Sharpness if($data == 1) $data = (string) t("Soft"); |