Changeset 4824


Ignore:
Timestamp:
02/01/10 23:09:15 (10 years ago)
Author:
grum
Message:

Fixes some little bugs

Location:
extensions/AMetaData/JpegMetaData
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/AMetaData/JpegMetaData/Readers/HeightBIMReader.class.php

    r4698 r4824  
    7878    private $isValid = false; 
    7979 
    80     private $entries = null; 
     80    private $entries = array(); 
    8181 
    8282    private $data = null; 
  • extensions/AMetaData/JpegMetaData/Readers/IfdEntryReader.class.php

    r4686 r4824  
    118118          $this->isOffset = true; 
    119119          $this->extraDataOffset = ConvertData::toULong(substr($data, 8), $this->byteOrder); 
    120           $this->tag->setValue($this->extractExtraData(new Data($segmentData->readASCII($this->size*ByteType::$typeSizes[$this->type], $this->extraDataOffset - $segmentDataOffset)), $this->byteOrder)); 
     120          $this->tag->setValue($this->extractExtraData(new Data($segmentData->readASCII($this->size*ByteType::$typeSizes[$this->type], $this->extraDataOffset - $segmentDataOffset), $this->byteOrder), $this->byteOrder)); 
    121121        } 
    122122        else 
    123123        { 
    124           $this->tag->setValue($this->value = $this->extractExtraData(new Data(substr($data,8), $this->byteOrder))); 
     124          $this->tag->setValue($this->extractExtraData(new Data(substr($data,8), $this->byteOrder))); 
    125125        } 
    126126 
  • extensions/AMetaData/JpegMetaData/Readers/IfdReader.class.php

    r4705 r4824  
    232232           * if the combiTag value equals 0 exploit it as this 
    233233           */ 
    234           if($tag['combiTag']==0) 
     234          if($tag['combiTag']==0 and !is_array($entry->getValue())) 
    235235          { 
    236236            if(array_key_exists($entry->getValue(), $tag['tagValues'])) 
     
    248248             * the combiTag value does not equals 0, so exploit it as a combi tag 
    249249             */ 
    250             $combiValue=$this->processCombiTag($entry->getValue(), $tag['combiTag']); 
     250            $combiValue=$this->processCombiTag($entry->getValue(), ($tag['combiTag']==0)?1:$tag['combiTag'] ); 
    251251            if(array_key_exists($combiValue, $tag['tagValues'])) 
    252252            { 
  • extensions/AMetaData/JpegMetaData/TagDefinitions/PentaxTags.class.php

    r4698 r4824  
    217217          27 => "3648x2736", 
    218218          29 => "4000x3000", 
    219           0x00 
    220  
     219          37 => "3008x2000" 
    221220        ) 
    222221      ), // < Size 
Note: See TracChangeset for help on using the changeset viewer.