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

Timestamp:

Aug 12, 2012, 11:22:20 PM (12 years ago)

Author:

grum

Message:

feature:2701
bug:2702
bug:2720
bug:2722

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;
@@ -151 +152 @@
         case 0x0010: // "CanonModelID"
           $tag=$this->tagDef->getTagById(0x0010);
-          $returned=$tag['tagValues.special'][sprintf("0x%08x", $values)];
+          if(isset($tag['tagValues.special'][sprintf("0x%08x", $values)]))
+          {
+            $returned=$tag['tagValues.special'][sprintf("0x%08x", $values)];
+          }
+          else
+          {
+            $returned=sprintf("unknown (0x%08x)", $values);
+          }
+
           unset($tag);
           break;
         case 0x0015: // "SerialNumberFormat"
           $tag=$this->tagDef->getTagById(0x0015);
-          $returned=$tag['tagValues.special'][sprintf("0x%08x", $values)];
+          if(isset($tag['tagValues.special'][sprintf("0x%08x", $values)]))
+          {
+            $returned=$tag['tagValues.special'][sprintf("0x%08x", $values)];
+          }
+          else
+          {
+            $returned=sprintf("unknown (0x%08x)", $values);
+          }
+
           unset($tag);
           break;