Changeset 5038 for extensions/AMetaData/JpegMetaData/Readers/NikonReader.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/NikonReader.class.php (modified) (4 diffs)

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

@@ -347 +347 @@
           }
 
-          if(preg_match("/.*d70.*/i",MakerNotesSignatures::getExifMaker()))
+          if(preg_match("/.*d70.*/i",GlobalTags::getExifMaker()))
           {
             $bit5=1;
@@ -376 +376 @@
           break;
         case 0x0098: // "LensData"
-          if($this->shutterCount==-1 or $this->serialNumber=="")
+          if(($this->shutterCount==-1 or $this->serialNumber=="") and
+            ( substr($values,0,2)=="02" ))
           {
             $this->toDecode[0x0098]=Array($values, $type);
-            $returned="";
-          }
-          else
-          {
-            $returned=$this->readLensData($values);
-          }
+          }
+          $returned=$this->readLensData($values);
           break;
         case 0x0099: // "RawImageCenter"
@@ -481 +478 @@
       }
 
+      if(is_array($returned))
+        $returned=$returned[0];
 
       unset($data);
@@ -567 +566 @@
         return(0+$this->serialNumber);
       }
-      elseif(preg_match("/.*d50.*/i",MakerNotesSignatures::getExifMaker()))
+      elseif(preg_match("/.*d50.*/i",GlobalTags::getExifMaker()))
       {
         //D50