Changeset 4705 for extensions/AMetaData/JpegMetaData/Common/MakerNotesSignatures.class.php

Timestamp:

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

Author:

grum

Message:

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

File:

• extensions/AMetaData/JpegMetaData/Common/MakerNotesSignatures.class.php (modified) (5 diffs)

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);
+    }
+
   }