Changeset 4705 for extensions/AMetaData/JpegMetaData

Timestamp:

Jan 19, 2010, 12:31:32 AM (14 years ago)

Author:

grum

Message:

Change Locale class by L10n class ; add Readers for Nikon and Canon cameras ; some bug corrected

Location:

extensions/AMetaData/JpegMetaData

Files:

• Common/Data.class.php (modified) (1 diff)
• Common/L10n.class.php (added)
• Common/Locale.class.php (deleted)
• Common/MakerNotesSignatures.class.php (modified) (5 diffs)
• Common/XmlData.class.php (modified) (4 diffs)
• Readers/CanonReader.class.php (added)
• Readers/GenericReader.class.php (modified) (1 diff)
• Readers/IfdReader.class.php (modified) (5 diffs)
• Readers/JpegReader.class.php (modified) (1 diff)
• Readers/NikonReader.class.php (added)
• Readers/SegmentReader.class.php (modified) (1 diff)
• Readers/TiffReader.class.php (modified) (1 diff)
• Readers/XmpReader.class.php (modified) (1 diff)
• TagDefinitions/CanonTags.class.php (added)
• TagDefinitions/NikonTags (added)
• TagDefinitions/NikonTags.class.php (added)
• TagDefinitions/XmpTags.class.php (modified) (1 diff)
• test/index.php (modified) (6 diffs)

extensions/AMetaData/JpegMetaData/Common/Data.class.php

@@ -97 +97 @@
     }
 
+    function __destruct()
+    {
+      unset($this->byteOrder);
+      unset($this->offset);
+      unset($this->length);
+      unset($this->startOffset);
+      unset($this->data);
+      unset($this->currentPos);
+    }
+
     /**
      * returns the datas length

extensions/AMetaData/JpegMetaData/Common/MakerNotesSignatures.class.php

@@ -35 +35 @@
  * Define the maker notes signatures for the EXIF "MakerNote" tag
  *
+ * This class provides theses public functions :
+ *  - (static) getMaker
+ *  - (static) setExifMaker
+ *  - (static) getExifMaker
+ *
  * -----------------------------------------------------------------------------
  */
 
   define("MAKER_PENTAX", "Pentax");
+  define("MAKER_NIKON", "Nikon");
+  define("MAKER_CANON", "Canon");
 
   Class MakerNotesSignatures
@@ -51 +58 @@
     const Nikon2Header = "Nikon\x00\x01\x00";
     /** Nikon 3 signature */
-    const Nikon3Header = "Nikon\x00\x02\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+    const Nikon3Header = "Nikon\x00\x02";
     /** Panasonic signature  */
     const PanasonicHeader = "Panasonic\x00\x00\x00";
@@ -74 +81 @@
     const FujiFilmHeaderSize  = 12;
     const Nikon2HeaderSize    = 8;
-    const Nikon3HeaderSize    = 18;
+    const Nikon3HeaderSize    = 7;
     const PanasonicHeaderSize = 12;
     const PentaxHeaderSize    = 6;
@@ -82 +89 @@
     const SonyHeaderSize      = 12;
     const CanonHeaderSize     = 0;
-    const UnknownHeaderSize     = 0;
+    const UnknownHeaderSize   = 0;
 
+    static private $exifMaker = "";
 
     static public function getMaker($datas)
@@ -111 +119 @@
       else
        { return(self::UnknownHeader); }
+    }
 
+    /**
+     * this function is used by IFD Reader to store all information about maker
+     * and camera model
+     *
+     * the stored value if used within a grep like "/canon/i" to determine the
+     * maker note.
+     * For more information about this tricks see the how the tag 0x927c is
+     * managed in the function "processSpecialTag" of the file
+     * IfdReader.class.php
+     *
+     * @param String $value : the maker or the camera model
+     */
+    static public function setExifMaker($value)
+    {
+      if(is_array($value))
+      {
+        foreach($value as $val)
+        {
+          self::$exifMaker.=$val." ";
+        }
+      }
+      else
+      {
+        self::$exifMaker.=$value." ";
+      }
+      return(self::$exifMaker);
     }
