Changeset 4931 for extensions/AMetaData/JpegMetaData/TagDefinitions/XmpTags.class.php

Timestamp:

Feb 21, 2010, 8:41:06 PM (14 years ago)

Author:

grum

Message:

Implement Nikon camera's maker note ; add some Xmp tag ; fix some bugs

File:

• extensions/AMetaData/JpegMetaData/TagDefinitions/XmpTags.class.php (modified) (5 diffs)

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

@@ -190 +190 @@
       ),
 
+      // not present in specification, but found in some files
+      'dc:CreatorTool' => Array(
+        'implemented'  => true,
+        'translatable' => false,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "dc",
+      ),
+
+
+
       /*
        * XMP Basic schema
@@ -614 +624 @@
         ),
       ),
+      // not present in specification but found in some files
+      'photoshop:ICCProfile' => Array(
+        'implemented'  => true,
+        'translatable' => false,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "photoshop",
+      ),
+      'photoshop:ColorMode' => Array(
+        'implemented'  => false,
+        'translatable' => false,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "photoshop",
+      ),
 
 
@@ -892 +915 @@
         ),
       ),
+      // not present in specifications, but found in some files
+      'crs:WhiteBalance' => Array(
+        'implemented'  => true,
+        'translatable' => true,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "crs",
+        'tagValues'    => Array(
+           'As Shot'     => "As Shot",
+           'Auto'        => "Auto",
+           'Daylight'    => "Daylight",
+           'Cloudy'      => "Cloudy",
+           'Shade'       => "Shade",
+           'Tungsten'    => "Tungsten",
+           'Fluorescent' => "Fluorescent",
+           'Flash'       => "Flash",
+           'Custom'      => "Custom",
+        ),
+      ),
 
 
@@ -1386 +1427 @@
       ),
       'exif:Balance' => Array(
+        'exifTag'      => 0xA403,
+        'implemented'  => true,
+        'translatable' => false,
+        'type'         => self::TYPE_SIMPLE,
+        'schema'       => "exif",
+      ),
+      'exif:WhiteBalance' => Array(
         'exifTag'      => 0xA403,
         'implemented'  => true,
@@ -1841 +1889 @@
               $tmpTag=$tags->getTagById($val[$schema]);
             }
-            elseif($val[$schema]!=0xFFFF and $tags->tagIdExists($val[$schema]))
-            {
-              $tmpTag=$tags->getTagById($val[$schema]);
-            }
             else
             {