Changeset 6722 for extensions/AMetaData/JpegMetaData/Readers/IfdReader.class.php

Timestamp:

Jul 28, 2010, 10:48:17 AM (14 years ago)

Author:

grum

Message:

bug:1686, feature:1718, feature:1719, feature:1688, feature:1692

• Picture analysis finish with an Error 500 or with a problem of memory limit
• Coding a DateTime class
• Make JpegMetadata class tests images lighter
• Improve performance when the database is filled
• Add possibility for user to build their own tags
• ajax management entirely rewritted

File:

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

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

@@ -107 +107 @@
       $this->dataOffset=$offset;
 
+
       $this->skipHeader($this->headerSize);
 
+
+
       $dataPointer = $this->data->offset();
+
       /*
        * number of entries is defined byte an UShort at the begining of the
@@ -422 +426 @@
            * the returned value is a parsed sub IFD
            */
-          $returned=new IfdReader($this->data->readASCII(-1,$values-$this->dataOffset), $values, $this->byteOrder);
+          if($values>$this->dataOffset)
+          {
+            $returned=new IfdReader($this->data->readASCII(-1,$values-$this->dataOffset), $values, $this->byteOrder);
+          }
+          else
+          {
+            /* ELSE implemented with the mantis bug:1686
+             * when the offset of a sub IFD tag is lower than the offset of the
+             * current IFD, ignore the sub IFD
+             *
+             * A method have to be coded to manage this kind of sub IFD
+             */
+            $returned="Feature not implemented: read negative offset";
+          }
           break;
         case 0x8825: // GPS IFD Pointer, tag 0x8825