Changeset 17554 for extensions/AMetaData/JpegMetaData/Readers/GpsReader.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/GpsReader.class.php (modified) (3 diffs)

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