+
+    /**
+     * this function is used by IFD Reader to store all information about maker
+     * and camera model
+     *
+     * @return String
+     */
+    static public function getExifMaker()
+    {
+      return(self::$exifMaker);
+    }
+
   }
 

extensions/AMetaData/JpegMetaData/Common/XmlData.class.php

@@ -98 +98 @@
     }
 
+    /**
+     * free memory before destroying the object...
+     */
     function __destruct()
     {
+      $this->previousNode=null;
+      $this->nextNode=null;
+      unset($this->previousNode);
+      unset($this->nextNode);
       unset($this->attributes);
       unset($this->childs);
+      unset($this->value);
+      unset($this->name);
+      unset($this->level);
     }
 
@@ -369 +379 @@
     function __destruct()
     {
+      unset($this->xml);
+      unset($this->isValid);
+      unset($this->isLoaded);
       unset($this->nodes);
     }
@@ -464 +477 @@
       $result=xml_parse_into_struct($xmlParser, $this->xml, $values);
       xml_parser_free($xmlParser);
+      unset($xmlParser);
 
       //an error has occured while parsing the xml structure
@@ -517 +531 @@
         }
       }
+      unset($values);
       unset($tree);
       return(true);

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

@@ -70 +70 @@
     protected $nbEntries = 0;
     protected $entries = Array();
+    protected $headerSize = 0;
 
     protected $data = null;

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

@@ -106 +106 @@
       $this->dataOffset=$offset;
 
-      $this->skipHeader();
+      $this->skipHeader($this->headerSize);
 
       $dataPointer = $this->data->offset();
@@ -338 +338 @@
         case 0x010D: // DocumentName, tag 0x010D
         case 0x010E: // ImageDescription, tag 0x010E
-        case 0x010F: // Make, tag 0x010F
-        case 0x0110: // Model, tag 0x0110
         case 0x0131: // Software, tag 0x0131
         case 0x013B: // Artist, tag 0x013B
@@ -351 +349 @@
            */
           $returned=ConvertData::toStrings($values);
+          break;
+        case 0x010F: // Make, tag 0x010F
+        case 0x0110: // Model, tag 0x0110
+          /* Make and Model are null terminated strings
+           * memorize the maker & camera from the exif tag : it's used to
+           * recognize the Canon camera (no header in the maker note)
+           */
+          $returned=ConvertData::toStrings($values);
+          MakerNotesSignatures::setExifMaker($returned);
           break;
         case 0x011A: // XResolution, tag 0x011A
@@ -487 +494 @@
             case MakerNotesSignatures::OlympusHeader:
             case MakerNotesSignatures::Olympus2Header:
-              $returned="Olympus";
+              $returned="Olympus is not implemented yet";
               break;
             case MakerNotesSignatures::FujiFilmHeader:
-              $returned="FujiFilm";
+              $returned="FujiFilm is not implemented yet";
               break;
             case MakerNotesSignatures::Nikon2Header:
             case MakerNotesSignatures::Nikon3Header:
-              $returned="Nikon";
+              require_once(JPEG_METADATA_DIR."Readers/NikonReader.class.php");
+              $returned=new NikonReader($values, $valuesOffset, $this->byteOrder, $makerSignature);
               break;
             case MakerNotesSignatures::PanasonicHeader:
-              $returned="Panasonic";
+              $returned="Panasonic is not implemented yet";
               break;
             case MakerNotesSignatures::PentaxHeader:
@@ -506 +514 @@
             case MakerNotesSignatures::SigmaHeader:
             case MakerNotesSignatures::Sigma2Header:
-              $returned="Sigma";
+              $returned="Sigma is not implemented yet";
               break;
             case MakerNotesSignatures::SonyHeader:
