Changeset 4933


Ignore:
Timestamp:
Feb 21, 2010, 10:39:52 PM (14 years ago)
Author:
grum
Message:

Fix bug on tag filter ("Makernote", "Exif IFD Pointer" & "GPS IFD Pointer") are now always selected even if they are not tagged as implemented

File:
1 edited

Legend:

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

    r4931 r4933  
    202202        $list[]=MAKER_PENTAX;
    203203        $list[]=MAKER_NIKON;
     204        $list[]=MAKER_CANON;
    204205      }
    205206
     
    241242            $tmp=new NikonTags();
    242243            $schema="exif.".MAKER_NIKON;
     244            break;
     245          case MAKER_CANON:
     246            include_once(JPEG_METADATA_DIR."TagDefinitions/CanonTags.class.php");
     247            $tmp=new CanonTags();
     248            $schema="exif.".MAKER_CANON;
    243249            break;
    244250          default:
     
    487493      foreach($ifd->getTags() as $key => $tag)
    488494      {
    489         if(self::filter($tag->getTag()->isKnown(), $tag->getTag()->isImplemented(), $this->options['filter']))
     495        if((self::filter($tag->getTag()->isKnown(), $tag->getTag()->isImplemented(), $this->options['filter'])) or
     496           ($tag->getTag()->getName()=='Exif IFD Pointer' or
     497            $tag->getTag()->getName()=='MakerNote' or
     498            $tag->getTag()->getName()=='GPS IFD Pointer'))
    490499        {
    491500          if($tag->getTag()->getLabel() instanceof IfdReader)
Note: See TracChangeset for help on using the changeset viewer.