Changeset 7399 for extensions/AMetaData/JpegMetaData/Readers/CanonReader.class.php

Timestamp:

Oct 26, 2010, 10:48:08 AM (14 years ago)

Author:

grum

Message:

Fix many bugs
bug:1894, bug:1898, bug:1911, bug:1863, bug:1955, bug:1956, bug:1925

File:

• extensions/AMetaData/JpegMetaData/Readers/CanonReader.class.php (modified) (2 diffs)

extensions/AMetaData/JpegMetaData/Readers/CanonReader.class.php

@@ -141 +141 @@
            * null terminated strings
            */
+          print_r($values);
           $returned=ConvertData::toStrings($values);
           break;
@@ -233 +234 @@
                   {
                     $focalUnit=(array_key_exists(25, $values))?$values[25]:1;
-                    $FocalShort=(array_key_exists(24, $values))?$values[24]/$focalUnit:0;
-                    $FocalLong=(array_key_exists(23, $values))?$values[23]/$focalUnit:0;
+                    $FocalShort=(array_key_exists(24, $values) && ($focalUnit!=0))?$values[24]/$focalUnit:0;
+                    $FocalLong=(array_key_exists(23, $values) && ($focalUnit!=0))?$values[23]/$focalUnit:0;
                     $focal=(($FocalShort==$FocalLong or $FocalLong==0)?$FocalShort:$FocalShort."-".$FocalLong)."mm";