Changeset 4904 for extensions/AMetaData
- Timestamp:
- Feb 17, 2010, 10:39:53 PM (14 years ago)
- Location:
- extensions/AMetaData/JpegMetaData
- Files:
-
- 6 added
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AMetaData/JpegMetaData/Common/Tag.class.php
r4698 r4904 118 118 } 119 119 120 function __destruct() 121 { 122 unset($this->tagId); 123 unset($this->tagName); 124 unset($this->tagNote); 125 unset($this->tagValue); 126 unset($this->valueLabel); 127 unset($this->tagIsKnown); 128 unset($this->tagIsImplemented); 129 unset($this->tagIsTranslatable); 130 } 131 120 132 /** 121 133 * returns the Tag Id -
extensions/AMetaData/JpegMetaData/Common/XmlData.class.php
r4705 r4904 214 214 if(array_key_exists($name, $this->attributes)) 215 215 { 216 $this->attributes[$name] ;216 $this->attributes[$name]=$value; 217 217 return(true); 218 218 } -
extensions/AMetaData/JpegMetaData/JpegMetaData.class.php
r4698 r4904 168 168 * 169 169 * @Param Array $options (optional) 170 * @return Array(keyName => Array('implemented' => Boolean, 'name' => String)) 170 * @return Array(keyName => Array( 171 * 'implemented' => Boolean, 172 * 'translatable' => Boolean, 173 * 'name' => String)) 171 174 */ 172 175 static public function getTagList($options=Array()) … … 230 233 break; 231 234 case MAKER_PENTAX: 235 include_once(JPEG_METADATA_DIR."TagDefinitions/PentaxTags.class.php"); 232 236 $tmp=new PentaxTags(); 233 237 $schema="exif.".MAKER_PENTAX; … … 260 264 $returned[$keyName]=Array( 261 265 'implemented' => $tag['implemented'], 266 'translatable' => $tag['translatable'], 262 267 'name' => $name 263 268 ); … … 345 350 public function load($file, $options = Array()) 346 351 { 352 $this->unsetAll(); 353 347 354 $this->initializeOptions($options); 348 349 $this->unsetAll();350 355 $this->tags = Array(); 351 356 $this->jpeg = new JpegReader($file); … … 530 535 unset($this->tags); 531 536 unset($this->jpeg); 537 unset($this->options); 532 538 } 533 539 … … 536 542 537 543 ?> 538 -
extensions/AMetaData/JpegMetaData/Readers/AppMarkerSegmentReader.class.php
r4686 r4904 711 711 unset($this->workData); 712 712 unset($this->data); 713 unset($this->header); 714 unset($this->offset); 715 unset($this->length); 716 unset($this->subType); 717 unset($this->dataLoaded); 713 718 } 714 719 -
extensions/AMetaData/JpegMetaData/Readers/CanonReader.class.php
r4705 r4904 86 86 } 87 87 88 function __destruct() 89 { 90 parent::__destruct(); 91 } 92 88 93 89 94 /** -
extensions/AMetaData/JpegMetaData/Readers/GpsReader.class.php
r4686 r4904 54 54 class GpsReader extends IfdReader 55 55 { 56 function __destruct() 57 { 58 parent::__destruct(); 59 } 56 60 57 61 /** -
extensions/AMetaData/JpegMetaData/Readers/HeightBIMReader.class.php
r4824 r4904 217 217 $tag=new Tag($tagId, $tagValue); 218 218 $this->entries[]=$tag; 219 unset($tag); 219 220 } 220 221 } … … 224 225 225 226 ?> 226 -
extensions/AMetaData/JpegMetaData/Readers/IfdReader.class.php
r4825 r4904 157 157 } 158 158 159 function __destruct() 160 { 161 parent::__destruct(); 162 } 163 159 164 /** 160 165 * return the offset for the next IFD block -
extensions/AMetaData/JpegMetaData/Readers/IptcReader.class.php
r4698 r4904 87 87 } 88 88 89 function __destruct() 90 { 91 parent::__destruct(); 92 } 93 94 89 95 public function toString() 90 96 { … … 132 138 array_splice($this->entries, $tagT, 1); 133 139 } 140 unset($tagD); 141 unset($tagT); 134 142 } 135 143 } … … 199 207 unset($block); 200 208 } 209 unset($blocks); 201 210 202 211 foreach($this->entries as $key => $tag) … … 296 305 $tag=$this->tagDef->getTagById(0x0114); 297 306 $returned=$tag['tagValues.special'][ConvertData::toUShort($values, BYTE_ORDER_BIG_ENDIAN)]; 307 unset($tag); 298 308 break; 299 309 case 0x0203: // 2:03 - Object Type Reference -
extensions/AMetaData/JpegMetaData/Readers/JpegReader.class.php
r4705 r4904 112 112 unset($this->appMarkerSegmentReader); 113 113 unset($this->fileHandler); 114 unset($this->fileName); 114 115 } 115 116 … … 208 209 $this->appMarkerSegmentReader[]=$marker; 209 210 $offset+=$marker->getLength(); 211 unset($marker); 210 212 } 211 213 else -
extensions/AMetaData/JpegMetaData/Readers/MakerNotesReader.class.php
r4698 r4904 75 75 protected $maker = "UNKNOWN"; 76 76 77 function __destruct() 78 { 79 unset($this->maker); 80 parent::__destruct(); 81 } 82 77 83 /** 78 84 * this function return the name of the camera maker -
extensions/AMetaData/JpegMetaData/Readers/NikonReader.class.php
r4705 r4904 91 91 } 92 92 93 function __destruct() 94 { 95 parent::__destruct(); 96 } 93 97 94 98 /** -
extensions/AMetaData/JpegMetaData/Readers/PentaxReader.class.php
r4698 r4904 91 91 } 92 92 93 function __destruct() 94 { 95 parent::__destruct(); 96 } 93 97 94 98 /** … … 146 150 if(array_key_exists($values[1], $tag['tagValues.special'][1])) 147 151 $returned.=";".$tag['tagValues.special'][1][$values[1]]; 152 unset($tag); 148 153 break; 149 154 case 0x0012: // "ExposureTime", from exiftool -
extensions/AMetaData/JpegMetaData/Readers/TiffReader.class.php
r4705 r4904 179 179 $this->IFDs[]=$IFD; 180 180 $nextIFD = $IFD->getNextIFDOffset(); 181 unset($IFD); 181 182 } 182 183 } -
extensions/AMetaData/JpegMetaData/Readers/XmpReader.class.php
r4705 r4904 273 273 $this->addTag($node->getName(), $value); 274 274 } 275 unset($child); 275 276 break; 276 277 default: … … 336 337 337 338 } 339 unset($tagProperties); 338 340 } 339 341 340 342 $this->entries[]=$tag; 343 unset($tag); 341 344 } 342 345 … … 499 502 $returned['values'][$key]=$tag['tagValues.special'][$val]; 500 503 } 504 unset($tag); 501 505 break; 502 506 case "Iptc4xmpCore:SubjectCode": //bag … … 522 526 if(count($tmp)>=5) 523 527 $returned['values'][$key]['subjectDetailName']=$tmp[4]; 528 529 unset($tmp); 524 530 } 525 531 break; … … 627 633 $returned=Array((int)$computed[0], (int)$computed[1]); 628 634 $type=ByteType::URATIONAL; 635 unset($computed); 629 636 break; 630 637 /* dates & texts */ … … 705 712 706 713 ?> 707 -
extensions/AMetaData/JpegMetaData/TagDefinitions/CanonTags.class.php
r4705 r4904 62 62 ); 63 63 64 function __destruct() 65 { 66 parent::__destruct(); 67 } 68 64 69 } // NikonTags 65 70 -
extensions/AMetaData/JpegMetaData/TagDefinitions/GpsTags.class.php
r4698 r4904 351 351 ); 352 352 353 354 function __destruct() 355 { 356 parent::__destruct(); 357 } 358 353 359 } 354 360 -
extensions/AMetaData/JpegMetaData/TagDefinitions/IfdTags.class.php
r4698 r4904 1572 1572 1573 1573 ); 1574 1575 function __destruct() 1576 { 1577 parent::__destruct(); 1578 } 1574 1579 } 1575 1580 -
extensions/AMetaData/JpegMetaData/TagDefinitions/IptcTags.class.php
r4698 r4904 2095 2095 } 2096 2096 2097 function __destruct() 2098 { 2099 parent::__destruct(); 2100 } 2097 2101 } 2098 2102 -
extensions/AMetaData/JpegMetaData/TagDefinitions/KnownTags.class.php
r4698 r4904 103 103 function __destruct() 104 104 { 105 unset($this->label); 105 106 unset($this->tags); 106 107 } -
extensions/AMetaData/JpegMetaData/TagDefinitions/NikonTags.class.php
r4705 r4904 62 62 ); 63 63 64 function __destruct() 65 { 66 parent::__destruct(); 67 } 64 68 } // NikonTags 65 69 -
extensions/AMetaData/JpegMetaData/TagDefinitions/PentaxTags.class.php
r4824 r4904 444 444 ), // < MeteringMode 445 445 446 // WhiteBal lance, tag 0x0019446 // WhiteBalance, tag 0x0019 447 447 0x0019 => Array( 448 'tagName' => "WhiteBal lance",448 'tagName' => "WhiteBalance", 449 449 'schema' => "Pentax", 450 450 'translatable'=> true, … … 467 467 65535 => "User Selected" 468 468 ) 469 ), // < WhiteBal lance470 471 // WhiteBal lanceMode, tag 0x001a469 ), // < WhiteBalance 470 471 // WhiteBalanceMode, tag 0x001a 472 472 0x001a => Array( 473 'tagName' => "WhiteBal lanceMode",473 'tagName' => "WhiteBalanceMode", 474 474 'schema' => "Pentax", 475 475 'translatable'=> true, … … 488 488 0xfffe => "Preset (Fireworks?)" 489 489 ) 490 ), // < < WhiteBal lanceMode490 ), // < < WhiteBalanceMode 491 491 492 492 // Saturation, tag 0x001f … … 1695 1695 1696 1696 ); 1697 1698 function __destruct() 1699 { 1700 parent::__destruct(); 1701 } 1697 1702 } // PentaxTags 1698 1703 -
extensions/AMetaData/JpegMetaData/TagDefinitions/XmpTags.class.php
r4705 r4904 1864 1864 $this->tags[$key]['implemented'] = false; 1865 1865 } 1866 1867 unset($tmpTag); 1866 1868 } 1867 1869 } … … 1874 1876 } 1875 1877 1878 1879 function __destruct() 1880 { 1881 parent::__destruct(); 1882 } 1876 1883 } 1877 1884
Note: See TracChangeset
for help on using the changeset viewer.