Changeset 4824 for extensions

Timestamp:

Feb 1, 2010, 11:09:15 PM (15 years ago)

Author:

grum

Message:

Fixes some little bugs

Location:

extensions/AMetaData/JpegMetaData

Files:

• Readers/HeightBIMReader.class.php (modified) (1 diff)
• Readers/IfdEntryReader.class.php (modified) (1 diff)
• Readers/IfdReader.class.php (modified) (2 diffs)
• TagDefinitions/PentaxTags.class.php (modified) (1 diff)

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

@@ -78 +78 @@
     private $isValid = false;
 
-    private $entries = null;
+    private $entries = array();
 
     private $data = null;

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

@@ -118 +118 @@
           $this->isOffset = true;
           $this->extraDataOffset = ConvertData::toULong(substr($data, 8), $this->byteOrder);
-          $this->tag->setValue($this->extractExtraData(new Data($segmentData->readASCII($this->size*ByteType::$typeSizes[$this->type], $this->extraDataOffset - $segmentDataOffset)), $this->byteOrder));
+          $this->tag->setValue($this->extractExtraData(new Data($segmentData->readASCII($this->size*ByteType::$typeSizes[$this->type], $this->extraDataOffset - $segmentDataOffset), $this->byteOrder), $this->byteOrder));
         }
         else
         {
-          $this->tag->setValue($this->value = $this->extractExtraData(new Data(substr($data,8), $this->byteOrder)));
+          $this->tag->setValue($this->extractExtraData(new Data(substr($data,8), $this->byteOrder)));
         }
 

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

@@ -232 +232 @@
            * if the combiTag value equals 0 exploit it as this
            */
-          if($tag['combiTag']==0)
+          if($tag['combiTag']==0 and !is_array($entry->getValue()))
           {
             if(array_key_exists($entry->getValue(), $tag['tagValues']))
@@ -248 +248 @@
              * the combiTag value does not equals 0, so exploit it as a combi tag
              */
-            $combiValue=$this->processCombiTag($entry->getValue(), $tag['combiTag']);
+            $combiValue=$this->processCombiTag($entry->getValue(), ($tag['combiTag']==0)?1:$tag['combiTag'] );
             if(array_key_exists($combiValue, $tag['tagValues']))
             {

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

@@ -217 +217 @@
           27 => "3648x2736",
           29 => "4000x3000",
-          0x00
-
+          37 => "3008x2000"
         )
       ), // < Size