-              $returned="Sony";
+              $returned="Sony is not implemented yet";
               break;
             default:
-              $returned="unknown maker => ".ConvertData::toHexDump($values, $type, 16);
+              /*
+               * Canon maker notes don't have any header
+               * So, the only method to know if the maker note is from a Canon
+               * camera is looking the exif maker value equals "Canon" or
+               * the camera model contains "Canon"
+               */
+              if(preg_match("/.*canon.*/i",MakerNotesSignatures::getExifMaker()))
+              {
+                require_once(JPEG_METADATA_DIR."Readers/CanonReader.class.php");
+                $returned=new CanonReader($values, $valuesOffset, $this->byteOrder, "");
+              }
+              else
+              {
+                $returned="unknown maker => ".ConvertData::toHexDump($values, $type, 16);
+              }
               break;
           }

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

@@ -111 +111 @@
     {
       unset($this->appMarkerSegmentReader);
+      unset($this->fileHandler);
     }
 

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

@@ -71 +71 @@
     }
 
+    function __destruct()
+    {
+      unset($this->data);
+      unset($this->isValid);
+      unset($this->isLoaded);
+    }
+
     /**
      * return true if the segment is valid

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

@@ -111 +111 @@
     function __destruct()
     {
+      parent::__destruct();
       unset($this->IFDs);
     }

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

@@ -97 +97 @@
     function __destruct()
     {
+      unset($this->xmlData);
       unset($this->xmpTag2Exif);
       parent::__destruct();

extensions/AMetaData/JpegMetaData/TagDefinitions/XmpTags.class.php

@@ -1871 +1871 @@
       unset($tmpTags[1]);
       unset($tmpTags[2]);
+      unset($tmpTags);
     }
 

extensions/AMetaData/JpegMetaData/test/index.php

@@ -47 +47 @@
   require_once(JPEG_METADATA_DIR."Readers/JpegReader.class.php");
   require_once(JPEG_METADATA_DIR."Common/XmlData.class.php");
-  require_once(JPEG_METADATA_DIR."Common/Locale.class.php");
+  require_once(JPEG_METADATA_DIR."Common/L10n.class.php");
 
   require_once(JPEG_METADATA_DIR."TagDefinitions/IfdTags.class.php");
@@ -335 +335 @@
   $page.="<span style='font-family:monospace;'>";
 
+  $time=microtime(true);
+
   $memory=memory_get_usage();
-  $time=microtime(true);
-
   $jpeg = new JpegReader($file);
   $time2=microtime(true);
+
 
   $page2="JpegReader extraction<br>";
@@ -419 +420 @@
 
     if(is_string($txt) and $val->isTranslatable())
-      $txt=Locale::get($txt);
+      $txt=L10n::get($txt);
     if($txt instanceof DateTime)
       $txt=$txt->format("Y-m-d H:i:s");
@@ -426 +427 @@
     if(is_array($value))
       $value=print_r($value, true);
-    $page2.="<tr><td>".$key."</td><td>".Locale::get($val->getName())."</td><td>".$value."</td><td style='$style'>".$txt."</td></tr>";
+    $page2.="<tr><td>".$key."</td><td>".L10n::get($val->getName())."</td><td>".$value."</td><td style='$style'>".$txt."</td></tr>";
     $i++;
   }
@@ -440 +441 @@
   {
     $val['implemented']?$i++:$j++;
-    $page2.="<tr><td>".$key."</td><td>".Locale::get($val['name'])."</td><td>".($val['implemented']?"yes":"no")."</td></tr>";
+    $page2.="<tr><td>".$key."</td><td>".L10n::get($val['name'])."</td><td>".($val['implemented']?"yes":"no")."</td></tr>";
   }
   $page2.="</table>Total tags ; implemented: $i - not implemented: $j</span><hr>";
@@ -455 +456 @@
 
   echo $page;
+  unset($page2);
+  unset($page);
 ?>