Changeset 4933
- Timestamp:
- Feb 21, 2010, 10:39:52 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AMetaData/JpegMetaData/JpegMetaData.class.php
r4931 r4933 202 202 $list[]=MAKER_PENTAX; 203 203 $list[]=MAKER_NIKON; 204 $list[]=MAKER_CANON; 204 205 } 205 206 … … 241 242 $tmp=new NikonTags(); 242 243 $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; 243 249 break; 244 250 default: … … 487 493 foreach($ifd->getTags() as $key => $tag) 488 494 { 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')) 490 499 { 491 500 if($tag->getTag()->getLabel() instanceof IfdReader)
Note: See TracChangeset
for help on using the changeset viewer.