Changeset 6722 for extensions/AMetaData/JpegMetaData

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

Location:

extensions/AMetaData/JpegMetaData

Files:

• JpegMetaData.class.php (modified) (3 diffs)
• Readers/IfdReader.class.php (modified) (2 diffs)
• test/07.jpg (modified) (previous)

extensions/AMetaData/JpegMetaData/JpegMetaData.class.php

@@ -3 +3 @@
  * --:: JPEG MetaDatas ::-------------------------------------------------------
  *
- * Version : 1.0.0
- * Date    : 2009/12/26
+ * Version : 1.0.1
+ * Date    : 2010-07-24
  *
  *  Author    : Grum
@@ -39 +39 @@
  * | 0.1.0a  | 2009-12-26 |
  * |         |            |
- * |         |            |
- * |         |            |
+ * | 1.0.0   |            | * first public release
+ * |         |            |
+ * | 1.0.1   | 2010-07-24 | * mantis bug:1686
+ * |         |            |   . bug reported on IfdReader
+ * |         |            |     When sub IFD (0x8769) refers to a sub IFD with
+ * |         |            |     an offset lower than the current IFD, the reader
+ * |         |            |     loops on the current data block and terminate
+ * |         |            |     with an error 500 ; fix consist to ignore this
+ * |         |            |     kind of offset, but it's not the right solution
+ * |         |            |     (right solution: to be able to read negative
+ * |         |            |     offset)
+ * |         |            | * mantis feature : 1719
+ * |         |            |   . Coding a DateTime class ; used only if there is
+ * |         |            |     no PHP built-in DateTime class
  * |         |            |
  * |         |            |
@@ -112 +124 @@
   define("JPEG_METADATA_DIR", dirname(__FILE__)."/");
 
+  require_once(JPEG_METADATA_DIR."Common/DateTime.class.php");
   require_once(JPEG_METADATA_DIR."Readers/JpegReader.class.php");
   require_once(JPEG_METADATA_DIR."TagDefinitions/MagicTags.class.php");

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