Changeset 4904 for extensions/AMetaData/JpegMetaData/JpegMetaData.class.php

Timestamp:

Feb 17, 2010, 10:39:53 PM (14 years ago)

Author:

grum

Message:

Optimize some memory leak and some bugged lines of code

File:

• extensions/AMetaData/JpegMetaData/JpegMetaData.class.php (modified) (6 diffs)

extensions/AMetaData/JpegMetaData/JpegMetaData.class.php

@@ -168 +168 @@
      *
      * @Param Array $options  (optional)
-     * @return Array(keyName => Array('implemented' => Boolean, 'name' => String))
+     * @return Array(keyName => Array(
+     *                            'implemented' => Boolean,
+     *                            'translatable' => Boolean,
+     *                            'name' => String))
      */
     static public function getTagList($options=Array())
@@ -230 +233 @@
             break;
           case MAKER_PENTAX:
+            include_once(JPEG_METADATA_DIR."TagDefinitions/PentaxTags.class.php");
             $tmp=new PentaxTags();
             $schema="exif.".MAKER_PENTAX;
@@ -260 +264 @@
               $returned[$keyName]=Array(
                 'implemented' => $tag['implemented'],
+                'translatable' => $tag['translatable'],
                 'name' => $name
               );
@@ -345 +350 @@
     public function load($file, $options = Array())
     {
+      $this->unsetAll();
+
       $this->initializeOptions($options);
-
-      $this->unsetAll();
       $this->tags = Array();
       $this->jpeg = new JpegReader($file);
@@ -530 +535 @@
       unset($this->tags);
       unset($this->jpeg);
+      unset($this->options);
     }
 
@@ -536 +542 @@
 
 ?>
-