Changeset 8969
- Timestamp:
- Jan 29, 2011, 11:16:59 AM (13 years ago)
- Location:
- extensions/AMetaData
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AMetaData/JpegMetaData/JpegMetaData.class.php
r7569 r8969 110 110 * | | | . Some meta names are not translated in french 111 111 * | | | 112 * | 1.1.4 | 2010-11-02 | * mantis bug:1992 113 * | | | . On Canon file, debug informations are displayed 112 * | 1.1.4 | 2011-01-29 | * mantis bug:2141 113 * | | | . MakerNotes on some Nikon file are not recognized 114 * | | | and script is terminated with a memory allocation 115 * | | | error 114 116 * | | | 115 117 * | | | -
extensions/AMetaData/JpegMetaData/Readers/IfdEntryReader.class.php
r4931 r8969 107 107 $this->size = ConvertData::toULong(substr($data, 4), $this->byteOrder); 108 108 109 /* 110 * the entry value is stored in 4 bytes 111 * if the entry type size multiplied by the entry size is greater than 4 112 * it means that the entry value is an offset 113 */ 114 $numBytes = $this->size * ByteType::$typeSizes[$this->type]; 115 116 if($numBytes>4) 109 110 if(!isset(ByteType::$typeSizes[$this->type])) 117 111 { 118 $this->isOffset = true; 119 $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), $this->byteOrder)); 112 /* 113 * invalid IFD marker type ? 114 * process it as dummy 115 */ 116 $this->tag->setValue(0); 121 117 } 122 118 else 123 119 { 124 $this->tag->setValue($this->extractExtraData(new Data(substr($data,8), $this->byteOrder))); 120 /* 121 * the entry value is stored in 4 bytes 122 * if the entry type size multiplied by the entry size is greater than 4 123 * it means that the entry value is an offset 124 */ 125 $numBytes = $this->size * ByteType::$typeSizes[$this->type]; 126 127 if($numBytes>4) 128 { 129 $this->isOffset = true; 130 $this->extraDataOffset = ConvertData::toULong(substr($data, 8), $this->byteOrder); 131 $this->tag->setValue($this->extractExtraData(new Data($segmentData->readASCII($this->size*ByteType::$typeSizes[$this->type], $this->extraDataOffset - $segmentDataOffset), $this->byteOrder), $this->byteOrder)); 132 } 133 else 134 { 135 $this->tag->setValue($this->extractExtraData(new Data(substr($data,8), $this->byteOrder))); 136 } 125 137 } 126 138 -
extensions/AMetaData/amd_version.inc.php
r7700 r8969 17 17 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 18 18 19 define('AMD_VERSION', '0.5. 7');20 define('AMD_VERSION2', '00.05.0 7');19 define('AMD_VERSION', '0.5.9'); 20 define('AMD_VERSION2', '00.05.09'); 21 21 define('AMD_GPC_NEEDED', '3.3.2'); 22 22 ?> -
extensions/AMetaData/main.inc.php
r7700 r8969 189 189 | | | 190 190 | | | * mantis bug:2020 191 | | | . Impossible to install plugin i dit_IT language is191 | | | . Impossible to install plugin if it_IT language is 192 192 | | | activated 193 | | | 194 | 0.5.8 | 2011-01-29 | * add language ru_RU 195 | | | 196 | 0.5.9 | 2011-01-29 | * mantis bug:2141 197 | | | . MakerNotes on some Nikon file are not recognized 198 | | | and script is terminated with a memory allocation 199 | | | error 200 | | | 201 | | | 202 | | | 203 | | | 193 204 | | | 194 205 | | |
Note: See TracChangeset
for help on using the changeset viewer.