Changeset 17554 for extensions/AMetaData/JpegMetaData/Readers

Timestamp:

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

Author:

grum

Message:

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

Location:

extensions/AMetaData/JpegMetaData/Readers

Files:

• CanonReader.class.php (modified) (2 diffs)
• GpsReader.class.php (modified) (3 diffs)
• NikonReader.class.php (modified) (1 diff)
• XmpReader.class.php (modified) (6 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;

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

@@ -78 +78 @@
       {
         case 0x0000: // Version
-          $returned=sprintf("%d.%d.%d.%d", $values[0], $values[1], $values[2], $values[3]);
+          if(isset($values[0]) and isset($values[1]) and isset($values[2]) and isset($values[3]))
+          {
+            $returned=sprintf("%d.%d.%d.%d", $values[0], $values[1], $values[2], $values[3]);
+          }
+          else
+          {
+            $returned='unknown';
+          }
+
           break;
         case 0x0001: // GPSLatitudeRef
@@ -102 +110 @@
            * converted in degrees, minutes and seconds
            */
-          $returned=ConvertData::toDMS($values[0], $values[1], $values[2]);
+          if(isset($values[0]) and isset($values[1]) and isset($values[2]))
+          {
+            $returned=ConvertData::toDMS($values[0], $values[1], $values[2]);
+          }
+          else
+          {
+            $returned="";
+          }
           break;
         case 0x0006: // GPSAltitude
@@ -110 +125 @@
         case 0x0018: // GPSDestBearing
         case 0x001A: // GPSDestDistance
-          if($values[1]==0) $values[1]=1;
-          $returned=round($values[0]/$values[1],2);
+          if(isset($values[0]) and isset($values[1]))
+          {
+            if($values[1]==0) $values[1]=1;
+            $returned=round($values[0]/$values[1],2);
+          }
+          else
+          {
+            $returned=0;
+          }
           break;
         case 0x0008: // GPSSatellites

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

@@ -491 +491 @@
      * Nikon encrypt some data
      * This function is used to decrypt them. Don't ask anything about "how does
-     * it work" abd "what's it doing", I just translated the C++ & Perl code
+     * it work" and "what's it doing", I just translated the C++ & Perl code
      * from Exiv2, Exiftool & Raw Photo Parser (Copyright 2004-2006 Dave Coffin)
      *

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

@@ -247 +247 @@
               break;
           }
+
+          $types=array('simple', 'seq', 'bag', 'alt');
+          $tagProperties=$this->tagDef->getTagById($node->getName());
+
           if($type=="seq" or $type=="bag" or $type=="alt")
           {
+            if($type!=$types[$tagProperties['type']])
+              $type=$types[$tagProperties['type']]; // if container type is not accorded with XMP schema, force it to right value
+
             $value=Array('type' => $type, 'values' => Array());
             $childNode=$child->getFirstChild();
@@ -270 +277 @@
                 else
                 {
+                  $childNode->delAttributes(); // remove all attributes => only 'alt' type can have attributes
                   $value['values'][]=$childNode->getValue();
                 }
@@ -454 +462 @@
         case "Iptc4xmpCore:IntellectualGenre":
           $returned=explode(":", $value);
+          if(!is_array($returned)) $returned=array($returned); // force the value to be an array
           break;
         case "exif:GPSLatitude":
@@ -460 +469 @@
         case "exif:GPSDestLongitude":
           $returned=Array('coord' => "", 'card'=>"");
+
           preg_match_all('/(\d{1,3}),(\d{1,2})(?:\.(\d*)){0,1}(N|S|E|W)/', $value, $result);
-          $returned['coord']=$result[1][0]."° ".$result[2][0]."' ";
-          if(trim($result[3][0])!="")
-          {
-            $returned['coord'].= round(("0.".$result[3][0])*60,2)."\"";
-          }
-          switch($result[4][0])
-          {
-            case "N":
-              $returned['card']="North";
-              break;
-            case "S":
-              $returned['card']="South";
-              break;
-            case "E":
-              $returned['card']="East";
-              break;
-            case "W":
-              $returned['card']="West";
-              break;
-          }
+          if(is_array($result) and
+             isset($result[1]) and
+             isset($result[2]) and
+             isset($result[3]) and
+             isset($result[4]) and
+             isset($result[1][0]) and
+             isset($result[2][0]) and
+             isset($result[3][0]) and
+             isset($result[4][0]))
+          {
+            $returned['coord']=$result[1][0]."° ".$result[2][0]."' ";
+            if(trim($result[3][0])!="")
+            {
+              $returned['coord'].= round(("0.".$result[3][0])*60,2)."\"";
+            }
+            switch($result[4][0])
+            {
+              case "N":
+                $returned['card']="North";
+                break;
+              case "S":
+                $returned['card']="South";
+                break;
+              case "E":
+                $returned['card']="East";
+                break;
+              case "W":
+                $returned['card']="West";
+                break;
+            }
+          }
+
           $type=ByteType::UNDEFINED;
           break;
@@ -617 +639 @@
         case "exif:GPSAltitudeRef":
         case "exif:GPSDifferential":
-          $returned=(int)$xmpValue;
+          if(is_int($xmpValue))
+          {
+            $returned=(int)$xmpValue;
+          }
+          else
+          {
+            $returned=0;
+          }
           $type=ByteType::ULONG;
           break;
@@ -666 +695 @@
         case "exif:GPSDestDistance":
           $computed=explode("/", $xmpValue);
-          $returned=Array((int)$computed[0], (int)$computed[1]);
+          if(is_array($computed) and is_int($computed[0]) and is_int($computed[1]))
+          {
+            $returned=Array((int)$computed[0], (int)$computed[1]);
+          }
+          else
+          {
+            $returned=array(0,1);
+          }
           $type=ByteType::URATIONAL;
           unset($computed);