Changeset 4705 for extensions/AMetaData/JpegMetaData/Readers

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

Location:

extensions/AMetaData/JpegMetaData/Readers

Files:

• CanonReader.class.php (added)
• GenericReader.class.php (modified) (1 diff)
• IfdReader.class.php (modified) (5 diffs)
• JpegReader.class.php (modified) (1 diff)
• NikonReader.class.php (added)
• SegmentReader.class.php (modified) (1 diff)
• TiffReader.class.php (modified) (1 diff)
• XmpReader.class.php (modified) (1 diff)

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

@@ -70 +70 @@
     protected $nbEntries = 0;
     protected $entries = Array();
+    protected $headerSize = 0;
 
     protected $data = null;

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

@@ -106 +106 @@
       $this->dataOffset=$offset;
 
-      $this->skipHeader();
+      $this->skipHeader($this->headerSize);
 
       $dataPointer = $this->data->offset();
@@ -338 +338 @@
         case 0x010D: // DocumentName, tag 0x010D
         case 0x010E: // ImageDescription, tag 0x010E
-        case 0x010F: // Make, tag 0x010F
-        case 0x0110: // Model, tag 0x0110
         case 0x0131: // Software, tag 0x0131
         case 0x013B: // Artist, tag 0x013B
@@ -351 +349 @@
            */
           $returned=ConvertData::toStrings($values);
+          break;
+        case 0x010F: // Make, tag 0x010F
+        case 0x0110: // Model, tag 0x0110
+          /* Make and Model are null terminated strings
+           * memorize the maker & camera from the exif tag : it's used to
+           * recognize the Canon camera (no header in the maker note)
+           */
+          $returned=ConvertData::toStrings($values);
+          MakerNotesSignatures::setExifMaker($returned);
           break;
         case 0x011A: // XResolution, tag 0x011A
@@ -487 +494 @@
             case MakerNotesSignatures::OlympusHeader:
             case MakerNotesSignatures::Olympus2Header:
-              $returned="Olympus";
+              $returned="Olympus is not implemented yet";
               break;
             case MakerNotesSignatures::FujiFilmHeader:
-              $returned="FujiFilm";
+              $returned="FujiFilm is not implemented yet";
               break;
             case MakerNotesSignatures::Nikon2Header:
             case MakerNotesSignatures::Nikon3Header:
-              $returned="Nikon";
+              require_once(JPEG_METADATA_DIR."Readers/NikonReader.class.php");
+              $returned=new NikonReader($values, $valuesOffset, $this->byteOrder, $makerSignature);
               break;
             case MakerNotesSignatures::PanasonicHeader:
-              $returned="Panasonic";
+              $returned="Panasonic is not implemented yet";
               break;
             case MakerNotesSignatures::PentaxHeader:
@@ -506 +514 @@
             case MakerNotesSignatures::SigmaHeader:
             case MakerNotesSignatures::Sigma2Header:
-              $returned="Sigma";
+              $returned="Sigma is not implemented yet";
               break;
             case MakerNotesSignatures::SonyHeader:
-              $returned="Sony";
+              $returned="Sony is not implemented yet";
               break;
             default:
-              $returned="unknown maker => ".ConvertData::toHexDump($values, $type, 16);
+              /*
+               * Canon maker notes don't have any header
+               * So, the only method to know if the maker note is from a Canon
+               * camera is looking the exif maker value equals "Canon" or
+               * the camera model contains "Canon"
+               */
+              if(preg_match("/.*canon.*/i",MakerNotesSignatures::getExifMaker()))
+              {
+                require_once(JPEG_METADATA_DIR."Readers/CanonReader.class.php");
+                $returned=new CanonReader($values, $valuesOffset, $this->byteOrder, "");
+              }
+              else
+              {
+                $returned="unknown maker => ".ConvertData::toHexDump($values, $type, 16);
+              }
               break;
           }

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

@@ -111 +111 @@
     {
       unset($this->appMarkerSegmentReader);
+      unset($this->fileHandler);
     }
 

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

@@ -71 +71 @@
     }
 
+    function __destruct()
+    {
+      unset($this->data);
+      unset($this->isValid);
+      unset($this->isLoaded);
+    }
+
     /**
      * return true if the segment is valid

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

@@ -111 +111 @@
     function __destruct()
     {
+      parent::__destruct();
       unset($this->IFDs);
     }

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

@@ -97 +97 @@
     function __destruct()
     {
+      unset($this->xmlData);
       unset($this->xmpTag2Exif);
       parent::__destruct();