Changeset 5038 for extensions/AMetaData/JpegMetaData/Readers/IfdReader.class.php

Timestamp:

Mar 3, 2010, 9:55:15 PM (14 years ago)

Author:

grum

Message:

Manage multiple lenses for one Id for Pentax camera
Add some minors features

File:

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

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

@@ -71 +71 @@
 
   require_once(JPEG_METADATA_DIR."Common/Data.class.php");
+  require_once(JPEG_METADATA_DIR."Common/GlobalTags.class.php");
   require_once(JPEG_METADATA_DIR."Common/MakerNotesSignatures.class.php");
   require_once(JPEG_METADATA_DIR."Readers/GenericReader.class.php");
@@ -362 +363 @@
            */
           $returned=ConvertData::toStrings($values);
-          MakerNotesSignatures::setExifMaker($returned);
+          GlobalTags::setExifMaker($returned);
           break;
         case 0x011A: // XResolution, tag 0x011A
@@ -414 +415 @@
         case 0x829D: // FNumber, tag 0x829D
           if($values[1]==0) $values[1]=1;
-          $returned=ConvertData::toFNumber($values[0]/$values[1]);
+          $returned=ConvertData::toFNumber(GlobalTags::setExifAperture($values[0]/$values[1]));
           break;
         case 0x8769: // Exif IFD Pointer, tag 0x8769
@@ -480 +481 @@
           break;
         case 0x9202: // ApertureValue, tag0x9202
+          if($values[1]==0) $values[1]=1;
+          if(GlobalTags::getExifAperture()=="")
+          {
+            // set only if empty (if not empty, it means the value was already
+            // set with the FNumber tag)
+            GlobalTags::setExifAperture(pow(1.414213562, $values[0]/$values[1]));
+          }
+          //no break, $returned value is the same than the 0x9205 tag
         case 0x9205: // MaxApertureValue, tag0x9205
           if($values[1]==0) $values[1]=1;
@@ -517 +526 @@
         case 0x920A: // FocalLength, tag 0x920A
           if($values[1]==0) $values[1]=1;
-          $returned=ConvertData::toFocalLength($values[0]/$values[1]);
+          $returned=ConvertData::toFocalLength(GlobalTags::setExifFocal($values[0]/$values[1]));
           break;
         case 0x927c: // MakerNote, tag 0x927c
@@ -561 +570 @@
                * the camera model contains "Canon"
                */
-              if(preg_match("/.*canon.*/i",MakerNotesSignatures::getExifMaker()))
+              if(preg_match("/.*canon.*/i",GlobalTags::getExifMaker()))
               {
                 require_once(JPEG_METADATA_DIR."Readers/CanonReader.class.php");