Changeset 8969


Ignore:
Timestamp:
Jan 29, 2011, 11:16:59 AM (9 years ago)
Author:
grum
Message:

release 0.5.9
fix bug:2141

Location:
extensions/AMetaData
Files:
4 edited

Legend:

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

    r7569 r8969  
    110110 * |         |            |   . Some meta names are not translated in french
    111111 * |         |            |
    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
    114116 * |         |            |
    115117 * |         |            |
  • extensions/AMetaData/JpegMetaData/Readers/IfdEntryReader.class.php

    r4931 r8969  
    107107        $this->size  = ConvertData::toULong(substr($data, 4), $this->byteOrder);
    108108
    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]))
    117111        {
    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);
    121117        }
    122118        else
    123119        {
    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          }
    125137        }
    126138
  • extensions/AMetaData/amd_version.inc.php

    r7700 r8969  
    1717  if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
    1818
    19   define('AMD_VERSION',  '0.5.7');
    20   define('AMD_VERSION2', '00.05.07');
     19  define('AMD_VERSION',  '0.5.9');
     20  define('AMD_VERSION2', '00.05.09');
    2121  define('AMD_GPC_NEEDED', '3.3.2');
    2222?>
  • extensions/AMetaData/main.inc.php

    r7700 r8969  
    189189|         |            |
    190190|         |            | * mantis bug:2020
    191 |         |            |   . Impossible to install plugin id it_IT language is
     191|         |            |   . Impossible to install plugin if it_IT language is
    192192|         |            |     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|         |            |
    193204|         |            |
    194205|         |            |
Note: See TracChangeset for help on using the changeset viewer.