Changeset 4998 for extensions/AMetaData/JpegMetaData/TagDefinitions

Timestamp:

Feb 28, 2010, 6:15:11 PM (15 years ago)

Author:

grum

Message:

Small bugs fixed + implementation of "Magic" metadata

Location:

extensions/AMetaData/JpegMetaData/TagDefinitions

Files:

• IfdTags.class.php (modified) (3 diffs)
• MagicTags.class.php (added)
• XmpTags.class.php (modified) (3 diffs)

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

@@ -977 +977 @@
       // flash, tag 0x9209, see EXIF 2.2 documentation
       0x9209 => Array(
-        'tagName'     => "flash",
+        'tagName'     => "Flash",
         'schema'      => "exif",
         'translatable'=> true,
@@ -990 +990 @@
                 ),
         'tagValues.specialValues' => Array(
-          0x0000 => Array( // b00000001
+          0x0001 => Array( // b00000001 => 'fired'
                   0x00 => "flash did not fire",
                   0x01 => "flash fired"
                 ),
-          0x0006 => Array( // b00000110
+          0x0006 => Array( // b00000110 => 'return'
                   0x00 => "no strobe",                        // 00
                   0x01 => "reserved",                         // 01
@@ -1000 +1000 @@
                   0x03 => "strobe return light detected"      // 11
                 ),
-          0x0018 => Array( // b00011000
+          0x0018 => Array( // b00011000 => 'mode'
                   0x00 => "unknown",
                   0x01 => "compulsory flash firing",
-                  0x10 => "compulsory flash suppression",
-                  0x11 => "auto mode"
+                  0x02 => "compulsory flash suppression",
+                  0x03 => "auto mode"
                 ),
-          0x0020 => Array( // b00100000
+          0x0020 => Array( // b00100000 => 'function'
                   0x00 => "flash function present",
                   0x01 => "no flash function"
                 ),
-          0x0040 => Array( // b01000000
+          0x0040 => Array( // b01000000 => 'red-eye'
                   0x00 => "no red-eye reduction mode or unknown",
                   0x01 => "red-eye reduction supported"

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

@@ -48 +48 @@
   class XmpTags extends KnownTags
   {
+    /**
+     * this function extract from an Xmp Alt structure, the value in the given
+     * lang
+     *
+     * @param Array $tagValues :
+     * @param String $lang : the needed lang
+     * @return String : the value in the specified lang, or in the default lang
+     *                  if there is no specific value for the specified lang
+     */
+    static public function getAltValue($tagValues, $lang="x-default")
+    {
+      /*
+       * test if the $tagValues is valid, otherwise return the $tagValues as
+       * result
+       */
+      if(!is_array($tagValues)) return($tagValues);
+      if(!array_key_exists("type", $tagValues) or
+         !array_key_exists("values", $tagValues) )
+         return($tagValues);
+      if($tagValues['type']!="alt") return($tagValues);
+
+      $returned="";
+      foreach($tagValues['values'] as $key => $val)
+      {
+        if($val['type']['value']==$lang or
+           XmpTags::lang($val['type']['value'])==$lang or
+           $val['type']['value']=="x-default")
+          $returned=$val['value'];
+      }
+      return($returned);
+    }
+
+    /**
+     * this function tries to format the lang Id
+     * something like "fr-fr" is returned as "fr_FR"
+     */
+    static private function lang($lang)
+    {
+      $result=preg_match("/([a-z]*)([-|_])([a-z]*)/i", $lang, $arr);
+      return($arr[1]."_".strtoupper($arr[3]));
+    }
+
     const TYPE_SIMPLE = 0x00;
     const TYPE_SEQ = 0x01;
@@ -1308 +1350 @@
 /*
  * The Flash is a sequence of Flash structure
- * Not yet implemented
+ * Don't use the exif:Flash, but the associated tags :
+ *  exif:Fired, exif:Return, exif:Mode, exif:Function, exif:RedEyeMode
  */
       'exif:Flash' => Array(
@@ -1317 +1360 @@
         'schema'       => "exif",
       ),
+
+      'exif:Fired' => Array(
+        'implemented'  => true,
+        'translatable' => true,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "exif",
+        'tagValues' => Array(
+            'False' => "flash did not fire",
+            'True'  => "flash fired"
+        ),
+      ),
+
+      'exif:Return' => Array(
+        'implemented'  => true,
+        'translatable' => true,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "exif",
+        'tagValues' => Array(
+            0x00 => "no strobe",
+            0x01 => "reserved",
+            0x02 => "strobe return light not detected",
+            0x03 => "strobe return light detected"
+        ),
+      ),
+
+      'exif:Mode' => Array(
+        'implemented'  => true,
+        'translatable' => true,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "exif",
+        'tagValues' => Array(
+            0x00 => "unknown",
+            0x01 => "compulsory flash firing",
+            0x02 => "compulsory flash suppression",
+            0x03 => "auto mode"
+        ),
+      ),
+
+      'exif:Function' => Array(
+        'implemented'  => true,
+        'translatable' => true,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "exif",
+        'tagValues' => Array(
+            'False' => "flash function present",
+            'True'  => "no flash function"
+        ),
+      ),
+
+      'exif:RedEyeMode' => Array(
+        'implemented'  => true,
+        'translatable' => true,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "exif",
+        'tagValues' => Array(
+            'False' => "no red-eye reduction mode or unknown",
+            'True'  => "red-eye reduction supported"
+          ),
+      ),
+
       'exif:FocalLength' => Array(
         'exifTag'      => 0x920A,