diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-07-08 00:29:37 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-07-08 00:29:37 +0000 |
| commit | c83650d83ad8b1f4bda30cac2ae8efa6e1c97287 (patch) | |
| tree | 482cf980e87cd7c80c28a89bb9395eba6b53026f /modules/exif/lib/makers/olympus.php | |
| parent | a0b0b415515bff5f9edd43d373e8e78f3b3f8e4d (diff) | |
| parent | 9d66783f47636153bf3661d1d89e694dd5188c36 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/exif/lib/makers/olympus.php')
| -rw-r--r-- | modules/exif/lib/makers/olympus.php | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/modules/exif/lib/makers/olympus.php b/modules/exif/lib/makers/olympus.php index 17334bd8..3382fc79 100644 --- a/modules/exif/lib/makers/olympus.php +++ b/modules/exif/lib/makers/olympus.php @@ -57,24 +57,17 @@ function formatOlympusData($type,$tag,$intel,$data) { if($type=="ASCII") { } else if($type=="URATIONAL" || $type=="SRATIONAL") { - $data = bin2hex($data); + $data = unRational($data,$type,$intel); 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; if($tag=="0204") { //DigitalZoom $data=$data."x"; } if($tag=="0205") { //Unknown2 - $data=$top."/".$bottom; + } } 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=="0201") { //JPEGQuality if($data == 1) $data = "SQ"; |