From bb4d83cf7d652c6f01779f05378b2a13415db8b2 Mon Sep 17 00:00:00 2001 From: mondrake Date: Sat, 20 Jan 2024 22:10:44 +0100 Subject: [PATCH 01/10] Update composer.json --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 0e07027f4..b454d9622 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "homepage": "https://github.com/FileEye/MediaProbe", "license": "GPL-3.0", "require": { - "php": ">=7.4", + "php": ">=8.1", "ext-gd": "*", "ext-mbstring": "*", "composer-runtime-api": "^2.0.0", @@ -16,18 +16,18 @@ "monolog/monolog": "^3", "shanethehat/pretty-xml": "*", "sibche/plist": "*", - "symfony/stopwatch": "^6" + "symfony/stopwatch": "^6 | ^7" }, "require-dev" : { "ext-exif": "*", - "phpunit/phpunit": "^9", + "phpunit/phpunit": "^9 | ^10", "squizlabs/php_codesniffer": "*", - "symfony/console": "^6", - "symfony/finder": "^6", - "symfony/filesystem": "^6", - "symfony/process": "^6", - "symfony/var-dumper": "^6", - "symfony/yaml": "^6", + "symfony/console": "^6 | ^7", + "symfony/finder": "^6 | ^7", + "symfony/filesystem": "^6 | ^7", + "symfony/process": "^6 | ^7", + "symfony/var-dumper": "^6 | ^7", + "symfony/yaml": "^6 | ^7", "bramus/monolog-colored-line-formatter": "^3" }, "autoload": { From 17eb2be91a30989f18c1e6cb3d97b0e111a543bf Mon Sep 17 00:00:00 2001 From: mondrake Date: Sat, 20 Jan 2024 22:14:40 +0100 Subject: [PATCH 02/10] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b454d9622..75c51aed9 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ }, "require-dev" : { "ext-exif": "*", - "phpunit/phpunit": "^9 | ^10", + "phpunit/phpunit": "^10", "squizlabs/php_codesniffer": "*", "symfony/console": "^6 | ^7", "symfony/finder": "^6 | ^7", From 31d53113e768aa58f857b55946664b5f5bf32fc0 Mon Sep 17 00:00:00 2001 From: mondrake Date: Sat, 20 Jan 2024 22:31:14 +0100 Subject: [PATCH 03/10] Dev 230721 (#74) --- specs/ExifMakerNotes/Canon/FilterInfo.yaml | 2 +- src/Block/Exif/Exif.php | 1 + src/Block/Exif/Ifd.php | 12 +- src/Block/Exif/Vendor/Apple/RunTime.php | 2 + src/Block/Exif/Vendor/Canon/AFInfoIndex.php | 10 +- .../Exif/Vendor/Canon/CustomFunctions2.php | 2 + .../Vendor/Canon/CustomFunctions2Header.php | 2 + src/Block/Exif/Vendor/Canon/Filter.php | 43 +++-- .../Exif/Vendor/Canon/FilterInfoIndex.php | 33 ++-- src/Block/Index.php | 13 +- src/Block/Jpeg.php | 2 + src/Block/JpegSegment.php | 1 + src/Block/JpegSegmentApp1.php | 1 + src/Block/JpegSegmentCom.php | 1 + src/Block/JpegSegmentSos.php | 1 + src/Block/ListBase.php | 5 + src/Block/Map.php | 6 +- src/Block/RawData.php | 1 + src/Block/Tag.php | 23 +-- src/Block/Thumbnail.php | 1 + src/Block/Tiff.php | 38 +++-- .../ExifMakerNotes/Canon/FilterInfo.php | 2 +- src/Command/CompileCommand.php | 2 +- src/Command/DumpCommand.php | 2 +- src/Command/ExifToolResourceUpdateCommand.php | 2 +- src/Media.php | 7 + src/Model/BlockBase.php | 17 +- src/Model/ElementBase.php | 45 ++---- src/Model/ElementInterface.php | 2 + tests/MediaFilesTest.php | 2 +- tests/ReadWriteTest.php | 2 +- tests/SpecTest.php | 2 +- tests/StubRootBlock.php | 7 + .../image/broken/canon-eos-650d.jpg.dump.yml | 32 ++-- .../camera/canon_eos_70d_29.jpg.dump.yml | 101 ++++++------ .../camera/canon_eos_850d_08.jpg.dump.yml | 150 ++++++++---------- .../image/exiftool/Canon1DmkIII.jpg.dump.yml | 57 +++---- 37 files changed, 320 insertions(+), 312 deletions(-) diff --git a/specs/ExifMakerNotes/Canon/FilterInfo.yaml b/specs/ExifMakerNotes/Canon/FilterInfo.yaml index cb31c3812..bd2b5d2b1 100644 --- a/specs/ExifMakerNotes/Canon/FilterInfo.yaml +++ b/specs/ExifMakerNotes/Canon/FilterInfo.yaml @@ -2,7 +2,7 @@ collection: ExifMakerNotes\Canon\FilterInfo name: CanonFilterInfo title: 'Canon FilterInfo' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\FilterInfoIndex -DOMNode: index +DOMNode: filterInfo defaultItemCollection: Tag compiler: exiftool: diff --git a/src/Block/Exif/Exif.php b/src/Block/Exif/Exif.php index e91b130ba..be51e0e03 100644 --- a/src/Block/Exif/Exif.php +++ b/src/Block/Exif/Exif.php @@ -33,6 +33,7 @@ class Exif extends BlockBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); if (Tiff::getTiffSegmentByteOrder($data, strlen(self::EXIF_HEADER)) !== null) { $tiff = new ItemDefinition(CollectionFactory::get('Tiff\Tiff')); $this->addBlock($tiff)->parseData($data, strlen(self::EXIF_HEADER), $data->getSize() - strlen(self::EXIF_HEADER)); diff --git a/src/Block/Exif/Ifd.php b/src/Block/Exif/Ifd.php index 46a6e9002..79b7310ef 100644 --- a/src/Block/Exif/Ifd.php +++ b/src/Block/Exif/Ifd.php @@ -97,6 +97,13 @@ public function parseData(DataElement $data_element, int $start = 0, ?int $size $this->executePostParseCallbacks($data_element); } + /** + * @todo remove, replace by parser + */ + protected function doParseData(DataElement $data): void + { + } + /** * Gets the number of items in the IFD, from the data. * @@ -445,11 +452,10 @@ public function collectInfo(array $context = []): array $info['seq'] = $parent_name . '.' . $info['seq']; } - $item = $this->getAttribute('id'); - if ($item ==! null) { + if (isset($parentInfo['item'])) { $msg .= ' ({item})'; + $info['item'] = is_numeric($parentInfo['item']) ? $parentInfo['item'] . '/0x' . strtoupper(dechex($parentInfo['item'])) : $parentInfo['item']; } - $info['item'] = is_numeric($item) ? $item . '/0x' . strtoupper(dechex($item)) : $item; if (isset($context['dataElement']) && $context['dataElement'] instanceof DataWindow) { $info['offset'] = $context['dataElement']->getAbsoluteOffset($this->getDefinition()->getDataOffset()) . '/0x' . strtoupper(dechex($context['dataElement']->getAbsoluteOffset($this->getDefinition()->getDataOffset()))); diff --git a/src/Block/Exif/Vendor/Apple/RunTime.php b/src/Block/Exif/Vendor/Apple/RunTime.php index 2b7546a5e..98533c876 100644 --- a/src/Block/Exif/Vendor/Apple/RunTime.php +++ b/src/Block/Exif/Vendor/Apple/RunTime.php @@ -21,6 +21,8 @@ class RunTime extends ListBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); + $plist = new CFPropertyList(); $plist->parse($data->getBytes(0, $this->getDefinition()->getValuesCount())); diff --git a/src/Block/Exif/Vendor/Canon/AFInfoIndex.php b/src/Block/Exif/Vendor/Canon/AFInfoIndex.php index d36e63cff..5b7f1ece2 100644 --- a/src/Block/Exif/Vendor/Canon/AFInfoIndex.php +++ b/src/Block/Exif/Vendor/Canon/AFInfoIndex.php @@ -26,10 +26,10 @@ protected function doParseData(DataElement $data): void // property is true, the first entry is a special case that is handled // by opening a 'rawData' node instead of a 'tag'. $offset = 0; - $index_components = $this->getDefinition()->getValuesCount(); - assert($this->debugInfo(['dataElement' => $data, 'itemsCount' => $index_components])); + $this->components = $this->getDefinition()->getValuesCount(); + assert($this->debugInfo(['dataElement' => $data])); - for ($i = 0; $i < $index_components; $i++) { + for ($i = 0; $i < $this->components; $i++) { $item_definition = $this->getItemDefinitionFromData($i, $i, $data, $offset); // Check if this tag should be skipped. @@ -40,10 +40,10 @@ protected function doParseData(DataElement $data): void if (in_array($item_definition->getCollection()->getPropertyValue('name'), ['AFAreaWidths', 'AFAreaHeights', 'AFAreaXPositions', 'AFAreaYPositions'])) { $value_components = $this->getElement("tag[@name='NumAFPoints']")->getElement("entry")->getValue(); - $index_components -= ($value_components - 1); + $this->components -= ($value_components - 1); } elseif (in_array($item_definition->getCollection()->getPropertyValue('name'), ['AFPointsInFocus', 'AFPointsSelected'])) { $value_components = (int) (($this->getElement("tag[@name='NumAFPoints']")->getElement("entry")->getValue() + 15) / 16); - $index_components -= ($value_components - 1); + $this->components -= ($value_components - 1); } else { $value_components = 1; } diff --git a/src/Block/Exif/Vendor/Canon/CustomFunctions2.php b/src/Block/Exif/Vendor/Canon/CustomFunctions2.php index 6dba05df4..2146ea597 100644 --- a/src/Block/Exif/Vendor/Canon/CustomFunctions2.php +++ b/src/Block/Exif/Vendor/Canon/CustomFunctions2.php @@ -25,6 +25,8 @@ class CustomFunctions2 extends ListBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); + $rec_pos = 0; for ($n = 0; $n < $this->getDefinition()->getValuesCount(); $n++) { $id = $data->getLong($rec_pos); diff --git a/src/Block/Exif/Vendor/Canon/CustomFunctions2Header.php b/src/Block/Exif/Vendor/Canon/CustomFunctions2Header.php index 3d3ea7ace..0f7ed72a8 100644 --- a/src/Block/Exif/Vendor/Canon/CustomFunctions2Header.php +++ b/src/Block/Exif/Vendor/Canon/CustomFunctions2Header.php @@ -26,6 +26,8 @@ class CustomFunctions2Header extends ListBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); + $offset = 0; $size = $this->getDefinition()->getSize(); diff --git a/src/Block/Exif/Vendor/Canon/Filter.php b/src/Block/Exif/Vendor/Canon/Filter.php index 138568871..d00969d58 100644 --- a/src/Block/Exif/Vendor/Canon/Filter.php +++ b/src/Block/Exif/Vendor/Canon/Filter.php @@ -1,18 +1,19 @@ -setAttribute('name', $this->getParentElement()->getAttribute('name') . '.' . $definition->getSequence()); + } + /** * {@inheritdoc} */ @@ -38,22 +45,35 @@ protected function doParseData(DataElement $data): void $offset = 0; // The id of the filter is at offset 0. - $this->setAttribute('id', $data->getLong($offset)); + $this->setAttribute('id', (string) $data->getLong($offset)); // The count of filter parameters is at offset 8. $this->paramsCount = $data->getLong($offset + 8); $offset += 12; + assert($this->debugInfo(['dataElement' => $data])); + // Loop and parse through the parameters. for ($p = 0; $p < $this->paramsCount; $p++) { - $id = $data->getLong($offset); + $id = (string) $data->getLong($offset); $val_count = $data->getLong($offset + 4); $offset += 8; // The items are defined in the collection of the parent element. $this - ->addBlock(new ItemDefinition($this->getParentElement()->getCollection()->getItemCollection($id), DataFormat::SIGNED_LONG, $val_count)) - ->parseData(new DataWindow($data, $offset, $val_count * DataFormat::getSize(DataFormat::SIGNED_LONG))); + ->addBlock(new ItemDefinition( + $this->getParentElement()->getCollection()->getItemCollection($id), + DataFormat::SIGNED_LONG, + $val_count, + 0, + $offset, + $p, + )) + ->parseData(new DataWindow( + $data, + $offset, + $val_count * DataFormat::getSize(DataFormat::SIGNED_LONG) + )); $offset += 4 * $val_count; } @@ -67,13 +87,13 @@ public function toBytes(int $byte_order = ConvertBytes::LITTLE_ENDIAN, int $offs $bytes = ''; // The id of the filter. - $bytes .= ConvertBytes::fromLong($this->getAttribute('id'), $byte_order); + $bytes .= ConvertBytes::fromLong((int) $this->getAttribute('id'), $byte_order); // Build the parameters. $params = $this->getMultipleElements('*'); $data_area_bytes = ''; foreach ($params as $param) { - $data_area_bytes .= ConvertBytes::fromLong($param->getAttribute('id'), $byte_order); + $data_area_bytes .= ConvertBytes::fromLong((int) $param->getAttribute('id'), $byte_order); $data_area_bytes .= ConvertBytes::fromLong($param->getComponents(), $byte_order); $data_area_bytes .= $param->toBytes($byte_order); } @@ -93,10 +113,9 @@ public function toBytes(int $byte_order = ConvertBytes::LITTLE_ENDIAN, int $offs public function collectInfo(array $context = []): array { return array_merge(parent::collectInfo($context), [ - '_msg' =>'filter#{seq} @{offset}, {parms} parameter(s), size {size} bytes', + '_msg' =>'#{seq}.{name} @{offset}, {parmetersCount} parameter(s), size {size} bytes', 'seq' => $this->getDefinition()->getSequence() + 1, - 'parms' => $this->paramsCount ?? 'n/a', - 'size' => $this->getDefinition()->getSize(), + 'parmetersCount' => $this->paramsCount, ]); } diff --git a/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php b/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php index 81846777b..e0d0f7b04 100644 --- a/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php +++ b/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php @@ -41,24 +41,29 @@ protected function doParseData(DataElement $data): void { $offset = 0; + // The count of filters is at offset 4. + $this->components = $data->getLong($offset + 4); + + assert($this->debugInfo(['dataElement' => $data])); + // The first 4 bytes is a marker (?), store as RawData. $this ->addBlock(new ItemDefinition(CollectionFactory::get('RawData', ['name' => 'filterHeader']), DataFormat::BYTE, 4)) ->parseData(new DataWindow($data, $offset, 4)); - $offset += 4; - - // The next 4 bytes define the count of filters. - $index_components = $data->getLong($offset); - $this->debug("{filters} filters", [ - 'filters' => $index_components, - ]); - $offset += 4; + $offset += 8; // Loop and parse through the filters. - for ($i = 0; $i < $index_components; $i++) { + for ($i = 0; $i < $this->components; $i++) { $filter_size = $data->getLong($offset + 4); $this - ->addBlock(new ItemDefinition(CollectionFactory::get('ExifMakerNotes\Canon\Filter'), DataFormat::BYTE, $filter_size, $offset, 0, $i)) + ->addBlock( + new ItemDefinition(CollectionFactory::get('ExifMakerNotes\Canon\Filter'), + DataFormat::BYTE, + $filter_size, + $offset, + 0, + $i + )) ->parseData(new DataWindow($data, $offset, $filter_size + 4)); $offset += 4 + $filter_size; } @@ -98,4 +103,12 @@ public function toBytes(int $byte_order = ConvertBytes::LITTLE_ENDIAN, int $offs return $bytes; } + + public function collectInfo(array $context = []): array + { + $info = []; + $parentInfo = parent::collectInfo($context); + $info['tags'] = $this->components; + return array_merge($parentInfo, $info); + } } diff --git a/src/Block/Index.php b/src/Block/Index.php index 272d5100b..6cb4c9468 100644 --- a/src/Block/Index.php +++ b/src/Block/Index.php @@ -55,10 +55,10 @@ protected function doParseData(DataElement $data): void // property is true, the first entry is a special case that is handled // by opening a 'rawData' node instead of a 'tag'. $offset = 0; - $index_components = $this->getDefinition()->getValuesCount(); - assert($this->debugInfo(['dataElement' => $data, 'itemsCount' => $index_components])); + $this->components = $this->getDefinition()->getValuesCount(); + assert($this->debugInfo(['dataElement' => $data])); - for ($i = 0; $i < $index_components; $i++) { + for ($i = 0; $i < $this->components; $i++) { $item_definition = $this->getItemDefinitionFromData($i, $i, $data, $offset); // Check if this tag should be skipped. @@ -67,7 +67,7 @@ protected function doParseData(DataElement $data): void continue; }; - $index_components -= ($item_definition->getValuesCount() - 1); + $this->components -= ($item_definition->getValuesCount() - 1); // Adds the 'tag'. $this->addBlock($item_definition)->parseData($data, $item_definition->getDataOffset(), $item_definition->getSize()); @@ -219,11 +219,10 @@ public function collectInfo(array $context = []): array $info['seq'] = $parent_name . '.' . $info['seq']; } - $item = $this->getAttribute('id'); - if ($item ==! null) { + if (isset($parentInfo['item'])) { $msg .= ' ({item})'; + $info['item'] = is_numeric($parentInfo['item']) ?$parentInfo['item'] . '/0x' . strtoupper(dechex($parentInfo['item'])) : $parentInfo['item']; } - $info['item'] = is_numeric($item) ? $item . '/0x' . strtoupper(dechex($item)) : $item; if (isset($parentInfo['size'])) { $msg .= isset($parentInfo['offset']) ? ' @{offset}, {tags} entries, f {format}, s {size}' : ' {tags} entries, format ?xxx, size {size}'; diff --git a/src/Block/Jpeg.php b/src/Block/Jpeg.php index 5e82b0b4f..0961c43b3 100644 --- a/src/Block/Jpeg.php +++ b/src/Block/Jpeg.php @@ -33,6 +33,8 @@ class Jpeg extends BlockBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); + // JPEG data is stored in big-endian format. $data->setByteOrder(ConvertBytes::BIG_ENDIAN); diff --git a/src/Block/JpegSegment.php b/src/Block/JpegSegment.php index 3a640228d..66d34d60c 100644 --- a/src/Block/JpegSegment.php +++ b/src/Block/JpegSegment.php @@ -18,6 +18,7 @@ class JpegSegment extends JpegSegmentBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); // Adds the segment data as an Undefined entry. new Undefined($this, $data); } diff --git a/src/Block/JpegSegmentApp1.php b/src/Block/JpegSegmentApp1.php index bcd7a1f0c..e052d49ae 100644 --- a/src/Block/JpegSegmentApp1.php +++ b/src/Block/JpegSegmentApp1.php @@ -21,6 +21,7 @@ class JpegSegmentApp1 extends JpegSegmentBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); // If we have an Exif table, parse it. if (Exif::isExifSegment($data, 4)) { $exif = new ItemDefinition(CollectionFactory::get('Exif\Exif')); diff --git a/src/Block/JpegSegmentCom.php b/src/Block/JpegSegmentCom.php index 9f80e5534..c512e865c 100644 --- a/src/Block/JpegSegmentCom.php +++ b/src/Block/JpegSegmentCom.php @@ -17,6 +17,7 @@ class JpegSegmentCom extends JpegSegmentBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); // Adds the segment data as a Char string. new Char($this, new DataWindow($data, 4)); } diff --git a/src/Block/JpegSegmentSos.php b/src/Block/JpegSegmentSos.php index d16fda492..34eeda990 100644 --- a/src/Block/JpegSegmentSos.php +++ b/src/Block/JpegSegmentSos.php @@ -25,6 +25,7 @@ class JpegSegmentSos extends JpegSegmentBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); // This segment is last before End Of Image, and its length needs to be // determined by finding the EOI marker backwards from the end of data. // Some images have some trailing (garbage?) following the EOI marker, diff --git a/src/Block/ListBase.php b/src/Block/ListBase.php index 1662ff271..5aa3e990e 100644 --- a/src/Block/ListBase.php +++ b/src/Block/ListBase.php @@ -25,6 +25,11 @@ */ abstract class ListBase extends BlockBase { + /** + * The amount of components in the list. + */ + protected int $components; + /** * {@inheritdoc} */ diff --git a/src/Block/Map.php b/src/Block/Map.php index 5cc6180a0..81b4b16ad 100644 --- a/src/Block/Map.php +++ b/src/Block/Map.php @@ -26,11 +26,6 @@ class Map extends Index */ protected int $format; - /** - * The amount of components in the map. - */ - protected int $components; - /** * {@inheritdoc} */ @@ -47,6 +42,7 @@ public function __construct(ItemDefinition $definition, BlockBase $parent = null protected function doParseData(DataElement $data): void { $this->validate($data); + assert($this->debugInfo(['dataElement' => $data])); // Preserve the entire map as a raw data block. $mapdata = new ItemDefinition(CollectionFactory::get('RawData', ['name' => 'mapdata'])); diff --git a/src/Block/RawData.php b/src/Block/RawData.php index 99f6a3a20..05fa4fb7b 100644 --- a/src/Block/RawData.php +++ b/src/Block/RawData.php @@ -43,6 +43,7 @@ public function getComponents(): int */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); new Undefined($this, $data); } diff --git a/src/Block/Tag.php b/src/Block/Tag.php index 94fe73bec..74dc60f2a 100644 --- a/src/Block/Tag.php +++ b/src/Block/Tag.php @@ -18,15 +18,6 @@ */ class Tag extends BlockBase { - /** - * Constructs a Tag block object. - */ - public function __construct(ItemDefinition $definition, BlockBase $parent = null, ElementInterface $reference = null) - { - parent::__construct($definition, $parent, $reference); - $this->validate(); - } - /** * Validates against the specification, if defined. */ @@ -73,6 +64,8 @@ public function validate(): void */ protected function doParseData(DataElement $data): void { + $this->validate(); + assert($this->debugInfo(['dataElement' => $data])); try { $class = $this->getDefinition()->getEntryClass(); $entry = new $class($this, $data); @@ -140,21 +133,21 @@ public function collectInfo(array $context = []): array $parentInfo = parent::collectInfo($context); - $msg = '#{seq} @{ifdoffset} {node}'; + $msg = '#{seq} rel@{relativeOffset} {node}'; $info['seq'] = $this->getDefinition()->getSequence() + 1; if ($this->getParentElement() && ($parent_name = $this->getParentElement()->getAttribute('name'))) { $info['seq'] = $parent_name . '.' . $info['seq']; } - $info['ifdoffset'] = MediaProbe::dumpIntHex($this->getDefinition()->getItemDefinitionOffset()); + + $info['relativeOffset'] = MediaProbe::dumpIntHex($this->getDefinition()->getItemDefinitionOffset()); $msg .= isset($parentInfo['name']) ? ':{name}' : ''; - $item = $this->getAttribute('id'); - if ($item ==! null) { + if (isset($parentInfo['item'])) { $msg .= ' ({item})'; + $info['item'] = MediaProbe::dumpIntHex($parentInfo['item']); } - $info['item'] = MediaProbe::dumpIntHex($item); if (isset($parentInfo['size'])) { $msg .= isset($parentInfo['offset']) ? ' @{offset} size {size}' : ' size {size} byte(s)'; @@ -162,7 +155,7 @@ public function collectInfo(array $context = []): array $info['format'] = DataFormat::getName($this->getDefinition()->getFormat()); $info['components'] = $this->getDefinition()->getValuesCount(); - $msg .= ', format {format}, components {components}'; + $msg .= ' format {format} count {components}'; $info['_msg'] = $msg; diff --git a/src/Block/Thumbnail.php b/src/Block/Thumbnail.php index 1615835d8..c8dcced2f 100644 --- a/src/Block/Thumbnail.php +++ b/src/Block/Thumbnail.php @@ -16,6 +16,7 @@ class Thumbnail extends BlockBase */ protected function doParseData(DataElement $data): void { + assert($this->debugInfo(['dataElement' => $data])); // Adds the segment data as an Undefined entry. new Undefined($this, $data); } diff --git a/src/Block/Tiff.php b/src/Block/Tiff.php index 290d522e9..affd7009b 100644 --- a/src/Block/Tiff.php +++ b/src/Block/Tiff.php @@ -56,19 +56,16 @@ public function getByteOrder(): int /** * {@inheritdoc} */ - protected function doParseData(DataElement $data_element): void + protected function doParseData(DataElement $data): void { // Determine the byte order of the TIFF data. - $this->setByteOrder(self::getTiffSegmentByteOrder($data_element)); - $data_element->setByteOrder($this->getByteOrder()); + $this->setByteOrder(self::getTiffSegmentByteOrder($data)); + $data->setByteOrder($this->getByteOrder()); - $this->debug('byte order: {byte_order} ({byte_order_description})', [ - 'byte_order' => $this->getByteOrder() === ConvertBytes::LITTLE_ENDIAN ? 'II' : 'MM', - 'byte_order_description' => $this->getByteOrder() === ConvertBytes::LITTLE_ENDIAN ? 'Little Endian' : 'Big Endian', - ]); + assert($this->debugInfo(['dataElement' => $data])); // Starting IFD will be at offset 4 (2 bytes for byte order + 2 for header). - $ifd_offset = $data_element->getLong(4); + $ifd_offset = $data->getLong(4); // If the offset to first IFD is higher than 8, then there may be an // image scan (TIFF) in between. Store that in a RawData block. @@ -78,13 +75,13 @@ protected function doParseData(DataElement $data_element): void DataFormat::BYTE, $ifd_offset - 8 ); - $this->addBlock($scan)->parseData($data_element, 8, $ifd_offset - 8); + $this->addBlock($scan)->parseData($data, 8, $ifd_offset - 8); } // Loops through IFDs. In fact we should only have IFD0 and IFD1. for ($i = 0; $i <= 1; $i++) { // Check data is accessible, warn otherwise. - if ($ifd_offset >= $data_element->getSize() || $ifd_offset + 4 > $data_element->getSize()) { + if ($ifd_offset >= $data->getSize() || $ifd_offset + 4 > $data->getSize()) { $this->warning( 'Could not determine number of entries for {item}, overflow', ['item' => $this->getCollection()->getItemCollection($i)->getPropertyValue('name')] @@ -93,8 +90,8 @@ protected function doParseData(DataElement $data_element): void } // Find number of tags in IFD and warn if not enough data to read them. - $ifd_tags_count = $data_element->getShort($ifd_offset); - if ($ifd_offset + $ifd_tags_count * 4 > $data_element->getSize()) { + $ifd_tags_count = $data->getShort($ifd_offset); + if ($ifd_offset + $ifd_tags_count * 4 > $data->getSize()) { $this->warning( 'Invalid data for {item}', ['item' => $this->getCollection()->getItemCollection($i)->getPropertyValue('name')] @@ -109,7 +106,7 @@ protected function doParseData(DataElement $data_element): void $ifd_item = new ItemDefinition($this->getCollection()->getItemCollection($i), DataFormat::LONG, $ifd_tags_count, $ifd_offset, 0, $i); $ifd = new $ifd_class($ifd_item, $this); try { - $ifd->parseData($data_element); + $ifd->parseData($data); } catch (DataException $e) { $this->error('Error processing {ifd_name}: {msg}.', [ 'ifd_name' => $this->getCollection()->getItemCollection($i)->getPropertyValue('name'), @@ -119,7 +116,7 @@ protected function doParseData(DataElement $data_element): void } // Offset to next IFD. - $ifd_offset = $data_element->getLong($ifd_offset + $ifd_tags_count * 12 + 2); + $ifd_offset = $data->getLong($ifd_offset + $ifd_tags_count * 12 + 2); // If next IFD offset is 0 we are finished. if ($ifd_offset === 0) { @@ -231,4 +228,17 @@ public static function getTiffSegmentByteOrder(DataElement $data_element, int $o return $order; } + + public function collectInfo(array $context = []): array + { + $info = []; + + $parentInfo = parent::collectInfo($context); + + $info['_msg'] = $parentInfo['_msg'] . ' byte order {byteOrder} ({byteOrderDescription})'; + $info['byteOrder'] = $this->getByteOrder() === ConvertBytes::LITTLE_ENDIAN ? 'II' : 'MM'; + $info['byteOrderDescription'] = $this->getByteOrder() === ConvertBytes::LITTLE_ENDIAN ? 'Little Endian' : 'Big Endian'; + + return array_merge($parentInfo, $info); + } } diff --git a/src/Collection/ExifMakerNotes/Canon/FilterInfo.php b/src/Collection/ExifMakerNotes/Canon/FilterInfo.php index 98dba8d47..a9141252d 100644 --- a/src/Collection/ExifMakerNotes/Canon/FilterInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/FilterInfo.php @@ -16,7 +16,7 @@ class FilterInfo extends CollectionBase { 'name' => 'CanonFilterInfo', 'title' => 'Canon FilterInfo', 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Vendor\\Canon\\FilterInfoIndex', - 'DOMNode' => 'index', + 'DOMNode' => 'filterInfo', 'defaultItemCollection' => 'Tag', 'id' => 'ExifMakerNotes\\Canon\\FilterInfo', 'itemsByName' => diff --git a/src/Command/CompileCommand.php b/src/Command/CompileCommand.php index 67e242434..334223813 100644 --- a/src/Command/CompileCommand.php +++ b/src/Command/CompileCommand.php @@ -37,7 +37,7 @@ protected function configure() /** * {@inheritdoc} */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $compiler = new SpecCompiler(); $compiler->compile($input->getArgument('spec-dir'), $input->getArgument('resource-dir')); diff --git a/src/Command/DumpCommand.php b/src/Command/DumpCommand.php index f2d49b87c..7f026ee97 100644 --- a/src/Command/DumpCommand.php +++ b/src/Command/DumpCommand.php @@ -56,7 +56,7 @@ protected function configure() /** * {@inheritdoc} */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $sourcePath = $input->getArgument('file-path'); $dumpPath = $input->getArgument('dump-path'); diff --git a/src/Command/ExifToolResourceUpdateCommand.php b/src/Command/ExifToolResourceUpdateCommand.php index 31e63dc3f..574cf2804 100644 --- a/src/Command/ExifToolResourceUpdateCommand.php +++ b/src/Command/ExifToolResourceUpdateCommand.php @@ -39,7 +39,7 @@ protected function configure() /** * {@inheritdoc} */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $filesystem = new Filesystem(); diff --git a/src/Media.php b/src/Media.php index d6453aa83..48fbc9444 100644 --- a/src/Media.php +++ b/src/Media.php @@ -106,6 +106,13 @@ public static function parse(DataElement $data_element, ?LoggerInterface $extern return $media; } + /** + * @todo remove, replace by parser + */ + protected function doParseData(DataElement $data): void + { + } + /** * Determines the media format collection of the media data. * diff --git a/src/Model/BlockBase.php b/src/Model/BlockBase.php index cf048574b..5923874db 100644 --- a/src/Model/BlockBase.php +++ b/src/Model/BlockBase.php @@ -105,7 +105,6 @@ public function parseData(DataElement $data_element, int $start = 0, ?int $size { $data = new DataWindow($data_element, $start, $size); $this->size = $data->getSize(); - assert($this->debugInfo(['dataElement' => $data])); $this->doParseData($data); // Invoke post-parse callbacks. @@ -118,10 +117,7 @@ public function parseData(DataElement $data_element, int $start = 0, ?int $size * @param DataElement $data_element * The data element that will provide the data. */ - protected function doParseData(DataElement $data): void - { - throw new MediaProbeException("%s does not implement the %s method.", get_called_class(), __FUNCTION__); - } + abstract protected function doParseData(DataElement $data); /** * Invoke post-parse callbacks. @@ -180,12 +176,13 @@ public function collectInfo(array $context = []): array { $info = []; - $msg = '{node}'; + $parentInfo = parent::collectInfo($context); - if (($name = $this->getAttribute('name')) ==! null) { - $info['name'] = $name; + $msg = '{node}'; + if (isset($parentInfo['name'])) { $msg .= ':{name}'; } + if (($title = $this->getCollection()->getPropertyValue('title')) ==! null) { $info['title'] = $title; $msg .= ' ({title})'; @@ -196,7 +193,7 @@ public function collectInfo(array $context = []): array if ($context['dataElement'] instanceof DataWindow) { $msg .= ' @{offset} size {size}'; $info['offset'] = $context['dataElement']->getAbsoluteOffset() . '/0x' . strtoupper(dechex($context['dataElement']->getAbsoluteOffset())); -// @todo $offset = MediaProbe::dumpIntHex($context['dataElement']->getAbsoluteOffset()); + // @todo $offset = MediaProbe::dumpIntHex($context['dataElement']->getAbsoluteOffset()); } else { $msg .= ' size {size} byte(s)'; } @@ -204,6 +201,6 @@ public function collectInfo(array $context = []): array $info['_msg'] = $msg; - return array_merge(parent::collectInfo($context), $info); + return array_merge($parentInfo, $info); } } diff --git a/src/Model/ElementBase.php b/src/Model/ElementBase.php index cbf232f0d..ebe3e2c6f 100644 --- a/src/Model/ElementBase.php +++ b/src/Model/ElementBase.php @@ -81,9 +81,6 @@ public function getParentElement(): ?ElementInterface return $this->DOMNode->getMediaProbeElement() !== $this->getRootElement() ? $this->DOMNode->parentNode->getMediaProbeElement() : null; } - /** - * {@inheritdoc} - */ public function getMultipleElements(string $expression): array { $node_list = $this->getRootElement()->XPath->query($expression, $this->DOMNode); @@ -94,9 +91,6 @@ public function getMultipleElements(string $expression): array return $ret; } - /** - * {@inheritdoc} - */ public function getElement(string $expression): ?ElementInterface { $ret = $this->getMultipleElements($expression); @@ -110,9 +104,6 @@ public function getElement(string $expression): ?ElementInterface } } - /** - * {@inheritdoc} - */ public function removeElement(string $expression): bool { $ret = $this->getMultipleElements($expression); @@ -127,17 +118,11 @@ public function removeElement(string $expression): bool } } - /** - * {@inheritdoc} - */ public function setAttribute(string $name, string $value): \DOMAttr|bool { return $this->DOMNode->setAttribute($name, $value); } - /** - * {@inheritdoc} - */ public function getAttributes(): array { $attr = []; @@ -147,9 +132,6 @@ public function getAttributes(): array return $attr; } - /** - * {@inheritdoc} - */ public function getAttribute(string $name): string { return $this->DOMNode->getAttribute($name); @@ -163,9 +145,6 @@ protected function getContextPathSegmentPattern(): string return '/{DOMNode}'; } - /** - * {@inheritdoc} - */ public function getContextPath(): string { // Get the path before this element. @@ -182,9 +161,6 @@ public function getContextPath(): string return $parent_path . str_replace(array_keys($attributes), array_values($attributes), $this->getContextPathSegmentPattern()); } - /** - * {@inheritdoc} - */ public function isValid(): bool { return $this->valid; @@ -198,17 +174,11 @@ public function getDataElement(): DataElement throw new MediaProbeException("%s does not implement the %s method.", static::class, __FUNCTION__); } - /** - * {@inheritdoc} - */ public function getValue(array $options = []): mixed { throw new MediaProbeException("%s does not implement the %s method.", static::class, __FUNCTION__); } - /** - * {@inheritdoc} - */ public function toString(array $options = []): string { throw new MediaProbeException("%s does not implement the %s method.", static::class, __FUNCTION__); @@ -223,9 +193,15 @@ public function asArray(DumperInterface $dumper, array $context = []): array public function collectInfo(array $context = []): array { - return [ - 'node' => $this->getNodeName(), - ]; + $info = []; + $info['node'] = $this->getNodeName(); + if (($name = $this->getAttribute('name')) !== null) { + $info['name'] = $name; + } + if (($item = $this->getAttribute('id')) !== null) { + $info['item'] = $item; + } + return $info; } public function debugInfo(array $context = []): bool @@ -237,9 +213,6 @@ public function debugInfo(array $context = []): bool return true; } - /** - * {@inheritdoc} - */ public function log($level, $message, array $context = []): void { $context['path'] = $this->getContextPath(); diff --git a/src/Model/ElementInterface.php b/src/Model/ElementInterface.php index a08505569..cd4c2b6fa 100644 --- a/src/Model/ElementInterface.php +++ b/src/Model/ElementInterface.php @@ -15,6 +15,8 @@ interface ElementInterface { /** * Returns the name of the DOM node of this element. + * + * @todo remove and leave as a key in collectInfo */ public function getNodeName(): string; diff --git a/tests/MediaFilesTest.php b/tests/MediaFilesTest.php index e50d68ec7..3647987e0 100644 --- a/tests/MediaFilesTest.php +++ b/tests/MediaFilesTest.php @@ -32,7 +32,7 @@ public function tearDown(): void parent::tearDown(); } - public function mediaFileProvider() + public static function mediaFileProvider() { $finder = new Finder(); $finder->files()->in(dirname(__FILE__) . '/media-dumps/image')->name('*.dump.yml'); diff --git a/tests/ReadWriteTest.php b/tests/ReadWriteTest.php index c5282e884..f098ff51f 100644 --- a/tests/ReadWriteTest.php +++ b/tests/ReadWriteTest.php @@ -100,7 +100,7 @@ public function testWriteRead(array $entries) } } - public function writeEntryProvider() + public static function writeEntryProvider() { return [ 'Byte Read/Write Tests' => [ diff --git a/tests/SpecTest.php b/tests/SpecTest.php index 907f6719d..c805f5e28 100644 --- a/tests/SpecTest.php +++ b/tests/SpecTest.php @@ -111,7 +111,7 @@ public function testGetTagText($expected_text, $expected_class, $parent_collecti /** * Data provider for testGetTagText. */ - public function getTagTextProvider() + public static function getTagTextProvider() { return [ 'IFD0/PlanarConfiguration - value 1' => [ diff --git a/tests/StubRootBlock.php b/tests/StubRootBlock.php index 7f3931d5d..57a0f55d9 100644 --- a/tests/StubRootBlock.php +++ b/tests/StubRootBlock.php @@ -2,8 +2,15 @@ namespace FileEye\MediaProbe\Test; +use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Model\RootBlockBase; class StubRootBlock extends RootBlockBase { + /** + * @todo remove, replace by parser + */ + protected function doParseData(DataElement $data): void + { + } } diff --git a/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml b/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml index 19f6aeefd..132ad2d37 100644 --- a/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml +++ b/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml @@ -6687,53 +6687,47 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ISOSpeedRange:259' - message: 'Found 1 data components, expected 3 for item ''ISOSpeedRange'' in ''Exposure''' + message: "Found 1 data components, expected 3 for item 'ISOSpeedRange' in 'Exposure'" NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FirmwareVersion:544/entry' message: 'Ascii entry missing final NUL character.' - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - message: 'Unknown item 25/0x19 in ''Canon''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:15' - message: 'Unknown item 15/0xF in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:16' - message: 'Unknown item 16/0x10 in ''CanonAFInfo2''' + message: "Unknown item 25/0x19 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:LensModel:149/entry' message: 'Ascii entry missing final NUL character.' - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:2' - message: 'Unknown item 2/0x2 in ''CanonMeasuredColor''' + message: "Unknown item 2/0x2 in 'CanonMeasuredColor'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:3' - message: 'Unknown item 3/0x3 in ''CanonSensorInfo''' + message: "Unknown item 3/0x3 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:4' - message: 'Unknown item 4/0x4 in ''CanonSensorInfo''' + message: "Unknown item 4/0x4 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:13' - message: 'Unknown item 13/0xD in ''CanonSensorInfo''' + message: "Unknown item 13/0xD in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:14' - message: 'Unknown item 14/0xE in ''CanonSensorInfo''' + message: "Unknown item 14/0xE in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:15' - message: 'Unknown item 15/0xF in ''CanonSensorInfo''' + message: "Unknown item 15/0xF in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:16' - message: 'Unknown item 16/0x10 in ''CanonSensorInfo''' + message: "Unknown item 16/0x10 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16401' - message: 'Unknown item 16401/0x4011 in ''Canon''' + message: "Unknown item 16401/0x4011 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16402' - message: 'Unknown item 16402/0x4012 in ''Canon''' + message: "Unknown item 16402/0x4012 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16423' - message: 'Unknown item 16423/0x4027 in ''Canon''' + message: "Unknown item 16423/0x4027 in 'Canon'" gdInfo: 0: 640 1: 427 @@ -6744,7 +6738,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: canon-eos-650d.jpg - FileDateTime: 1644612165 + FileDateTime: 1690031131 FileSize: 42207 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml b/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml index b1dfb9ef9..ea826c091 100644 --- a/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml @@ -6297,8 +6297,8 @@ elements: bytesHash: df3f619804a92fdb4057192dc43dd748ea778adc52bc498ce80524c014b81119 text: '0' - - node: index - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420' + node: filterInfo + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\FilterInfoIndex valid: true name: CanonFilterInfo @@ -6307,7 +6307,7 @@ elements: elements: - node: rawData - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/rawData:filterHeader' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/rawData:filterHeader' class: FileEye\MediaProbe\Block\RawData valid: true name: filterHeader @@ -6315,7 +6315,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/rawData:filterHeader/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/rawData:filterHeader/entry' class: FileEye\MediaProbe\Entry\Core\Undefined valid: true format: Undefined @@ -6324,15 +6324,16 @@ elements: text: '4 byte(s) of data' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:1' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:1' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.0 id: '1' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257' class: FileEye\MediaProbe\Block\Tag valid: true name: GrainyBWFilter @@ -6341,7 +6342,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6350,15 +6351,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:2' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:2' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.1 id: '2' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513' class: FileEye\MediaProbe\Block\Tag valid: true name: SoftFocusFilter @@ -6367,7 +6369,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6376,15 +6378,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:3' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:3' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.2 id: '3' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769' class: FileEye\MediaProbe\Block\Tag valid: true name: ToyCameraFilter @@ -6393,7 +6396,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6402,15 +6405,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.3 id: '4' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025' class: FileEye\MediaProbe\Block\Tag valid: true name: MiniatureFilter @@ -6419,7 +6423,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6428,7 +6432,7 @@ elements: text: 'Off' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026' class: FileEye\MediaProbe\Block\Tag valid: true name: MiniatureFilterOrientation @@ -6437,7 +6441,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6446,7 +6450,7 @@ elements: text: Horizontal - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027' class: FileEye\MediaProbe\Block\Tag valid: true name: MiniatureFilterPosition @@ -6455,7 +6459,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6464,7 +6468,7 @@ elements: text: '0' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028' class: FileEye\MediaProbe\Block\Tag valid: true name: MiniatureFilterParameter @@ -6473,7 +6477,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6482,15 +6486,16 @@ elements: text: '0' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:5' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:5' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.4 id: '5' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281' class: FileEye\MediaProbe\Block\Tag valid: true name: FisheyeFilter @@ -6499,7 +6504,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6508,15 +6513,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:6' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:6' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.5 id: '6' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537' class: FileEye\MediaProbe\Block\Tag valid: true name: PaintingFilter @@ -6525,7 +6531,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6534,15 +6540,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:7' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:7' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.6 id: '7' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793' class: FileEye\MediaProbe\Block\Tag valid: true name: WatercolorFilter @@ -6551,7 +6558,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -7234,50 +7241,44 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFMicroadjustment:1287' - message: 'Found 16 data components, expected 5 for item ''AFMicroadjustment'' in ''AutoFocusDrive''' + message: "Found 16 data components, expected 5 for item 'AFMicroadjustment' in 'AutoFocusDrive'" NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - message: 'Unknown item 25/0x19 in ''Canon''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:15' - message: 'Unknown item 15/0xF in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:16' - message: 'Unknown item 16/0x10 in ''CanonAFInfo2''' + message: "Unknown item 25/0x19 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:LensModel:149/entry' message: 'Ascii entry missing final NUL character.' - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:2' - message: 'Unknown item 2/0x2 in ''CanonMeasuredColor''' + message: "Unknown item 2/0x2 in 'CanonMeasuredColor'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:3' - message: 'Unknown item 3/0x3 in ''CanonSensorInfo''' + message: "Unknown item 3/0x3 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:4' - message: 'Unknown item 4/0x4 in ''CanonSensorInfo''' + message: "Unknown item 4/0x4 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:13' - message: 'Unknown item 13/0xD in ''CanonSensorInfo''' + message: "Unknown item 13/0xD in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:14' - message: 'Unknown item 14/0xE in ''CanonSensorInfo''' + message: "Unknown item 14/0xE in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:15' - message: 'Unknown item 15/0xF in ''CanonSensorInfo''' + message: "Unknown item 15/0xF in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:16' - message: 'Unknown item 16/0x10 in ''CanonSensorInfo''' + message: "Unknown item 16/0x10 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16401' - message: 'Unknown item 16401/0x4011 in ''Canon''' + message: "Unknown item 16401/0x4011 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16402' - message: 'Unknown item 16402/0x4012 in ''Canon''' + message: "Unknown item 16402/0x4012 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16423' - message: 'Unknown item 16423/0x4027 in ''Canon''' + message: "Unknown item 16423/0x4027 in 'Canon'" gdInfo: 0: 5472 1: 3648 @@ -7288,7 +7289,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: canon_eos_70d_29.jpg - FileDateTime: 1644612165 + FileDateTime: 1690031131 FileSize: 7643244 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml b/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml index 111150883..34af75b74 100644 --- a/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml @@ -6359,8 +6359,8 @@ elements: bytesHash: df3f619804a92fdb4057192dc43dd748ea778adc52bc498ce80524c014b81119 text: Standard - - node: index - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420' + node: filterInfo + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\FilterInfoIndex valid: true name: CanonFilterInfo @@ -6369,7 +6369,7 @@ elements: elements: - node: rawData - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/rawData:filterHeader' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/rawData:filterHeader' class: FileEye\MediaProbe\Block\RawData valid: true name: filterHeader @@ -6377,7 +6377,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/rawData:filterHeader/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/rawData:filterHeader/entry' class: FileEye\MediaProbe\Entry\Core\Undefined valid: true format: Undefined @@ -6386,15 +6386,16 @@ elements: text: '4 byte(s) of data' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:1' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:1' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.0 id: '1' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257' class: FileEye\MediaProbe\Block\Tag valid: true name: GrainyBWFilter @@ -6403,7 +6404,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6412,15 +6413,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:2' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:2' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.1 id: '2' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513' class: FileEye\MediaProbe\Block\Tag valid: true name: SoftFocusFilter @@ -6429,7 +6431,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6438,15 +6440,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:3' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:3' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.2 id: '3' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769' class: FileEye\MediaProbe\Block\Tag valid: true name: ToyCameraFilter @@ -6455,7 +6458,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6464,15 +6467,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.3 id: '4' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025' class: FileEye\MediaProbe\Block\Tag valid: true name: MiniatureFilter @@ -6481,7 +6485,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6490,7 +6494,7 @@ elements: text: 'Off' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026' class: FileEye\MediaProbe\Block\Tag valid: true name: MiniatureFilterOrientation @@ -6499,7 +6503,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6508,7 +6512,7 @@ elements: text: Horizontal - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027' class: FileEye\MediaProbe\Block\Tag valid: true name: MiniatureFilterPosition @@ -6517,7 +6521,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6526,7 +6530,7 @@ elements: text: '0' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028' class: FileEye\MediaProbe\Block\Tag valid: true name: MiniatureFilterParameter @@ -6535,7 +6539,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6544,15 +6548,16 @@ elements: text: '0' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:5' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:5' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.4 id: '5' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281' class: FileEye\MediaProbe\Block\Tag valid: true name: FisheyeFilter @@ -6561,7 +6566,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6570,15 +6575,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:6' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:6' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.5 id: '6' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537' class: FileEye\MediaProbe\Block\Tag valid: true name: PaintingFilter @@ -6587,7 +6593,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -6596,15 +6602,16 @@ elements: text: 'Off' - node: filter - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:7' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:7' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\Filter valid: true + name: CanonFilterInfo.6 id: '7' collection: ExifMakerNotes\Canon\Filter elements: - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793' class: FileEye\MediaProbe\Block\Tag valid: true name: WatercolorFilter @@ -6613,7 +6620,7 @@ elements: elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -7416,110 +7423,83 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ISOSpeedRange:259' - message: 'Found 1 data components, expected 3 for item ''ISOSpeedRange'' in ''Exposure''' + message: "Found 1 data components, expected 3 for item 'ISOSpeedRange' in 'Exposure'" NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - message: 'Unknown item 25/0x19 in ''Canon''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:15' - message: 'Unknown item 15/0xF in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:16' - message: 'Unknown item 16/0x10 in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:17' - message: 'Unknown item 17/0x11 in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:18' - message: 'Unknown item 18/0x12 in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:19' - message: 'Unknown item 19/0x13 in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:20' - message: 'Unknown item 20/0x14 in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:21' - message: 'Unknown item 21/0x15 in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:22' - message: 'Unknown item 22/0x16 in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:23' - message: 'Unknown item 23/0x17 in ''CanonAFInfo2''' + message: "Unknown item 25/0x19 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:50' - message: 'Unknown item 50/0x32 in ''Canon''' + message: "Unknown item 50/0x32 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:51' - message: 'Unknown item 51/0x33 in ''Canon''' + message: "Unknown item 51/0x33 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:61' - message: 'Unknown item 61/0x3D in ''Canon''' + message: "Unknown item 61/0x3D in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:63' - message: 'Unknown item 63/0x3F in ''Canon''' + message: "Unknown item 63/0x3F in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:14' - message: 'Unknown item 14/0xE in ''CanonProcessing''' + message: "Unknown item 14/0xE in 'CanonProcessing'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:15' - message: 'Unknown item 15/0xF in ''CanonProcessing''' + message: "Unknown item 15/0xF in 'CanonProcessing'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:16' - message: 'Unknown item 16/0x10 in ''CanonProcessing''' + message: "Unknown item 16/0x10 in 'CanonProcessing'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:17' - message: 'Unknown item 17/0x11 in ''CanonProcessing''' + message: "Unknown item 17/0x11 in 'CanonProcessing'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:2' - message: 'Unknown item 2/0x2 in ''CanonMeasuredColor''' + message: "Unknown item 2/0x2 in 'CanonMeasuredColor'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:3' - message: 'Unknown item 3/0x3 in ''CanonSensorInfo''' + message: "Unknown item 3/0x3 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:4' - message: 'Unknown item 4/0x4 in ''CanonSensorInfo''' + message: "Unknown item 4/0x4 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:13' - message: 'Unknown item 13/0xD in ''CanonSensorInfo''' + message: "Unknown item 13/0xD in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:14' - message: 'Unknown item 14/0xE in ''CanonSensorInfo''' + message: "Unknown item 14/0xE in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:15' - message: 'Unknown item 15/0xF in ''CanonSensorInfo''' + message: "Unknown item 15/0xF in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:16' - message: 'Unknown item 16/0x10 in ''CanonSensorInfo''' + message: "Unknown item 16/0x10 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16401' - message: 'Unknown item 16401/0x4011 in ''Canon''' + message: "Unknown item 16401/0x4011 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16402' - message: 'Unknown item 16402/0x4012 in ''Canon''' + message: "Unknown item 16402/0x4012 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16423' - message: 'Unknown item 16423/0x4027 in ''Canon''' + message: "Unknown item 16423/0x4027 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16428' - message: 'Unknown item 16428/0x402C in ''Canon''' + message: "Unknown item 16428/0x402C in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16435' - message: 'Unknown item 16435/0x4033 in ''Canon''' + message: "Unknown item 16435/0x4033 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16441' - message: 'Unknown item 16441/0x4039 in ''Canon''' + message: "Unknown item 16441/0x4039 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16444' - message: 'Unknown item 16444/0x403C in ''Canon''' + message: "Unknown item 16444/0x403C in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16445' - message: 'Unknown item 16445/0x403D in ''Canon''' + message: "Unknown item 16445/0x403D in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16457' - message: 'Unknown item 16457/0x4049 in ''Canon''' + message: "Unknown item 16457/0x4049 in 'Canon'" gdInfo: 0: 6000 1: 4000 @@ -7530,7 +7510,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: canon_eos_850d_08.jpg - FileDateTime: 1644443574 + FileDateTime: 1690031131 FileSize: 8746090 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml b/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml index bf038e55e..d545b9200 100644 --- a/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml +++ b/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml @@ -5821,83 +5821,74 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''FlashExposureLock'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'FlashExposureLock' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''PerChannelBlackLevel'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'PerChannelBlackLevel' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''NormalWhiteLevel'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'NormalWhiteLevel' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''SpecularWhiteLevel'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'SpecularWhiteLevel' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''LinearityUpperMargin'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'LinearityUpperMargin' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''PerChannelBlackLevel'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'PerChannelBlackLevel' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''NormalWhiteLevel'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'NormalWhiteLevel' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''SpecularWhiteLevel'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'SpecularWhiteLevel' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''LinearityUpperMargin'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'LinearityUpperMargin' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''NormalWhiteLevel'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'NormalWhiteLevel' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''SpecularWhiteLevel'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'SpecularWhiteLevel' in 'CanonColorData', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' - message: 'Could not access value for item ''LinearityUpperMargin'' in ''CanonColorData'', overflow' + message: "Could not access value for item 'LinearityUpperMargin' in 'CanonColorData', overflow" NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - message: 'Unknown item 25/0x19 in ''Canon''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:15' - message: 'Unknown item 15/0xF in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:16' - message: 'Unknown item 16/0x10 in ''CanonAFInfo2''' - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:17' - message: 'Unknown item 17/0x11 in ''CanonAFInfo2''' + message: "Unknown item 25/0x19 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:2' - message: 'Unknown item 2/0x2 in ''CanonMeasuredColor''' + message: "Unknown item 2/0x2 in 'CanonMeasuredColor'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:3' - message: 'Unknown item 3/0x3 in ''CanonSensorInfo''' + message: "Unknown item 3/0x3 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:4' - message: 'Unknown item 4/0x4 in ''CanonSensorInfo''' + message: "Unknown item 4/0x4 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:13' - message: 'Unknown item 13/0xD in ''CanonSensorInfo''' + message: "Unknown item 13/0xD in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:14' - message: 'Unknown item 14/0xE in ''CanonSensorInfo''' + message: "Unknown item 14/0xE in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:15' - message: 'Unknown item 15/0xF in ''CanonSensorInfo''' + message: "Unknown item 15/0xF in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:16' - message: 'Unknown item 16/0x10 in ''CanonSensorInfo''' + message: "Unknown item 16/0x10 in 'CanonSensorInfo'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16401' - message: 'Unknown item 16401/0x4011 in ''Canon''' + message: "Unknown item 16401/0x4011 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16402' - message: 'Unknown item 16402/0x4012 in ''Canon''' + message: "Unknown item 16402/0x4012 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16404' - message: 'Unknown item 16404/0x4014 in ''Canon''' + message: "Unknown item 16404/0x4014 in 'Canon'" gdInfo: 0: 8 1: 8 @@ -5908,7 +5899,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: Canon1DmkIII.jpg - FileDateTime: 1644443574 + FileDateTime: 1690031131 FileSize: 8337 FileType: 2 MimeType: image/jpeg From 7232d0a67365dde2aeecac1d70e0d33b814317de Mon Sep 17 00:00:00 2001 From: mondrake Date: Mon, 22 Jan 2024 19:52:03 +0100 Subject: [PATCH 04/10] MediaTypeResolver (#77) --- .github/workflows/tests.yml | 4 +- INSTALL.md | 4 +- examples/dump-media.php | 2 +- specs/Media.yaml | 6 +- specs/MediaType.yaml | 6 ++ src/Collection/CollectionIndex.php | 6 +- src/Collection/Media.php | 17 --- src/Collection/MediaType.php | 35 +++++++ src/Command/DumpCommand.php | 2 +- src/Media.php | 162 +++++++++++------------------ src/MediaTypeResolver.php | 40 +++++++ tests/Bug3017880Test.php | 2 +- tests/GH16Test.php | 4 +- tests/GH21Test.php | 4 +- tests/GH77Test.php | 2 +- tests/MediaFilesTest.php | 10 +- tests/MisplacedExifTest.php | 2 +- tests/ReadWriteTest.php | 4 +- tests/Tags1Test.php | 2 +- 19 files changed, 166 insertions(+), 148 deletions(-) create mode 100644 specs/MediaType.yaml create mode 100644 src/Collection/MediaType.php create mode 100644 src/MediaTypeResolver.php diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a8d573445..234da600c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,9 +15,9 @@ jobs: fail-fast: false matrix: php-version: - - "8.1" +# - "8.1" - "8.2" - - "8.3" +# - "8.3" steps: - name: Install PHP diff --git a/INSTALL.md b/INSTALL.md index e467b798e..cc2bb74dc 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -67,9 +67,9 @@ All in just four lines of code: ```php5 getElement("tag[@name='ImageDescription']/entry"); $entry->setDataElement(['Edited by MediaProbe']); $image->saveToFile($argv[1]); diff --git a/examples/dump-media.php b/examples/dump-media.php index 9a99d74c9..25419884d 100644 --- a/examples/dump-media.php +++ b/examples/dump-media.php @@ -135,7 +135,7 @@ function FileSizeConvert($bytes) try { /* Load data from file */ $baseline_memory = FileSizeConvert(memory_get_usage()); - $media = Media::loadFromFile($file, $logger, $fail_on_error); + $media = Media::parseFromFile($file, $logger, $fail_on_error); $max_memory = FileSizeConvert(memory_get_peak_usage()); $curr_memory = FileSizeConvert(memory_get_usage()); if ($media === null) { diff --git a/specs/Media.yaml b/specs/Media.yaml index 99b57050e..fde60d234 100644 --- a/specs/Media.yaml +++ b/specs/Media.yaml @@ -1,8 +1,4 @@ collection: Media class: FileEye\MediaProbe\Media DOMNode: media -items: - Jpeg: - collection: Jpeg\Jpeg - Tiff: - collection: Tiff\Tiff +items: {} diff --git a/specs/MediaType.yaml b/specs/MediaType.yaml new file mode 100644 index 000000000..2ec4908b1 --- /dev/null +++ b/specs/MediaType.yaml @@ -0,0 +1,6 @@ +collection: MediaType +items: + image/jpeg: + collection: Jpeg\Jpeg + image/tiff: + collection: Tiff\Tiff diff --git a/src/Collection/CollectionIndex.php b/src/Collection/CollectionIndex.php index 601c12132..0b50a32e6 100644 --- a/src/Collection/CollectionIndex.php +++ b/src/Collection/CollectionIndex.php @@ -153,6 +153,7 @@ public function getNamespace(): string 'Jpeg\\SegmentCom' => 'Jpeg\\SegmentCom', 'Jpeg\\SegmentSos' => 'Jpeg\\SegmentSos', 'Media' => 'Media', + 'MediaType' => 'MediaType', 'RawData' => 'RawData', 'Tag' => 'Tag', 'Thumbnail' => 'Thumbnail', @@ -168,6 +169,8 @@ public function getNamespace(): string ), 'collectionsByName' => array ( + 0 => 'Tiff\\Ifd0', + 1 => 'Tiff\\Ifd1', 'APP1' => 'Jpeg\\SegmentApp1', 'Apple' => 'ExifMakerNotes\\Apple\\Main', 'AppleRuntime' => 'ExifMakerNotes\\Apple\\RunTime', @@ -303,13 +306,13 @@ public function getNamespace(): string 'GPS' => 'Tiff\\IfdGps', 'IFD0' => 'Tiff\\Ifd0', 'IFD1' => 'Tiff\\Ifd1', - 0 => 'Tiff\\Ifd0', 'Interop' => 'Tiff\\IfdInteroperability', 'InteropIFD' => 'Tiff\\IfdInteroperability', 'Jpeg\\Jpeg' => 'Jpeg\\Jpeg', 'Jpeg\\Segment' => 'Jpeg\\Segment', 'Main' => 'Tiff\\Ifd0', 'Media' => 'Media', + 'MediaType' => 'MediaType', 'RawData' => 'RawData', 'SOS' => 'Jpeg\\SegmentSos', 'Tag' => 'Tag', @@ -318,7 +321,6 @@ public function getNamespace(): string 'Tiff\\Tiff' => 'Tiff\\Tiff', 'UnknownTag' => 'UnknownTag', 'VoidCollection' => 'VoidCollection', - 1 => 'Tiff\\Ifd1', ), ); } diff --git a/src/Collection/Media.php b/src/Collection/Media.php index 5528078a4..f4cb94649 100644 --- a/src/Collection/Media.php +++ b/src/Collection/Media.php @@ -16,22 +16,5 @@ class Media extends CollectionBase { 'class' => 'FileEye\\MediaProbe\\Media', 'DOMNode' => 'media', 'id' => 'Media', - 'items' => - array ( - 'Jpeg' => - array ( - 0 => - array ( - 'collection' => 'Jpeg\\Jpeg', - ), - ), - 'Tiff' => - array ( - 0 => - array ( - 'collection' => 'Tiff\\Tiff', - ), - ), - ), ); } diff --git a/src/Collection/MediaType.php b/src/Collection/MediaType.php new file mode 100644 index 000000000..b7c817091 --- /dev/null +++ b/src/Collection/MediaType.php @@ -0,0 +1,35 @@ + 'MediaType', + 'items' => + array ( + 'image/jpeg' => + array ( + 0 => + array ( + 'collection' => 'Jpeg\\Jpeg', + ), + ), + 'image/tiff' => + array ( + 0 => + array ( + 'collection' => 'Tiff\\Tiff', + ), + ), + ), +); +} diff --git a/src/Command/DumpCommand.php b/src/Command/DumpCommand.php index 7f026ee97..1ac0d0c73 100644 --- a/src/Command/DumpCommand.php +++ b/src/Command/DumpCommand.php @@ -120,7 +120,7 @@ protected function fileToTestDumpArray($file): array { $yaml = []; - $media = Media::loadFromFile((string) $file); + $media = Media::parseFromFile((string) $file); $yaml['fileName'] = $file->getBaseName(); $yaml['mimeType'] = $media->getMimeType(); $yaml['fileContentHash'] = hash('sha256', $file->getContents()); diff --git a/src/Media.php b/src/Media.php index 48fbc9444..37cb9a679 100644 --- a/src/Media.php +++ b/src/Media.php @@ -2,18 +2,18 @@ namespace FileEye\MediaProbe; -use FileEye\MediaProbe\Model\RootBlockBase; use FileEye\MediaProbe\Block\Jpeg; use FileEye\MediaProbe\Block\Tiff; -use FileEye\MediaProbe\Collection\CollectionInterface; use FileEye\MediaProbe\Collection\CollectionFactory; +use FileEye\MediaProbe\Collection\CollectionInterface; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataFile; use FileEye\MediaProbe\Data\DataString; +use FileEye\MediaProbe\Model\RootBlockBase; use FileEye\MediaProbe\Utility\ConvertBytes; -use Monolog\Logger; use Monolog\Handler\TestHandler; use Monolog\Level; +use Monolog\Logger; use Monolog\Processor\PsrLogMessageProcessor; use PrettyXml\Formatter; use Psr\Log\LoggerInterface; @@ -38,7 +38,7 @@ class Media extends RootBlockBase * MediaProbe normally intercepts and logs media parsing issues without * breaking the flow. However it is possible to enable hard failures by * defining the minimum log level at which the parsing process will break - * and throw an InvalidFileException. + * and throw an MediaProbeException. */ protected ?Level $failLevel; @@ -52,55 +52,75 @@ class Media extends RootBlockBase */ private Stopwatch $stopWatch; + /** + * Constructs a Media object. + * + * @param ?LoggerInterface $externalLogger + * (Optional) a PSR-3 compliant logger callback. Consuming code can have higher level + * logging facilities in place. Any entry sent to the internal logger will also be sent to + * the callback, if specified. + * @param ?string $failLevel + * (Optional) a PSR-3 compliant log level. Any log entry at this level or above will force + * media parsing to stop. + */ + public function __construct( + protected ?LoggerInterface $externalLogger, + ?string $failLevel, + ) + { + $media = new ItemDefinition(CollectionFactory::get('Media')); + parent::__construct($media); + $this->logger = (new Logger('mediaprobe')) + ->pushHandler(new TestHandler(Logger::INFO)) + ->pushProcessor(new PsrLogMessageProcessor()); + $this->failLevel = $failLevel ? Logger::toMonologLevel($failLevel) : null; + $this->stopWatch = new Stopwatch(); + } + /** * Creates a Media object from a file. * * @param string $path - * The path to a media file on the file system. - * @param \Psr\Log\LoggerInterface|null $external_logger - * (Optional) a PSR-3 compliant logger callback. - * @param string|null $fail_level - * (Optional) a PSR-3 compliant log level. Any log entry at this - * level or above will force media parsing to stop. - * - * @return Media - * The Media object. - * - * @throws InvalidFileException - * On failure. + * The path to a media file on the file system. + * @param ?LoggerInterface $externalLogger + * (Optional) a PSR-3 compliant logger callback. + * @param ?string $failLevel + * (Optional) a PSR-3 compliant log level. Any log entry at this level or above will force + * media parsing to stop. + * + * @throws MediaProbeException */ - public static function loadFromFile(string $path, ?LoggerInterface $external_logger = null, ?string $fail_level = null): Media + public static function parseFromFile(string $path, ?LoggerInterface $externalLogger = null, ?string $failLevel = null): Media { // @todo lock file while reading, capture fstats to prevent overwrites. $dataFile = new DataFile($path); - return static::parse($dataFile, $external_logger, $fail_level); + return static::parse($dataFile, $externalLogger, $failLevel); } /** * Creates a Media object from data. * - * @param DataElement $data_element - * The data element providing the data. - * @param \Psr\Log\LoggerInterface|null $external_logger - * (Optional) a PSR-3 compliant logger callback. - * @param string|null $fail_level - * (Optional) a PSR-3 compliant log level. Any log entry at this - * level or above will force media parsing to stop. + * @param DataElement $dataElement + * The data element providing the data. + * @param ?LoggerInterface $externalLogger + * (Optional) a PSR-3 compliant logger callback. + * @param ?string $failLevel + * (Optional) a PSR-3 compliant log level. Any log entry at this level or above will force + * media parsing to stop. * - * @return Media - * The Media object. + * @throws MediaProbeException */ - public static function parse(DataElement $data_element, ?LoggerInterface $external_logger = null, ?string $fail_level = null): Media + public static function parse(DataElement $dataElement, ?LoggerInterface $externalLogger = null, ?string $failLevel = null): Media { // Determine the media format. - $media_format = new ItemDefinition(static::getMatchingMediaCollection($data_element)); + $mediaType = new ItemDefinition(MediaTypeResolver::fromDataElement($dataElement)); // Build the Media object and its immediate child, that represents the // media format. Then parse the media according to the media format. - $media = new static($external_logger, $fail_level); + $media = new static($externalLogger, $failLevel); $media->getStopwatch()->start('media-parsing'); - assert($media->debugInfo(['dataElement' => $data_element])); - $media->addBlock($media_format)->parseData($data_element); + assert($media->debugInfo(['dataElement' => $dataElement])); + $media->addBlock($mediaType)->parseData($dataElement); $media->getStopwatch()->stop('media-parsing'); return $media; @@ -113,65 +133,8 @@ protected function doParseData(DataElement $data): void { } - /** - * Determines the media format collection of the media data. - * - * @param DataElement $data_element - * the data element that will provide the data. - * - * @return Collection - * The media format collection. - * - * @throws InvalidFileException - * On failure. - */ - protected static function getMatchingMediaCollection(DataElement $data_element): CollectionInterface - { - $media_collection = CollectionFactory::get('Media'); - // Loop through the 'Media' collection items, each of which defines a - // media format collection, and checks if the media matches the format. - // When a match is found, return the media format collection. - foreach ($media_collection->listItemIds() as $media_format_collection_id) { - $format_collection = $media_collection->getItemCollection($media_format_collection_id); - $format_class = $format_collection->getPropertyValue('class'); - if ($format_class::isDataMatchingFormat($data_element)) { - return $format_collection; - } - } - - throw new InvalidFileException('Media format not managed by MediaProbe'); - } - - /** - * Constructs a Media object. - * - * @param \Psr\Log\LoggerInterface|null $externalLogger - * (Optional) a PSR-3 compliant logger callback. - * Consuming code can have higher level logging facilities in place. - * Any entry sent to the internal logger will also be sent to the - * callback, if specified. - * @param string|null $fail_level - * (Optional) a PSR-3 compliant log level. Any log entry at this - * level or above will force media parsing to stop. - */ - public function __construct( - protected ?LoggerInterface $externalLogger, - ?string $fail_level, - ) - { - $media = new ItemDefinition(CollectionFactory::get('Media')); - parent::__construct($media); - $this->logger = (new Logger('mediaprobe')) - ->pushHandler(new TestHandler(Logger::INFO)) - ->pushProcessor(new PsrLogMessageProcessor()); - $this->failLevel = $fail_level ? Logger::toMonologLevel($fail_level) : null; - $this->stopWatch = new Stopwatch(); - } - /** * Determines the MIME type of the media. - * - * @return string */ public function getMimeType(): string { @@ -182,19 +145,18 @@ public function getMimeType(): string * Save the Media object as a file. * * @param string $path - * The path to the media file on the file system. + * The path to the media file on the file system. * * @return int - * The number of bytes that were written to the file. + * The number of bytes that were written to the file. * - * @throws InvalidFileException - * On failure. + * @throws MediaProbeException */ public function saveToFile(string $path): int { $size = file_put_contents($path, $this->toBytes()); if ($size === false) { - throw new InvalidFileException('File save failed'); + throw new MediaProbeException('File save failed'); } return $size; } @@ -203,9 +165,7 @@ public function saveToFile(string $path): int * Returns the DOM structure of the Media object as an XML string. * * @param bool $pretty - * TRUE if the XML should be prettified. - * - * @return string + * TRUE if the XML should be prettified. */ public function toXml(bool $pretty = false): string { @@ -220,11 +180,10 @@ public function toXml(bool $pretty = false): string * Returns the log entries of the Media object. * * @param string $level_name - * (Optional) If specified, filters only the entries of the - * specified severity level. + * (Optional) If specified, filters only the entries of the specified severity level. * * @return array - * An array of Monolog entries. + * An array of Monolog entries. */ public function dumpLog(?string $level_name = null): array { @@ -238,9 +197,6 @@ public function dumpLog(?string $level_name = null): array return $ret; } - /** - * Returns the stopwatch. - */ public function getStopwatch(): Stopwatch { return $this->stopWatch; diff --git a/src/MediaTypeResolver.php b/src/MediaTypeResolver.php new file mode 100644 index 000000000..c112c8760 --- /dev/null +++ b/src/MediaTypeResolver.php @@ -0,0 +1,40 @@ +listItemIds() as $typeItem) { + $typeCollection = $mediaCollection->getItemCollection($typeItem); + $class = $typeCollection->getPropertyValue('class'); + if ($class::isDataMatchingFormat($dataElement)) { + return $typeCollection; + } + } + throw new MediaProbeException('Media type not managed by MediaProbe'); + } +} diff --git a/tests/Bug3017880Test.php b/tests/Bug3017880Test.php index ba455bded..4a68c23c8 100644 --- a/tests/Bug3017880Test.php +++ b/tests/Bug3017880Test.php @@ -22,7 +22,7 @@ public function testThisDoesNotWorkAsExpected() try { $exif = null; $resave_file = 0; - $media = Media::loadFromFile($filename); + $media = Media::parseFromFile($filename); $jpeg = $media->getElement("jpeg"); $this->assertInstanceOf(Jpeg::class, $jpeg); diff --git a/tests/GH16Test.php b/tests/GH16Test.php index 519640db5..e25f7906a 100644 --- a/tests/GH16Test.php +++ b/tests/GH16Test.php @@ -35,7 +35,7 @@ public function tearDown(): void public function testThisDoesNotWorkAsExpected() { // Parse test file. - $media = Media::loadFromFile($this->file); + $media = Media::parseFromFile($this->file); $jpeg = $media->getElement("jpeg"); $exif = $jpeg->getElement("jpegSegment/exif"); $ifd0 = $exif->getElement("tiff/ifd[@name='IFD0']"); @@ -52,7 +52,7 @@ public function testThisDoesNotWorkAsExpected() $media->saveToFile($this->file); // Parse the test file again and check the Tag's new value was saved. - $r_media = Media::loadFromFile($this->file); + $r_media = Media::parseFromFile($this->file); $r_jpeg = $r_media->getElement("jpeg"); $r_exif = $r_jpeg->getElement("jpegSegment/exif"); $r_ifd0 = $r_exif->getElement("tiff/ifd[@name='IFD0']"); diff --git a/tests/GH21Test.php b/tests/GH21Test.php index 9e83cc0ed..329e3de03 100644 --- a/tests/GH21Test.php +++ b/tests/GH21Test.php @@ -31,7 +31,7 @@ public function tearDown(): void public function testThisDoesNotWorkAsExpected() { - $input_media = Media::loadFromFile($this->file); + $input_media = Media::parseFromFile($this->file); $input_jpeg = $input_media->getElement("jpeg"); $input_exif = $input_jpeg->getElement("jpegSegment/exif"); @@ -80,7 +80,7 @@ public function testThisDoesNotWorkAsExpected() $out_media->saveToFile($this->file); - $media = Media::loadFromFile($this->file); + $media = Media::parseFromFile($this->file); $jpeg = $media->getElement("jpeg"); $exifin = $jpeg->getElement("jpegSegment/exif"); $this->assertEquals($input_exif, $exifin); diff --git a/tests/GH77Test.php b/tests/GH77Test.php index 2fd642563..b4219f2f5 100644 --- a/tests/GH77Test.php +++ b/tests/GH77Test.php @@ -13,7 +13,7 @@ public function testReturnModel() { $file = dirname(__FILE__) . '/media-samples/image/gh-77.jpg'; - $media = Media::loadFromFile($file); + $media = Media::parseFromFile($file); $input_jpeg = $media->getElement("jpeg"); $app1 = $input_jpeg->getElement("jpegSegment/exif"); diff --git a/tests/MediaFilesTest.php b/tests/MediaFilesTest.php index 3647987e0..1054546be 100644 --- a/tests/MediaFilesTest.php +++ b/tests/MediaFilesTest.php @@ -46,7 +46,7 @@ public static function mediaFileProvider() /** * @dataProvider mediaFileProvider */ - public function testLoadFromFile($mediaDumpFile) + public function testParseFromFile($mediaDumpFile) { $this->testDump = Yaml::parse($mediaDumpFile->getContents()); @@ -60,7 +60,7 @@ public function testLoadFromFile($mediaDumpFile) $this->exiftoolRawDump =new \DOMDocument(); $this->exiftoolRawDump->loadXML(file_get_contents($exiftoolRawDumpFile)); - $media = Media::loadFromFile($testFile); + $media = Media::parseFromFile($testFile); $this->assertEquals($this->testDump['mimeType'], $media->getMimeType()); @@ -119,7 +119,7 @@ public function testRewriteThroughGd($mediaDumpFile) $this->fileSystem->mkdir($this->tempWorkDirectory . '/media-samples/image/' . $mediaDumpFile->getRelativePath()); $rewriteFile = $this->tempWorkDirectory . '/media-samples/image/' . $mediaDumpFile->getRelativePath() . '/' . $this->testDump['fileName'] . '-rewrite-gd.img'; - $original_media = Media::loadFromFile($testFile); + $original_media = Media::parseFromFile($testFile); $original_media->saveToFile($rewriteFile); // Test via getimagesize. @@ -164,9 +164,9 @@ public function testRewrite($mediaDumpFile) $this->exiftoolRawDump =new \DOMDocument(); $this->exiftoolRawDump->loadXML(file_get_contents($exiftoolRawDumpFile)); - $original_media = Media::loadFromFile($testFile); + $original_media = Media::parseFromFile($testFile); $original_media->saveToFile($rewriteFile); - $media = Media::loadFromFile($rewriteFile); + $media = Media::parseFromFile($rewriteFile); $this->assertEquals($this->testDump['mimeType'], $media->getMimeType()); diff --git a/tests/MisplacedExifTest.php b/tests/MisplacedExifTest.php index 9e037bbdc..d26461a57 100644 --- a/tests/MisplacedExifTest.php +++ b/tests/MisplacedExifTest.php @@ -16,7 +16,7 @@ class MisplacedExifTest extends MediaProbeTestCaseBase public function testRead() { // Image contains non-EXIF APP1 segment ahead of the EXIF one. - $media = Media::loadFromFile(dirname(__FILE__) . '/media-samples/image/broken/misplaced-exif.jpg'); + $media = Media::parseFromFile(dirname(__FILE__) . '/media-samples/image/broken/misplaced-exif.jpg'); $jpeg = $media->getElement("jpeg"); // Assert we just have loaded correct file for the test. diff --git a/tests/ReadWriteTest.php b/tests/ReadWriteTest.php index f098ff51f..c125b2c6d 100644 --- a/tests/ReadWriteTest.php +++ b/tests/ReadWriteTest.php @@ -39,7 +39,7 @@ public function tearDown(): void */ public function testWriteRead(array $entries) { - $media = Media::loadFromFile(dirname(__FILE__) . '/media-samples/image/no-exif.jpg', null, 'error'); + $media = Media::parseFromFile(dirname(__FILE__) . '/media-samples/image/no-exif.jpg', null, 'error'); $jpeg = $media->getElement("jpeg"); $this->assertNull($jpeg->getElement("jpegSegment/exif")); @@ -80,7 +80,7 @@ public function testWriteRead(array $entries) $jpeg = null; // Now read the file and see if the entries are still there. - $r_media = Media::loadFromFile(dirname(__FILE__) . '/test-output.jpg', null, 'error'); + $r_media = Media::parseFromFile(dirname(__FILE__) . '/test-output.jpg', null, 'error'); $r_jpeg = $r_media->getElement("jpeg"); $this->assertInstanceOf('FileEye\MediaProbe\Block\Exif\Exif', $r_jpeg->getElement("jpegSegment/exif")); diff --git a/tests/Tags1Test.php b/tests/Tags1Test.php index de36116f1..cf516dd28 100644 --- a/tests/Tags1Test.php +++ b/tests/Tags1Test.php @@ -11,7 +11,7 @@ class Tags1Test extends MediaProbeTestCaseBase { public function testTags() { - $media = Media::loadFromFile(dirname(__FILE__) . '/media-samples/image/test-tags-1.jpg', null, 'error'); + $media = Media::parseFromFile(dirname(__FILE__) . '/media-samples/image/test-tags-1.jpg', null, 'error'); $jpeg = $media->getElement("jpeg"); $this->assertInstanceOf('FileEye\MediaProbe\Block\Exif\Exif', $jpeg->getElement("jpegSegment/exif")); From 68000aa262388b22d58e0381998cf25f4efa3dc6 Mon Sep 17 00:00:00 2001 From: mondrake Date: Tue, 23 Jan 2024 17:25:13 +0100 Subject: [PATCH 05/10] Dev 240122 (#78) --- .github/workflows/tests.yml | 2 +- specs/Jpeg/Jpeg.yaml | 2 + specs/Media.yaml | 1 - specs/Tiff/Tiff.yaml | 2 + src/Block/Exif/Exif.php | 9 +- src/Block/Jpeg.php | 154 +-------------------------------- src/Block/Tiff.php | 138 ----------------------------- src/Command/CompileCommand.php | 1 + src/ItemDefinition.php | 2 +- src/Media.php | 20 ++--- src/MediaTypeResolver.php | 12 +-- src/Model/BlockBase.php | 29 +++---- src/Parser/Jpeg/Jpeg.php | 149 +++++++++++++++++++++++++++++++ src/Parser/ParserBase.php | 14 +++ src/Parser/Tiff/Tiff.php | 147 +++++++++++++++++++++++++++++++ 15 files changed, 354 insertions(+), 328 deletions(-) create mode 100644 src/Parser/Jpeg/Jpeg.php create mode 100644 src/Parser/ParserBase.php create mode 100644 src/Parser/Tiff/Tiff.php diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 234da600c..1be551dd0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,7 +51,7 @@ jobs: php bin/fileeye-mediaprobe --version # Remove the comment to the lines below during development, to let # re-compile the specification PHP file from the YAML files. - # php bin/fileeye-mediaprobe compile + php bin/fileeye-mediaprobe compile - name: Image file dumps continue-on-error: true diff --git a/specs/Jpeg/Jpeg.yaml b/specs/Jpeg/Jpeg.yaml index 5d1ad4452..0187cef76 100644 --- a/specs/Jpeg/Jpeg.yaml +++ b/specs/Jpeg/Jpeg.yaml @@ -1,6 +1,8 @@ collection: Jpeg\Jpeg title: JPEG image class: FileEye\MediaProbe\Block\Jpeg +parser: FileEye\MediaProbe\Parser\Jpeg\Jpeg +writer: FileEye\MediaProbe\Writer\Jpeg\Jpeg DOMNode: jpeg items: 0xC0: diff --git a/specs/Media.yaml b/specs/Media.yaml index fde60d234..8c301a63a 100644 --- a/specs/Media.yaml +++ b/specs/Media.yaml @@ -1,4 +1,3 @@ collection: Media -class: FileEye\MediaProbe\Media DOMNode: media items: {} diff --git a/specs/Tiff/Tiff.yaml b/specs/Tiff/Tiff.yaml index 413782ac9..57b06c0f0 100644 --- a/specs/Tiff/Tiff.yaml +++ b/specs/Tiff/Tiff.yaml @@ -1,6 +1,8 @@ collection: Tiff\Tiff title: 'TIFF image data' class: FileEye\MediaProbe\Block\Tiff +parser: FileEye\MediaProbe\Parser\Tiff\Tiff +writer: FileEye\MediaProbe\Writer\Tiff\Tiff DOMNode: tiff items: 0: diff --git a/src/Block/Exif/Exif.php b/src/Block/Exif/Exif.php index be51e0e03..2c140a061 100644 --- a/src/Block/Exif/Exif.php +++ b/src/Block/Exif/Exif.php @@ -34,8 +34,13 @@ class Exif extends BlockBase protected function doParseData(DataElement $data): void { assert($this->debugInfo(['dataElement' => $data])); - if (Tiff::getTiffSegmentByteOrder($data, strlen(self::EXIF_HEADER)) !== null) { - $tiff = new ItemDefinition(CollectionFactory::get('Tiff\Tiff')); + + $tiff = new ItemDefinition( + collection: CollectionFactory::get('Tiff\Tiff'), + ); + $tiffParser = $tiff->collection->getPropertyValue('parser'); + + if ($tiffParser::getTiffSegmentByteOrder($data, strlen(self::EXIF_HEADER)) !== null) { $this->addBlock($tiff)->parseData($data, strlen(self::EXIF_HEADER), $data->getSize() - strlen(self::EXIF_HEADER)); } else { // We store the data as normal JPEG content if it could not be diff --git a/src/Block/Jpeg.php b/src/Block/Jpeg.php index 0961c43b3..d9ed4bd01 100644 --- a/src/Block/Jpeg.php +++ b/src/Block/Jpeg.php @@ -2,15 +2,15 @@ namespace FileEye\MediaProbe\Block; -use FileEye\MediaProbe\Model\BlockBase; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataException; +use FileEye\MediaProbe\Data\DataFormat; use FileEye\MediaProbe\Data\DataWindow; use FileEye\MediaProbe\Entry\Core\Undefined; use FileEye\MediaProbe\ItemDefinition; -use FileEye\MediaProbe\Data\DataFormat; use FileEye\MediaProbe\MediaProbe; +use FileEye\MediaProbe\Model\BlockBase; use FileEye\MediaProbe\Utility\ConvertBytes; /** @@ -27,154 +27,4 @@ class Jpeg extends BlockBase * JPEG header. */ const JPEG_HEADER = "\xFF\xD8\xFF"; - - /** - * {@inheritdoc} - */ - protected function doParseData(DataElement $data): void - { - assert($this->debugInfo(['dataElement' => $data])); - - // JPEG data is stored in big-endian format. - $data->setByteOrder(ConvertBytes::BIG_ENDIAN); - - // Run through the data to parse the segments in the image. After each - // segment is parsed, the offset will be moved forward, and after the - // last segment we will terminate. - $offset = 0; - while ($offset < $data->getSize()) { - // Get the next JPEG segment id offset. - try { - $new_offset = $this->getJpegSegmentIdOffset($data, $offset); - $segment_id = $segment_id ?? 0; - if ($new_offset !== $offset) { - // Add any trailing data from previous segment in a - // RawData block. - $this->error('Unexpected data found at end of JPEG segment {id}/{hexid} @ offset {offset}, size {size}', [ - 'id' => $segment_id, - 'hexid' => '0x' . strtoupper(dechex($segment_id)), - 'offset' => $data->getAbsoluteOffset($offset), - 'size' => $new_offset - $offset, - ]); - $trail = new ItemDefinition( - CollectionFactory::get('RawData', ['name' => 'trail']), - DataFormat::BYTE, - $offset - ); - $this->addBlock($trail)->parseData($data, $offset, $new_offset - $offset); - } - $offset = $new_offset; - } catch (DataException $e) { - $this->error($e->getMessage()); - return; - } - - // Get the JPEG segment id. - $segment_id = $data->getByte($offset + 1); - - // Warn if an unidentified segment is detected. - if (!in_array($segment_id, $this->getCollection()->listItemIds())) { - $this->warning('Invalid JPEG marker {id}/{hexid} found @ offset {offset}', [ - 'id' => $segment_id, - 'hexid' => '0x' . strtoupper(dechex($segment_id)), - 'offset' => $data->getAbsoluteOffset($offset), - ]); - } - - // Get the JPEG segment size. - $segment_collection = $this->getCollection()->getItemCollection($segment_id); - switch ($segment_collection->getPropertyValue('payload')) { - case 'none': - // The data window size is the JPEG delimiter byte and the - // segment identifier byte. - $segment_size = 2; - break; - case 'variable': - // Read the length of the segment. The data window size - // includes the JPEG delimiter byte, the segment identifier - // byte and two bytes used to store the segment length. - $segment_size = $data->getShort($offset + 2) + 2; - break; - case 'fixed': - // The data window size includes the JPEG delimiter byte - // and the segment identifier byte. - $segment_size = $segment_collection->getPropertyValue('components') + 2; - break; - case 'scan': - // In case of image scan segment, the window is to the end - // of the data. - $segment_size = null; - break; - } - - // Parse the MediaProbe JPEG segment data. - $segment_definition = new ItemDefinition($segment_collection); - $segment = $this->addBlock($segment_definition); - $segment->parseData($data, $offset, $segment_size); - - // Position to end of the segment. - $offset += $segment->getSize(); - } - - // Fail if SOS is missing. - if (!$this->getElement("jpegSegment[@name='SOS']")) { - $this->error('Missing SOS (Start Of Scan) JPEG marker'); - } - - // Fail if EOI is missing. - if (!$this->getElement("jpegSegment[@name='EOI']")) { - $this->error('Missing EOI (End Of Image) JPEG marker'); - } - } - - /** - * Determines the offset where the next JPEG segment id is found. - * - * JPEG sections start with 0xFF. The first byte that is not 0xFF is a - * marker (hopefully). - * - * @param DataElement $data_element - * The data element to be checked. - * @param int $offset - * The starting offset in the data element. - * - * @return int - * The found offset. - * - * @throws DataException - * In case of marker not found. - */ - protected function getJpegSegmentIdOffset(DataElement $data_element, int $offset): int - { - for ($i = $offset; $i < $offset + 128; $i++) { - if ($data_element->getByte($i) === Jpeg::JPEG_DELIMITER && $data_element->getByte($i + 1) !== Jpeg::JPEG_DELIMITER) { - return $i; - } - } - throw new DataException('JPEG marker not found @%d', $data_element->getAbsoluteOffset($offset)); - } - - /** - * Returns the MIME type of the image. - * - * @returns string - */ - public function getMimeType(): string - { - return 'image/jpeg'; - } - - /** - * Determines if the data is a JPEG image. - * - * @param DataElement $data_element - * The data element to be checked. - * - * @return bool - * TRUE if the data element is a JPEG image. - */ - public static function isDataMatchingFormat(DataElement $data_element): bool - { - return $data_element->getBytes(0, 3) === static::JPEG_HEADER; - } } diff --git a/src/Block/Tiff.php b/src/Block/Tiff.php index affd7009b..aa4763209 100644 --- a/src/Block/Tiff.php +++ b/src/Block/Tiff.php @@ -27,21 +27,9 @@ class Tiff extends BlockBase /** * The byte order of this TIFF segment. - * - * @var int */ protected int $byteOrder; - /** - * Returns the MIME type of the image. - * - * @returns string - */ - public function getMimeType(): string - { - return 'image/tiff'; - } - public function setByteOrder(int $byteOrder): self { $this->byteOrder = $byteOrder; @@ -53,84 +41,6 @@ public function getByteOrder(): int return $this->byteOrder; } - /** - * {@inheritdoc} - */ - protected function doParseData(DataElement $data): void - { - // Determine the byte order of the TIFF data. - $this->setByteOrder(self::getTiffSegmentByteOrder($data)); - $data->setByteOrder($this->getByteOrder()); - - assert($this->debugInfo(['dataElement' => $data])); - - // Starting IFD will be at offset 4 (2 bytes for byte order + 2 for header). - $ifd_offset = $data->getLong(4); - - // If the offset to first IFD is higher than 8, then there may be an - // image scan (TIFF) in between. Store that in a RawData block. - if ($ifd_offset > 8) { - $scan = new ItemDefinition( - CollectionFactory::get('RawData', ['name' => 'scan']), - DataFormat::BYTE, - $ifd_offset - 8 - ); - $this->addBlock($scan)->parseData($data, 8, $ifd_offset - 8); - } - - // Loops through IFDs. In fact we should only have IFD0 and IFD1. - for ($i = 0; $i <= 1; $i++) { - // Check data is accessible, warn otherwise. - if ($ifd_offset >= $data->getSize() || $ifd_offset + 4 > $data->getSize()) { - $this->warning( - 'Could not determine number of entries for {item}, overflow', - ['item' => $this->getCollection()->getItemCollection($i)->getPropertyValue('name')] - ); - continue; - } - - // Find number of tags in IFD and warn if not enough data to read them. - $ifd_tags_count = $data->getShort($ifd_offset); - if ($ifd_offset + $ifd_tags_count * 4 > $data->getSize()) { - $this->warning( - 'Invalid data for {item}', - ['item' => $this->getCollection()->getItemCollection($i)->getPropertyValue('name')] - ); - continue; - } - - // Create and load the IFDs. Note that the data element cannot - // be split in windows since any pointer will refer to the - // entire segment space. - $ifd_class = $this->getCollection()->getItemCollection($i)->getPropertyValue('class'); - $ifd_item = new ItemDefinition($this->getCollection()->getItemCollection($i), DataFormat::LONG, $ifd_tags_count, $ifd_offset, 0, $i); - $ifd = new $ifd_class($ifd_item, $this); - try { - $ifd->parseData($data); - } catch (DataException $e) { - $this->error('Error processing {ifd_name}: {msg}.', [ - 'ifd_name' => $this->getCollection()->getItemCollection($i)->getPropertyValue('name'), - 'msg' => $e->getMessage(), - ]); - continue; - } - - // Offset to next IFD. - $ifd_offset = $data->getLong($ifd_offset + $ifd_tags_count * 12 + 2); - - // If next IFD offset is 0 we are finished. - if ($ifd_offset === 0) { - break; - } - - // IFD1 shouldn't link further. - if ($i === 1) { - $this->error('IFD1 should not link to another IFD'); - break; - } - } - } - /** * {@inheritdoc} */ @@ -181,54 +91,6 @@ public function toBytes($order = ConvertBytes::LITTLE_ENDIAN, $offset = 0): stri return $bytes; } - /** - * Determines if the data is a TIFF image. - * - * @param DataElement $data_element - * The data element to be checked. - * - * @return bool - */ - public static function isDataMatchingFormat(DataElement $data_element): bool - { - return static::getTiffSegmentByteOrder($data_element) !== null; - } - - /** - * Returns the byte order of a TIFF segment. - * - * @return int|null - * The byte order of the TIFF segment in case data is a TIFF block, null - * otherwise. - */ - public static function getTiffSegmentByteOrder(DataElement $data_element, int $offset = 0): ?int - { - // There must be at least 8 bytes available: 2 bytes for the byte - // order, 2 bytes for the TIFF header, and 4 bytes for the offset to - // the first IFD. - if ($data_element->getSize() - $offset < 8) { - return null; - } - - // Byte order. - $order_string = $data_element->getBytes($offset, 2); - if ($order_string === 'II') { - $order = ConvertBytes::LITTLE_ENDIAN; - } elseif ($order_string === 'MM') { - $order = ConvertBytes::BIG_ENDIAN; - } else { - return null; - } - - // Verify the TIFF header. - $magic_string = $data_element->getBytes($offset + 2, 2); - if (ConvertBytes::toShort($magic_string, $order) !== self::TIFF_HEADER) { - return null; - } - - return $order; - } - public function collectInfo(array $context = []): array { $info = []; diff --git a/src/Command/CompileCommand.php b/src/Command/CompileCommand.php index 334223813..a3e81268d 100644 --- a/src/Command/CompileCommand.php +++ b/src/Command/CompileCommand.php @@ -41,6 +41,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int { $compiler = new SpecCompiler(); $compiler->compile($input->getArgument('spec-dir'), $input->getArgument('resource-dir')); + $output->writeln('Compile OK'); return(0); } } diff --git a/src/ItemDefinition.php b/src/ItemDefinition.php index d3b36b138..cfa415bb4 100644 --- a/src/ItemDefinition.php +++ b/src/ItemDefinition.php @@ -25,7 +25,7 @@ class ItemDefinition * The sequence of the item on its parent list. */ public function __construct( - protected CollectionInterface $collection, + public readonly CollectionInterface $collection, protected int $format = DataFormat::BYTE, protected int $valuesCount = 1, protected int $dataOffset = 0, diff --git a/src/Media.php b/src/Media.php index 37cb9a679..393e55402 100644 --- a/src/Media.php +++ b/src/Media.php @@ -112,12 +112,15 @@ public static function parseFromFile(string $path, ?LoggerInterface $externalLog */ public static function parse(DataElement $dataElement, ?LoggerInterface $externalLogger = null, ?string $failLevel = null): Media { - // Determine the media format. - $mediaType = new ItemDefinition(MediaTypeResolver::fromDataElement($dataElement)); + // Determine the media type. Throws MediaProbeException if not determinable. + $mediaType = new ItemDefinition( + collection: MediaTypeResolver::fromDataElement($dataElement), + ); - // Build the Media object and its immediate child, that represents the - // media format. Then parse the media according to the media format. + // Build the Media object and its immediate child, that represents the actual media. Then + // parse the media according to the media format. $media = new static($externalLogger, $failLevel); + $media->setAttribute('mimeType', (string) $mediaType->collection->getPropertyValue('item')); $media->getStopwatch()->start('media-parsing'); assert($media->debugInfo(['dataElement' => $dataElement])); $media->addBlock($mediaType)->parseData($dataElement); @@ -126,19 +129,12 @@ public static function parse(DataElement $dataElement, ?LoggerInterface $externa return $media; } - /** - * @todo remove, replace by parser - */ - protected function doParseData(DataElement $data): void - { - } - /** * Determines the MIME type of the media. */ public function getMimeType(): string { - return $this->getElement('*')->getMimeType(); + return $this->getAttribute('mimeType'); } /** diff --git a/src/MediaTypeResolver.php b/src/MediaTypeResolver.php index c112c8760..a9a257e05 100644 --- a/src/MediaTypeResolver.php +++ b/src/MediaTypeResolver.php @@ -24,15 +24,15 @@ class MediaTypeResolver */ public static function fromDataElement(DataElement $dataElement): CollectionInterface { - $mediaCollection = CollectionFactory::get('MediaType'); + $mediaTypes = CollectionFactory::get('MediaType'); // Loop through the 'Media' collection items, each of which defines a media format // collection, and checks if the media matches the format. When a match is found, return // the media format collection. - foreach ($mediaCollection->listItemIds() as $typeItem) { - $typeCollection = $mediaCollection->getItemCollection($typeItem); - $class = $typeCollection->getPropertyValue('class'); - if ($class::isDataMatchingFormat($dataElement)) { - return $typeCollection; + foreach ($mediaTypes->listItemIds() as $id) { + $type = $mediaTypes->getItemCollection($id); + $parser = $type->getPropertyValue('parser'); + if ($parser::isDataMatchingMediaType($dataElement)) { + return $type; } } throw new MediaProbeException('Media type not managed by MediaProbe'); diff --git a/src/Model/BlockBase.php b/src/Model/BlockBase.php index 5923874db..9050caf0d 100644 --- a/src/Model/BlockBase.php +++ b/src/Model/BlockBase.php @@ -98,39 +98,38 @@ public function getFormat(): int /** * Parse data into a MediaProbe block. * - * @param DataElement $data_element + * @param DataElement $dataElement * The data element that will provide the data. */ - public function parseData(DataElement $data_element, int $start = 0, ?int $size = null): void + public function parseData(DataElement $dataElement, int $start = 0, ?int $size = null): void { - $data = new DataWindow($data_element, $start, $size); + $data = new DataWindow($dataElement, $start, $size); $this->size = $data->getSize(); - $this->doParseData($data); + if ($this->getCollection()->hasProperty('parser')) { + $parserClass = $this->getCollection()->getPropertyValue('parser'); + $parser = new $parserClass($this); + $parser->parseData($data); + } else { + // @todo remove this when full parser model in place. + $this->doParseData($data); + } // Invoke post-parse callbacks. $this->executePostParseCallbacks($data); } - /** - * Parse data into a MediaProbe block. - * - * @param DataElement $data_element - * The data element that will provide the data. - */ - abstract protected function doParseData(DataElement $data); - /** * Invoke post-parse callbacks. * - * @param \FileEye\MediaProbe\Data\DataElement $data_element + * @param \FileEye\MediaProbe\Data\DataElement $dataElement * @todo */ - protected function executePostParseCallbacks(DataElement $data_element): static + protected function executePostParseCallbacks(DataElement $dataElement): static { $post_load_callbacks = $this->getCollection()->getPropertyValue('postParse'); if (!empty($post_load_callbacks)) { foreach ($post_load_callbacks as $callback) { - call_user_func($callback, $data_element, $this); + call_user_func($callback, $dataElement, $this); } } return $this; diff --git a/src/Parser/Jpeg/Jpeg.php b/src/Parser/Jpeg/Jpeg.php new file mode 100644 index 000000000..a5f89df8b --- /dev/null +++ b/src/Parser/Jpeg/Jpeg.php @@ -0,0 +1,149 @@ +block->debugInfo(['dataElement' => $data])); + + // JPEG data is stored in big-endian format. + $data->setByteOrder(ConvertBytes::BIG_ENDIAN); + + // Run through the data to parse the segments in the image. After each + // segment is parsed, the offset will be moved forward, and after the + // last segment we will terminate. + $offset = 0; + while ($offset < $data->getSize()) { + // Get the next JPEG segment id offset. + try { + $new_offset = $this->getJpegSegmentIdOffset($data, $offset); + $segment_id = $segment_id ?? 0; + if ($new_offset !== $offset) { + // Add any trailing data from previous segment in a + // RawData block. + $this->block->error('Unexpected data found at end of JPEG segment {id}/{hexid} @ offset {offset}, size {size}', [ + 'id' => $segment_id, + 'hexid' => '0x' . strtoupper(dechex($segment_id)), + 'offset' => $data->getAbsoluteOffset($offset), + 'size' => $new_offset - $offset, + ]); + $trail = new ItemDefinition( + CollectionFactory::get('RawData', ['name' => 'trail']), + DataFormat::BYTE, + $offset + ); + $this->block->addBlock($trail)->parseData($data, $offset, $new_offset - $offset); + } + $offset = $new_offset; + } catch (DataException $e) { + $this->block->error($e->getMessage()); + return; + } + + // Get the JPEG segment id. + $segment_id = $data->getByte($offset + 1); + + // Warn if an unidentified segment is detected. + if (!in_array($segment_id, $this->block->getCollection()->listItemIds())) { + $this->block->warning('Invalid JPEG marker {id}/{hexid} found @ offset {offset}', [ + 'id' => $segment_id, + 'hexid' => '0x' . strtoupper(dechex($segment_id)), + 'offset' => $data->getAbsoluteOffset($offset), + ]); + } + + // Get the JPEG segment size. + $segment_collection = $this->block->getCollection()->getItemCollection($segment_id); + $segment_size = match ($segment_collection->getPropertyValue('payload')) { + // The data window size is the JPEG delimiter byte and the segment identifier byte. + 'none' => 2, + // Read the length of the segment. The data window size includes the JPEG delimiter + // byte, the segment identifier byte and two bytes used to store the segment + // length. + 'variable' => $data->getShort($offset + 2) + 2, + // The data window size includes the JPEG delimiter byte and the segment identifier + // byte. + 'fixed' => $segment_collection->getPropertyValue('components') + 2, + // In case of image scan segment, the window is to the end of the data. + 'scan' => null, + }; + + // Parse the MediaProbe JPEG segment data. + $segment_definition = new ItemDefinition($segment_collection); + $segment = $this->block->addBlock($segment_definition); + $segment->parseData($data, $offset, $segment_size); + + // Position to end of the segment. + $offset += $segment->getSize(); + } + + // Fail if SOS is missing. + if (!$this->block->getElement("jpegSegment[@name='SOS']")) { + $this->block->error('Missing SOS (Start Of Scan) JPEG marker'); + } + + // Fail if EOI is missing. + if (!$this->block->getElement("jpegSegment[@name='EOI']")) { + $this->block->error('Missing EOI (End Of Image) JPEG marker'); + } + } + + /** + * Determines the offset where the next JPEG segment id is found. + * + * JPEG sections start with 0xFF. The first byte that is not 0xFF is a + * marker (hopefully). + * + * @param DataElement $data_element + * The data element to be checked. + * @param int $offset + * The starting offset in the data element. + * + * @return int + * The found offset. + * + * @throws DataException + * In case of marker not found. + */ + protected function getJpegSegmentIdOffset(DataElement $data_element, int $offset): int + { + for ($i = $offset; $i < $offset + 128; $i++) { + if ($data_element->getByte($i) === JpegBlock::JPEG_DELIMITER && $data_element->getByte($i + 1) !== JpegBlock::JPEG_DELIMITER) { + return $i; + } + } + throw new DataException('JPEG marker not found @%d', $data_element->getAbsoluteOffset($offset)); + } + + /** + * Determines if the data is a JPEG image. + * + * @param DataElement $data_element + * The data element to be checked. + * + * @return bool + * TRUE if the data element is a JPEG image. + */ + public static function isDataMatchingMediaType(DataElement $data_element): bool + { + return $data_element->getBytes(0, 3) === JpegBlock::JPEG_HEADER; + } +} diff --git a/src/Parser/ParserBase.php b/src/Parser/ParserBase.php new file mode 100644 index 000000000..c1c484351 --- /dev/null +++ b/src/Parser/ParserBase.php @@ -0,0 +1,14 @@ +block->setByteOrder($byteOrder); + $data->setByteOrder($byteOrder); + + assert($this->block->debugInfo(['dataElement' => $data])); + + // Starting IFD will be at offset 4 (2 bytes for byte order + 2 for header). + $ifd_offset = $data->getLong(4); + + // If the offset to first IFD is higher than 8, then there may be an + // image scan (TIFF) in between. Store that in a RawData block. + if ($ifd_offset > 8) { + $scan = new ItemDefinition( + collection: CollectionFactory::get('RawData', ['name' => 'scan']), + format: DataFormat::BYTE, + valuesCount: $ifd_offset - 8, + ); + $this->block->addBlock($scan)->parseData($data, 8, $ifd_offset - 8); + } + + // Loops through IFDs. In fact we should only have IFD0 and IFD1. + for ($i = 0; $i <= 1; $i++) { + // Check data is accessible, warn otherwise. + if ($ifd_offset >= $data->getSize() || $ifd_offset + 4 > $data->getSize()) { + $this->block->warning( + 'Could not determine number of entries for {item}, overflow', + ['item' => $this->block->getCollection()->getItemCollection($i)->getPropertyValue('name')] + ); + continue; + } + + // Find number of tags in IFD and warn if not enough data to read them. + $ifd_tags_count = $data->getShort($ifd_offset); + if ($ifd_offset + $ifd_tags_count * 4 > $data->getSize()) { + $this->block->warning( + 'Invalid data for {item}', + ['item' => $this->block->getCollection()->getItemCollection($i)->getPropertyValue('name')] + ); + continue; + } + + // Create and load the IFDs. Note that the data element cannot + // be split in windows since any pointer will refer to the + // entire segment space. + $ifd_class = $this->block->getCollection()->getItemCollection($i)->getPropertyValue('class'); + $ifd_item = new ItemDefinition($this->block->getCollection()->getItemCollection($i), DataFormat::LONG, $ifd_tags_count, $ifd_offset, 0, $i); + $ifd = new $ifd_class($ifd_item, $this->block); + try { + $ifd->parseData($data); + } catch (DataException $e) { + $this->block->error('Error processing {ifd_name}: {msg}.', [ + 'ifd_name' => $this->block->getCollection()->getItemCollection($i)->getPropertyValue('name'), + 'msg' => $e->getMessage(), + ]); + continue; + } + + // Offset to next IFD. + $ifd_offset = $data->getLong($ifd_offset + $ifd_tags_count * 12 + 2); + + // If next IFD offset is 0 we are finished. + if ($ifd_offset === 0) { + break; + } + + // IFD1 shouldn't link further. + if ($i === 1) { + $this->block->error('IFD1 should not link to another IFD'); + break; + } + } + } + + /** + * Determines if the data is a TIFF image. + * + * @param DataElement $data_element + * The data element to be checked. + * + * @return bool + */ + public static function isDataMatchingMediaType(DataElement $data_element): bool + { + return static::getTiffSegmentByteOrder($data_element) !== null; + } + + /** + * Returns the byte order of a TIFF segment. + * + * @return int|null + * The byte order of the TIFF segment in case data is a TIFF block, null + * otherwise. + */ + public static function getTiffSegmentByteOrder(DataElement $data_element, int $offset = 0): ?int + { + // There must be at least 8 bytes available: 2 bytes for the byte + // order, 2 bytes for the TIFF header, and 4 bytes for the offset to + // the first IFD. + if ($data_element->getSize() - $offset < 8) { + return null; + } + + // Byte order. + $order_string = $data_element->getBytes($offset, 2); + if ($order_string === 'II') { + $order = ConvertBytes::LITTLE_ENDIAN; + } elseif ($order_string === 'MM') { + $order = ConvertBytes::BIG_ENDIAN; + } else { + return null; + } + + // Verify the TIFF header. + $magic_string = $data_element->getBytes($offset + 2, 2); + if (ConvertBytes::toShort($magic_string, $order) !== TiffBlock::TIFF_HEADER) { + return null; + } + + return $order; + } + +} From 7312137974c6f56ef033295af9b6255804219b8b Mon Sep 17 00:00:00 2001 From: mondrake Date: Wed, 24 Jan 2024 22:03:16 +0100 Subject: [PATCH 06/10] Reorder classes (#79) --- .github/workflows/tests.yml | 3 +- SPECIFICATION.md | 2 +- composer.json | 3 +- examples/dump-media.php | 4 +- specs/ExifMakerNotes/Apple/Main.yaml | 2 +- specs/ExifMakerNotes/Apple/RunTime.yaml | 2 +- specs/ExifMakerNotes/Canon/AFConfig.yaml | 2 +- specs/ExifMakerNotes/Canon/AFInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/AFInfo2.yaml | 2 +- specs/ExifMakerNotes/Canon/AFMicroAdj.yaml | 2 +- specs/ExifMakerNotes/Canon/Ambience.yaml | 2 +- specs/ExifMakerNotes/Canon/AspectInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/CNTH.yaml | 2 +- specs/ExifMakerNotes/Canon/CTMD.yaml | 2 +- .../ExifMakerNotes/Canon/CameraInfo1000D.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo1D.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo1DX.yaml | 2 +- .../Canon/CameraInfo1DmkII.yaml | 2 +- .../Canon/CameraInfo1DmkIII.yaml | 2 +- .../Canon/CameraInfo1DmkIIN.yaml | 2 +- .../Canon/CameraInfo1DmkIV.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo40D.yaml | 2 +- .../ExifMakerNotes/Canon/CameraInfo450D.yaml | 2 +- .../ExifMakerNotes/Canon/CameraInfo500D.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo50D.yaml | 2 +- .../ExifMakerNotes/Canon/CameraInfo550D.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo5D.yaml | 2 +- .../Canon/CameraInfo5DmkII.yaml | 2 +- .../Canon/CameraInfo5DmkIII.yaml | 2 +- .../ExifMakerNotes/Canon/CameraInfo600D.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo60D.yaml | 2 +- .../ExifMakerNotes/Canon/CameraInfo650D.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo6D.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo70D.yaml | 2 +- .../ExifMakerNotes/Canon/CameraInfo750D.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo7D.yaml | 2 +- specs/ExifMakerNotes/Canon/CameraInfo80D.yaml | 2 +- .../Canon/CameraInfoPowerShot.yaml | 2 +- .../Canon/CameraInfoPowerShot2.yaml | 2 +- .../Canon/CameraInfoUnknown.yaml | 2 +- .../Canon/CameraInfoUnknown32.yaml | 2 +- .../ExifMakerNotes/Canon/CameraSettings.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorBalance.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorCalib.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorCalib2.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorCoefs.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorCoefs2.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorData1.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorData2.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorData3.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorData4.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorData5.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorData6.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorData7.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorData8.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorData9.yaml | 2 +- .../Canon/ColorDataUnknown.yaml | 2 +- specs/ExifMakerNotes/Canon/ColorInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/ContrastInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/CropInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/ExposureInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/FaceDetect1.yaml | 2 +- specs/ExifMakerNotes/Canon/FaceDetect2.yaml | 2 +- specs/ExifMakerNotes/Canon/FaceDetect3.yaml | 2 +- specs/ExifMakerNotes/Canon/FileInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/FilterInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/Flags.yaml | 4 +- specs/ExifMakerNotes/Canon/FocalInfo.yaml | 4 +- specs/ExifMakerNotes/Canon/FocalLength.yaml | 2 +- specs/ExifMakerNotes/Canon/HDRInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/LensInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/LightingOpt.yaml | 2 +- specs/ExifMakerNotes/Canon/Main.yaml | 4 +- specs/ExifMakerNotes/Canon/MeasuredColor.yaml | 2 +- specs/ExifMakerNotes/Canon/ModifiedInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/MovieInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/MultiExp.yaml | 2 +- specs/ExifMakerNotes/Canon/MyColors.yaml | 2 +- specs/ExifMakerNotes/Canon/PSInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/PSInfo2.yaml | 2 +- specs/ExifMakerNotes/Canon/Panorama.yaml | 2 +- .../Canon/PreviewImageInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/Processing.yaml | 2 +- specs/ExifMakerNotes/Canon/SensorInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/SerialInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/ShotInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/Skip.yaml | 2 +- specs/ExifMakerNotes/Canon/TimeInfo.yaml | 2 +- specs/ExifMakerNotes/Canon/Uuid.yaml | 2 +- .../ExifMakerNotes/Canon/VignettingCorr.yaml | 2 +- .../ExifMakerNotes/Canon/VignettingCorr2.yaml | 2 +- .../Canon/VignettingCorrUnknown.yaml | 2 +- .../CanonCustom/Functions10D.yaml | 2 +- .../CanonCustom/Functions1D.yaml | 2 +- .../CanonCustom/Functions2.yaml | 2 +- .../CanonCustom/Functions20D.yaml | 2 +- .../CanonCustom/Functions30D.yaml | 2 +- .../CanonCustom/Functions350D.yaml | 2 +- .../CanonCustom/Functions400D.yaml | 2 +- .../CanonCustom/Functions5D.yaml | 2 +- .../CanonCustom/FunctionsD30.yaml | 2 +- .../CanonCustom/PersonalFuncValues.yaml | 2 +- .../CanonCustom/PersonalFuncs.yaml | 2 +- .../ExifMakerNotes/CanonRaw/DecoderTable.yaml | 2 +- .../ExifMakerNotes/CanonRaw/ExposureInfo.yaml | 2 +- specs/ExifMakerNotes/CanonRaw/FlashInfo.yaml | 2 +- .../ExifMakerNotes/CanonRaw/ImageFormat.yaml | 2 +- specs/ExifMakerNotes/CanonRaw/ImageInfo.yaml | 2 +- specs/ExifMakerNotes/CanonRaw/Main.yaml | 2 +- specs/ExifMakerNotes/CanonRaw/MakeModel.yaml | 2 +- specs/ExifMakerNotes/CanonRaw/RawJpgInfo.yaml | 2 +- specs/ExifMakerNotes/CanonRaw/TimeStamp.yaml | 2 +- .../ExifMakerNotes/CanonRaw/WhiteSample.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/CropInfo.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/DLOInfo.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/DR4.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/DR4Header.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/DustInfo.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/GammaInfo.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/IHL.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/Main.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/StampInfo.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/StampTool.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/ToneCurve.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/Ver1.yaml | 2 +- specs/ExifMakerNotes/CanonVRD/Ver2.yaml | 2 +- specs/{Exif => Jpeg}/Exif.yaml | 4 +- specs/Jpeg/Jpeg.yaml | 2 +- specs/Jpeg/Segment.yaml | 2 +- specs/Jpeg/SegmentApp1.yaml | 4 +- specs/Jpeg/SegmentCom.yaml | 2 +- specs/Jpeg/SegmentSos.yaml | 2 +- specs/Tag.yaml | 5 - specs/Tiff/Ifd0.yaml | 8 +- specs/Tiff/Ifd1.yaml | 6 +- specs/Tiff/IfdAny.yaml | 4 +- specs/Tiff/IfdExif.yaml | 4 +- specs/Tiff/IfdGps.yaml | 4 +- specs/Tiff/IfdInteroperability.yaml | 4 +- specs/Tiff/Tag.yaml | 5 + specs/Tiff/Tiff.yaml | 2 +- specs/Tiff/UnknownTag.yaml | 5 + specs/UnknownTag.yaml | 5 - src/Block/Exif/Vendor/Apple/MakerNote.php | 20 +- src/Block/Exif/Vendor/Apple/RunTime.php | 2 +- src/Block/Exif/Vendor/Canon/AFInfoIndex.php | 2 +- src/Block/Exif/Vendor/Canon/CameraInfoMap.php | 6 +- src/Block/Exif/Vendor/Canon/ColorDataMap.php | 6 +- .../Exif/Vendor/Canon/CustomFunctions2.php | 4 +- .../Vendor/Canon/CustomFunctions2Header.php | 2 +- src/Block/Exif/Vendor/Canon/Filter.php | 2 +- .../Exif/Vendor/Canon/FilterInfoIndex.php | 2 +- src/Block/Index.php | 18 +- src/Block/Jpeg.php | 30 - src/Block/{Exif => Jpeg}/Exif.php | 9 +- src/Block/Jpeg/Jpeg.php | 21 + .../{JpegSegment.php => Jpeg/Segment.php} | 5 +- .../SegmentApp1.php} | 10 +- .../SegmentBase.php} | 4 +- .../SegmentCom.php} | 4 +- .../SegmentSos.php} | 6 +- src/Block/ListBase.php | 2 +- src/Block/{Exif => Tiff}/Ifd.php | 76 +- src/Block/{ => Tiff}/Tag.php | 4 +- src/Block/{ => Tiff}/Tiff.php | 10 +- src/Collection/CollectionFactory.php | 2 +- src/Collection/CollectionIndex.php | 12 +- src/Collection/ExifMakerNotes/Apple/Main.php | 12 +- .../ExifMakerNotes/Apple/RunTime.php | 10 +- .../ExifMakerNotes/Canon/AFConfig.php | 40 +- .../ExifMakerNotes/Canon/AFInfo.php | 30 +- .../ExifMakerNotes/Canon/AFInfo2.php | 32 +- .../ExifMakerNotes/Canon/AFMicroAdj.php | 6 +- .../ExifMakerNotes/Canon/Ambience.php | 4 +- .../ExifMakerNotes/Canon/AspectInfo.php | 12 +- src/Collection/ExifMakerNotes/Canon/CNTH.php | 4 +- src/Collection/ExifMakerNotes/Canon/CTMD.php | 4 +- .../ExifMakerNotes/Canon/CameraInfo1000D.php | 40 +- .../ExifMakerNotes/Canon/CameraInfo1D.php | 32 +- .../ExifMakerNotes/Canon/CameraInfo1DX.php | 38 +- .../ExifMakerNotes/Canon/CameraInfo1DmkII.php | 34 +- .../Canon/CameraInfo1DmkIII.php | 44 +- .../Canon/CameraInfo1DmkIIN.php | 28 +- .../ExifMakerNotes/Canon/CameraInfo1DmkIV.php | 44 +- .../ExifMakerNotes/Canon/CameraInfo40D.php | 40 +- .../ExifMakerNotes/Canon/CameraInfo450D.php | 38 +- .../ExifMakerNotes/Canon/CameraInfo500D.php | 44 +- .../ExifMakerNotes/Canon/CameraInfo50D.php | 46 +- .../ExifMakerNotes/Canon/CameraInfo550D.php | 40 +- .../ExifMakerNotes/Canon/CameraInfo5D.php | 120 +- .../ExifMakerNotes/Canon/CameraInfo5DmkII.php | 48 +- .../Canon/CameraInfo5DmkIII.php | 44 +- .../ExifMakerNotes/Canon/CameraInfo600D.php | 40 +- .../ExifMakerNotes/Canon/CameraInfo60D.php | 32 +- .../ExifMakerNotes/Canon/CameraInfo650D.php | 42 +- .../ExifMakerNotes/Canon/CameraInfo6D.php | 36 +- .../ExifMakerNotes/Canon/CameraInfo70D.php | 32 +- .../ExifMakerNotes/Canon/CameraInfo750D.php | 32 +- .../ExifMakerNotes/Canon/CameraInfo7D.php | 48 +- .../ExifMakerNotes/Canon/CameraInfo80D.php | 32 +- .../Canon/CameraInfoPowerShot.php | 14 +- .../Canon/CameraInfoPowerShot2.php | 20 +- .../Canon/CameraInfoUnknown.php | 4 +- .../Canon/CameraInfoUnknown32.php | 14 +- .../ExifMakerNotes/Canon/CameraSettings.php | 76 +- .../ExifMakerNotes/Canon/ColorBalance.php | 22 +- .../ExifMakerNotes/Canon/ColorCalib.php | 32 +- .../ExifMakerNotes/Canon/ColorCalib2.php | 32 +- .../ExifMakerNotes/Canon/ColorCoefs.php | 94 +- .../ExifMakerNotes/Canon/ColorCoefs2.php | 94 +- .../ExifMakerNotes/Canon/ColorData1.php | 42 +- .../ExifMakerNotes/Canon/ColorData2.php | 116 +- .../ExifMakerNotes/Canon/ColorData3.php | 70 +- .../ExifMakerNotes/Canon/ColorData4.php | 32 +- .../ExifMakerNotes/Canon/ColorData5.php | 8 +- .../ExifMakerNotes/Canon/ColorData6.php | 116 +- .../ExifMakerNotes/Canon/ColorData7.php | 146 +- .../ExifMakerNotes/Canon/ColorData8.php | 182 +- .../ExifMakerNotes/Canon/ColorData9.php | 168 +- .../ExifMakerNotes/Canon/ColorDataUnknown.php | 4 +- .../ExifMakerNotes/Canon/ColorInfo.php | 8 +- .../ExifMakerNotes/Canon/ContrastInfo.php | 4 +- .../ExifMakerNotes/Canon/CropInfo.php | 10 +- .../ExifMakerNotes/Canon/ExposureInfo.php | 8 +- .../ExifMakerNotes/Canon/FaceDetect1.php | 24 +- .../ExifMakerNotes/Canon/FaceDetect2.php | 6 +- .../ExifMakerNotes/Canon/FaceDetect3.php | 4 +- .../ExifMakerNotes/Canon/FileInfo.php | 42 +- .../ExifMakerNotes/Canon/FilterInfo.php | 22 +- src/Collection/ExifMakerNotes/Canon/Flags.php | 6 +- .../ExifMakerNotes/Canon/FocalInfo.php | 6 +- .../ExifMakerNotes/Canon/FocalLength.php | 14 +- .../ExifMakerNotes/Canon/HDRInfo.php | 6 +- .../ExifMakerNotes/Canon/LensInfo.php | 4 +- .../ExifMakerNotes/Canon/LightingOpt.php | 12 +- src/Collection/ExifMakerNotes/Canon/Main.php | 214 +-- .../ExifMakerNotes/Canon/MeasuredColor.php | 4 +- .../ExifMakerNotes/Canon/ModifiedInfo.php | 24 +- .../ExifMakerNotes/Canon/MovieInfo.php | 20 +- .../ExifMakerNotes/Canon/MultiExp.php | 8 +- .../ExifMakerNotes/Canon/MyColors.php | 4 +- .../ExifMakerNotes/Canon/PSInfo.php | 116 +- .../ExifMakerNotes/Canon/PSInfo2.php | 128 +- .../ExifMakerNotes/Canon/Panorama.php | 6 +- .../ExifMakerNotes/Canon/PreviewImageInfo.php | 12 +- .../ExifMakerNotes/Canon/Processing.php | 28 +- .../ExifMakerNotes/Canon/SensorInfo.php | 22 +- .../ExifMakerNotes/Canon/SerialInfo.php | 4 +- .../ExifMakerNotes/Canon/ShotInfo.php | 60 +- src/Collection/ExifMakerNotes/Canon/Skip.php | 4 +- .../ExifMakerNotes/Canon/TimeInfo.php | 8 +- src/Collection/ExifMakerNotes/Canon/Uuid.php | 6 +- .../ExifMakerNotes/Canon/VignettingCorr.php | 16 +- .../ExifMakerNotes/Canon/VignettingCorr2.php | 6 +- .../Canon/VignettingCorrUnknown.php | 4 +- .../CanonCustom/Functions10D.php | 36 +- .../CanonCustom/Functions1D.php | 46 +- .../ExifMakerNotes/CanonCustom/Functions2.php | 272 +-- .../CanonCustom/Functions20D.php | 38 +- .../CanonCustom/Functions30D.php | 40 +- .../CanonCustom/Functions350D.php | 20 +- .../CanonCustom/Functions400D.php | 24 +- .../CanonCustom/Functions5D.php | 44 +- .../CanonCustom/FunctionsD30.php | 32 +- .../CanonCustom/PersonalFuncValues.php | 50 +- .../CanonCustom/PersonalFuncs.php | 60 +- .../ExifMakerNotes/CanonRaw/DecoderTable.php | 8 +- .../ExifMakerNotes/CanonRaw/ExposureInfo.php | 8 +- .../ExifMakerNotes/CanonRaw/FlashInfo.php | 6 +- .../ExifMakerNotes/CanonRaw/ImageFormat.php | 6 +- .../ExifMakerNotes/CanonRaw/ImageInfo.php | 16 +- .../ExifMakerNotes/CanonRaw/Main.php | 194 +-- .../ExifMakerNotes/CanonRaw/MakeModel.php | 6 +- .../ExifMakerNotes/CanonRaw/RawJpgInfo.php | 10 +- .../ExifMakerNotes/CanonRaw/TimeStamp.php | 8 +- .../ExifMakerNotes/CanonRaw/WhiteSample.php | 12 +- .../ExifMakerNotes/CanonVRD/CropInfo.php | 22 +- .../ExifMakerNotes/CanonVRD/DLOInfo.php | 8 +- .../ExifMakerNotes/CanonVRD/DR4.php | 128 +- .../ExifMakerNotes/CanonVRD/DR4Header.php | 124 +- .../ExifMakerNotes/CanonVRD/DustInfo.php | 4 +- .../ExifMakerNotes/CanonVRD/GammaInfo.php | 28 +- .../ExifMakerNotes/CanonVRD/IHL.php | 12 +- .../ExifMakerNotes/CanonVRD/Main.php | 10 +- .../ExifMakerNotes/CanonVRD/StampInfo.php | 4 +- .../ExifMakerNotes/CanonVRD/StampTool.php | 4 +- .../ExifMakerNotes/CanonVRD/ToneCurve.php | 22 +- .../ExifMakerNotes/CanonVRD/Ver1.php | 88 +- .../ExifMakerNotes/CanonVRD/Ver2.php | 306 ++-- src/Collection/{Exif => Jpeg}/Exif.php | 6 +- src/Collection/Jpeg/Jpeg.php | 4 +- src/Collection/Jpeg/Segment.php | 2 +- src/Collection/Jpeg/SegmentApp1.php | 4 +- src/Collection/Jpeg/SegmentCom.php | 2 +- src/Collection/Jpeg/SegmentSos.php | 2 +- src/Collection/Media.php | 1 - src/Collection/Tiff/Ifd0.php | 294 ++-- src/Collection/Tiff/Ifd1.php | 296 ++-- src/Collection/Tiff/IfdAny.php | 1142 ++++++------- src/Collection/Tiff/IfdExif.php | 744 ++++----- src/Collection/Tiff/IfdGps.php | 68 +- src/Collection/Tiff/IfdInteroperability.php | 14 +- src/Collection/{ => Tiff}/Tag.php | 6 +- src/Collection/Tiff/Tiff.php | 4 +- src/Collection/{ => Tiff}/UnknownTag.php | 6 +- src/Command/DumpCommand.php | 9 +- src/Media.php | 14 +- src/Parser/Jpeg/Jpeg.php | 58 +- src/Parser/Tiff/Tiff.php | 52 +- tests/Bug3017880Test.php | 12 +- tests/GH16Test.php | 10 +- tests/GH21Test.php | 10 +- tests/GH77Test.php | 4 +- tests/IfdTest.php | 6 +- tests/MediaFilesTest.php | 2 +- tests/MisplacedExifTest.php | 10 +- tests/ReadWriteTest.php | 22 +- tests/SpecCompilerTest.php | 4 +- tests/SpecTest.php | 12 +- tests/Tags1Test.php | 12 +- tests/fixtures/spec/valid_stub/Ifd0.yaml | 6 +- tests/fixtures/spec/valid_stub/IfdExif.yaml | 6 +- tests/fixtures/spec/valid_stub/Tiff.yaml | 2 +- .../image/broken/canon-eos-650d.jpg.dump.yml | 1330 +++++++-------- .../image/broken/gh-10-a.jpg.dump.yml | 188 +-- .../image/broken/gh-10-b.jpg.dump.yml | 366 ++-- .../image/broken/gh-11.jpg.dump.yml | 360 ++-- .../image/broken/misplaced-exif.jpg.dump.yml | 81 +- .../image/broken/pel-141.jpg.dump.yml | 184 +- .../image/broken/pel-152.jpg.dump.yml | 30 +- .../image/broken/pel-156.jpg.dump.yml | 322 ++-- .../broken/pel-176-RPT200076_03.jpg.dump.yml | 198 +-- .../media-dumps/image/bug3017880.jpg.dump.yml | 32 +- .../image/camera/apple-iphone11.jpg.dump.yml | 450 ++--- .../image/camera/apple-iphone6s.jpg.dump.yml | 368 ++-- .../image/camera/apple-iphone7.JPG.dump.yml | 376 ++--- .../image/camera/canon-ixus-ii.jpg.dump.yml | 580 +++---- .../camera/canon-powershot-s60.jpg.dump.yml | 598 +++---- .../camera/canon_eos_70d_29.jpg.dump.yml | 1448 ++++++++-------- .../camera/canon_eos_850d_08.jpg.dump.yml | 1488 ++++++++--------- .../image/camera/fujifilm_x_a5.jpg.dump.yml | 316 ++-- .../konica-minolta-dimage-a2.jpg.dump.yml | 288 ++-- .../image/camera/leica-d-lux.jpg.dump.yml | 252 +-- .../camera/nikon-coolscan-iv.jpg.dump.yml | 88 +- .../image/camera/nikon-d50.JPG.dump.yml | 250 +-- .../image/camera/nikon-e5000.jpg.dump.yml | 182 +- .../image/camera/nikon-e950.jpg.dump.yml | 198 +-- .../image/camera/olympus-c5050z.jpg.dump.yml | 230 +-- .../image/camera/olympus-c50z.jpg.dump.yml | 232 +-- .../image/camera/olympus-c765uz.jpg.dump.yml | 240 +-- .../image/camera/pentax-istDS.jpg.dump.yml | 232 +-- .../image/camera/sony-dsc-v1.jpg.dump.yml | 218 +-- .../image/exiftool/Canon.jpg.dump.yml | 698 ++++---- .../image/exiftool/Canon1DmkIII.jpg.dump.yml | 1202 ++++++------- tests/media-dumps/image/gh-16.jpg.dump.yml | 44 +- tests/media-dumps/image/gh-21.jpg.dump.yml | 44 +- tests/media-dumps/image/gh-77.jpg.dump.yml | 226 +-- tests/media-dumps/image/no-exif.jpg.dump.yml | 30 +- tests/media-dumps/image/pel-157.tiff.dump.yml | 396 ++--- .../media-dumps/image/sample-1.tiff.dump.yml | 72 +- .../image/test-tags-1.jpg.dump.yml | 110 +- 361 files changed, 11173 insertions(+), 11189 deletions(-) rename specs/{Exif => Jpeg}/Exif.yaml (57%) delete mode 100644 specs/Tag.yaml create mode 100644 specs/Tiff/Tag.yaml create mode 100644 specs/Tiff/UnknownTag.yaml delete mode 100644 specs/UnknownTag.yaml delete mode 100644 src/Block/Jpeg.php rename src/Block/{Exif => Jpeg}/Exif.php (86%) create mode 100644 src/Block/Jpeg/Jpeg.php rename src/Block/{JpegSegment.php => Jpeg/Segment.php} (80%) rename src/Block/{JpegSegmentApp1.php => Jpeg/SegmentApp1.php} (83%) rename src/Block/{JpegSegmentBase.php => Jpeg/SegmentBase.php} (74%) rename src/Block/{JpegSegmentCom.php => Jpeg/SegmentCom.php} (91%) rename src/Block/{JpegSegmentSos.php => Jpeg/SegmentSos.php} (94%) rename src/Block/{Exif => Tiff}/Ifd.php (87%) rename src/Block/{ => Tiff}/Tag.php (98%) rename src/Block/{ => Tiff}/Tiff.php (89%) rename src/Collection/{Exif => Jpeg}/Exif.php (79%) rename src/Collection/{ => Tiff}/Tag.php (72%) rename src/Collection/{ => Tiff}/UnknownTag.php (72%) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1be551dd0..a4e773359 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,7 +51,8 @@ jobs: php bin/fileeye-mediaprobe --version # Remove the comment to the lines below during development, to let # re-compile the specification PHP file from the YAML files. - php bin/fileeye-mediaprobe compile + # php bin/fileeye-mediaprobe compile + # php bin/fileeye-mediaprobe dump tests/media-samples tests/media-dumps - name: Image file dumps continue-on-error: true diff --git a/SPECIFICATION.md b/SPECIFICATION.md index 293a86f42..06432ac76 100644 --- a/SPECIFICATION.md +++ b/SPECIFICATION.md @@ -33,7 +33,7 @@ An IFD is fully described by a single YAML file. The file name should convention ``` type: 'IFD0' -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd alias: - '0' - 'Main' diff --git a/composer.json b/composer.json index 75c51aed9..14cf692e7 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,8 @@ "symfony/process": "^6 | ^7", "symfony/var-dumper": "^6 | ^7", "symfony/yaml": "^6 | ^7", - "bramus/monolog-colored-line-formatter": "^3" + "bramus/monolog-colored-line-formatter": "^3", + "phpstan/phpstan": "^1.10" }, "autoload": { "psr-4": { diff --git a/examples/dump-media.php b/examples/dump-media.php index 25419884d..a8fd9f8e5 100644 --- a/examples/dump-media.php +++ b/examples/dump-media.php @@ -14,8 +14,8 @@ use FileEye\MediaProbe\Media; use FileEye\MediaProbe\Data\DataWindow; use FileEye\MediaProbe\Utility\ConvertBytes; -use FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\Tiff; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; +use FileEye\MediaProbe\Block\Tiff\Tiff; use FileEye\MediaProbe\Utility\DumpLogFormatter; use Monolog\Logger; use Monolog\Handler\StreamHandler; diff --git a/specs/ExifMakerNotes/Apple/Main.yaml b/specs/ExifMakerNotes/Apple/Main.yaml index 1201c3e18..0b4eef569 100644 --- a/specs/ExifMakerNotes/Apple/Main.yaml +++ b/specs/ExifMakerNotes/Apple/Main.yaml @@ -3,7 +3,7 @@ name: Apple title: 'Apple Maker Notes' class: FileEye\MediaProbe\Block\Exif\Vendor\Apple\MakerNote DOMNode: makerNote -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Apple diff --git a/specs/ExifMakerNotes/Apple/RunTime.yaml b/specs/ExifMakerNotes/Apple/RunTime.yaml index 424ee4f1d..3ba6e9b55 100644 --- a/specs/ExifMakerNotes/Apple/RunTime.yaml +++ b/specs/ExifMakerNotes/Apple/RunTime.yaml @@ -3,7 +3,7 @@ name: AppleRuntime title: 'Apple Runtime' class: FileEye\MediaProbe\Block\Exif\Vendor\Apple\RunTime DOMNode: plist -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Apple diff --git a/specs/ExifMakerNotes/Canon/AFConfig.yaml b/specs/ExifMakerNotes/Canon/AFConfig.yaml index d89851c44..aaf448d63 100644 --- a/specs/ExifMakerNotes/Canon/AFConfig.yaml +++ b/specs/ExifMakerNotes/Canon/AFConfig.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Index DOMNode: index format: Long hasIndexSize: true -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/AFInfo.yaml b/specs/ExifMakerNotes/Canon/AFInfo.yaml index 91dba64c1..1f1187a7b 100644 --- a/specs/ExifMakerNotes/Canon/AFInfo.yaml +++ b/specs/ExifMakerNotes/Canon/AFInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon AF Info' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\AFInfoIndex DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/AFInfo2.yaml b/specs/ExifMakerNotes/Canon/AFInfo2.yaml index af5fa4182..198136699 100644 --- a/specs/ExifMakerNotes/Canon/AFInfo2.yaml +++ b/specs/ExifMakerNotes/Canon/AFInfo2.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\AFInfoIndex DOMNode: index format: Short hasIndexSize: true -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/AFMicroAdj.yaml b/specs/ExifMakerNotes/Canon/AFMicroAdj.yaml index 3c91583ea..ac4641e36 100644 --- a/specs/ExifMakerNotes/Canon/AFMicroAdj.yaml +++ b/specs/ExifMakerNotes/Canon/AFMicroAdj.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Map DOMNode: map format: Long hasIndexSize: true -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/Ambience.yaml b/specs/ExifMakerNotes/Canon/Ambience.yaml index f3cd4eed8..58c50888b 100644 --- a/specs/ExifMakerNotes/Canon/Ambience.yaml +++ b/specs/ExifMakerNotes/Canon/Ambience.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Map DOMNode: map format: Long hasIndexSize: true -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/AspectInfo.yaml b/specs/ExifMakerNotes/Canon/AspectInfo.yaml index bf49ef7fb..e5fa49410 100644 --- a/specs/ExifMakerNotes/Canon/AspectInfo.yaml +++ b/specs/ExifMakerNotes/Canon/AspectInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon AspectInfo' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CNTH.yaml b/specs/ExifMakerNotes/Canon/CNTH.yaml index 380ae3ad3..4c8725b7f 100644 --- a/specs/ExifMakerNotes/Canon/CNTH.yaml +++ b/specs/ExifMakerNotes/Canon/CNTH.yaml @@ -4,7 +4,7 @@ name: CanonCNTH title: 'Canon CNTH' class: FileEye\MediaProbe\Block\Index DOMNode: index -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CTMD.yaml b/specs/ExifMakerNotes/Canon/CTMD.yaml index 71c40c482..a85e0955d 100644 --- a/specs/ExifMakerNotes/Canon/CTMD.yaml +++ b/specs/ExifMakerNotes/Canon/CTMD.yaml @@ -4,7 +4,7 @@ name: CanonCTMD title: 'Canon CTMD' class: FileEye\MediaProbe\Block\Index DOMNode: index -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo1000D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo1000D.yaml index 1e75c5177..e6c0a25f6 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo1000D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo1000D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo1000D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo1D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo1D.yaml index 11f53bab2..44e446ff0 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo1D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo1D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo1D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo1DX.yaml b/specs/ExifMakerNotes/Canon/CameraInfo1DX.yaml index 1858b41c3..aecef3589 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo1DX.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo1DX.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DX' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo1DmkII.yaml b/specs/ExifMakerNotes/Canon/CameraInfo1DmkII.yaml index f196cdd5e..f98344dda 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo1DmkII.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo1DmkII.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DmkII' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo1DmkIII.yaml b/specs/ExifMakerNotes/Canon/CameraInfo1DmkIII.yaml index 4fdfdf4f5..a2b25ef9f 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo1DmkIII.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo1DmkIII.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DmkIII' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo1DmkIIN.yaml b/specs/ExifMakerNotes/Canon/CameraInfo1DmkIIN.yaml index e111c20d7..c4480664d 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo1DmkIIN.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo1DmkIIN.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DmkIIN' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo1DmkIV.yaml b/specs/ExifMakerNotes/Canon/CameraInfo1DmkIV.yaml index 017cc514a..f203e2959 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo1DmkIV.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo1DmkIV.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo1DmkIV' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo40D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo40D.yaml index 6de855bb0..df66eb56f 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo40D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo40D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo40D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo450D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo450D.yaml index 43c516d70..0c1955710 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo450D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo450D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo450D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo500D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo500D.yaml index c63b3be07..641907b09 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo500D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo500D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo500D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo50D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo50D.yaml index 57dfe1e3c..e9c4c6cae 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo50D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo50D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo50D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo550D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo550D.yaml index 5d5a00ee1..b54a40305 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo550D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo550D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo550D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo5D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo5D.yaml index af8ca5b37..cebb1240a 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo5D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo5D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo5D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo5DmkII.yaml b/specs/ExifMakerNotes/Canon/CameraInfo5DmkII.yaml index d05c99426..b4733a2db 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo5DmkII.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo5DmkII.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo5DmkII' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo5DmkIII.yaml b/specs/ExifMakerNotes/Canon/CameraInfo5DmkIII.yaml index 4929cac40..cf171d74b 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo5DmkIII.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo5DmkIII.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo5DmkIII' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo600D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo600D.yaml index 593041b8e..3c757efcd 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo600D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo600D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo600D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo60D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo60D.yaml index e04ecc955..d0fa4e1cd 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo60D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo60D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo60D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo650D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo650D.yaml index 19b830614..ae431d2b4 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo650D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo650D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo650D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo6D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo6D.yaml index 8691a4f56..3c0658dbf 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo6D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo6D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo6D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo70D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo70D.yaml index b20f3a6b2..91d5d0cef 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo70D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo70D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo70D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo750D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo750D.yaml index d3802e531..c2766ec57 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo750D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo750D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo750D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo7D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo7D.yaml index e88f94253..06e003ec6 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo7D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo7D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo7D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfo80D.yaml b/specs/ExifMakerNotes/Canon/CameraInfo80D.yaml index 06dccf141..0bc9662fb 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfo80D.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfo80D.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfo80D' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfoPowerShot.yaml b/specs/ExifMakerNotes/Canon/CameraInfoPowerShot.yaml index f407e05f6..4e407ae87 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfoPowerShot.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfoPowerShot.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfoPowerShot' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfoPowerShot2.yaml b/specs/ExifMakerNotes/Canon/CameraInfoPowerShot2.yaml index 63cf6e266..db4da1302 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfoPowerShot2.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfoPowerShot2.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfoPowerShot2' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfoUnknown.yaml b/specs/ExifMakerNotes/Canon/CameraInfoUnknown.yaml index 50fe47104..0917afa27 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfoUnknown.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfoUnknown.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfoUnknown' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraInfoUnknown32.yaml b/specs/ExifMakerNotes/Canon/CameraInfoUnknown32.yaml index da729be08..d63dc6132 100644 --- a/specs/ExifMakerNotes/Canon/CameraInfoUnknown32.yaml +++ b/specs/ExifMakerNotes/Canon/CameraInfoUnknown32.yaml @@ -4,7 +4,7 @@ title: 'Canon CameraInfoUnknown32' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CameraInfoMap DOMNode: map format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CameraSettings.yaml b/specs/ExifMakerNotes/Canon/CameraSettings.yaml index e010b7b8d..01c591700 100644 --- a/specs/ExifMakerNotes/Canon/CameraSettings.yaml +++ b/specs/ExifMakerNotes/Canon/CameraSettings.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Map DOMNode: map hasIndexSize: true format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorBalance.yaml b/specs/ExifMakerNotes/Canon/ColorBalance.yaml index 5c55ff5b3..32b9edc72 100644 --- a/specs/ExifMakerNotes/Canon/ColorBalance.yaml +++ b/specs/ExifMakerNotes/Canon/ColorBalance.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Map DOMNode: map hasIndexSize: true format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorCalib.yaml b/specs/ExifMakerNotes/Canon/ColorCalib.yaml index b5a7ea3d5..dba81eb5a 100644 --- a/specs/ExifMakerNotes/Canon/ColorCalib.yaml +++ b/specs/ExifMakerNotes/Canon/ColorCalib.yaml @@ -4,7 +4,7 @@ title: 'Canon ColorCalib' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorCalibMap DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorCalib2.yaml b/specs/ExifMakerNotes/Canon/ColorCalib2.yaml index b9e9d142d..d110271a5 100644 --- a/specs/ExifMakerNotes/Canon/ColorCalib2.yaml +++ b/specs/ExifMakerNotes/Canon/ColorCalib2.yaml @@ -4,7 +4,7 @@ title: 'Canon ColorCalib2' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorCalibMap DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorCoefs.yaml b/specs/ExifMakerNotes/Canon/ColorCoefs.yaml index 4771add54..031329548 100644 --- a/specs/ExifMakerNotes/Canon/ColorCoefs.yaml +++ b/specs/ExifMakerNotes/Canon/ColorCoefs.yaml @@ -4,7 +4,7 @@ title: 'Canon ColorCoefs' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorCalibMap DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorCoefs2.yaml b/specs/ExifMakerNotes/Canon/ColorCoefs2.yaml index 4b99933e5..8f947277a 100644 --- a/specs/ExifMakerNotes/Canon/ColorCoefs2.yaml +++ b/specs/ExifMakerNotes/Canon/ColorCoefs2.yaml @@ -4,7 +4,7 @@ title: 'Canon ColorCoefs2' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorCalibMap DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorData1.yaml b/specs/ExifMakerNotes/Canon/ColorData1.yaml index 44899ab09..fb57bee56 100644 --- a/specs/ExifMakerNotes/Canon/ColorData1.yaml +++ b/specs/ExifMakerNotes/Canon/ColorData1.yaml @@ -4,7 +4,7 @@ title: 'Canon Color Data1' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorData2.yaml b/specs/ExifMakerNotes/Canon/ColorData2.yaml index 0ec008f1f..ff7025b71 100644 --- a/specs/ExifMakerNotes/Canon/ColorData2.yaml +++ b/specs/ExifMakerNotes/Canon/ColorData2.yaml @@ -4,7 +4,7 @@ title: 'Canon Color Data2' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorData3.yaml b/specs/ExifMakerNotes/Canon/ColorData3.yaml index 629ac9b4f..1b78f7526 100644 --- a/specs/ExifMakerNotes/Canon/ColorData3.yaml +++ b/specs/ExifMakerNotes/Canon/ColorData3.yaml @@ -4,7 +4,7 @@ title: 'Canon Color Data3' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorData4.yaml b/specs/ExifMakerNotes/Canon/ColorData4.yaml index 812f7304c..343248cf2 100644 --- a/specs/ExifMakerNotes/Canon/ColorData4.yaml +++ b/specs/ExifMakerNotes/Canon/ColorData4.yaml @@ -4,7 +4,7 @@ title: 'Canon Color Data4' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorData5.yaml b/specs/ExifMakerNotes/Canon/ColorData5.yaml index 995e573e0..adece0905 100644 --- a/specs/ExifMakerNotes/Canon/ColorData5.yaml +++ b/specs/ExifMakerNotes/Canon/ColorData5.yaml @@ -4,7 +4,7 @@ title: 'Canon Color Data5' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorData6.yaml b/specs/ExifMakerNotes/Canon/ColorData6.yaml index 111f3b345..a88eb21a2 100644 --- a/specs/ExifMakerNotes/Canon/ColorData6.yaml +++ b/specs/ExifMakerNotes/Canon/ColorData6.yaml @@ -4,7 +4,7 @@ title: 'Canon Color Data6' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorData7.yaml b/specs/ExifMakerNotes/Canon/ColorData7.yaml index 433cfe5bd..8f7298861 100644 --- a/specs/ExifMakerNotes/Canon/ColorData7.yaml +++ b/specs/ExifMakerNotes/Canon/ColorData7.yaml @@ -4,7 +4,7 @@ title: 'Canon Color Data7' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorData8.yaml b/specs/ExifMakerNotes/Canon/ColorData8.yaml index 995f8ce69..1a699a8ee 100644 --- a/specs/ExifMakerNotes/Canon/ColorData8.yaml +++ b/specs/ExifMakerNotes/Canon/ColorData8.yaml @@ -4,7 +4,7 @@ title: 'Canon Color Data8' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorData9.yaml b/specs/ExifMakerNotes/Canon/ColorData9.yaml index 1fde2352b..99b96103b 100644 --- a/specs/ExifMakerNotes/Canon/ColorData9.yaml +++ b/specs/ExifMakerNotes/Canon/ColorData9.yaml @@ -4,7 +4,7 @@ title: 'Canon Color Data9' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorDataUnknown.yaml b/specs/ExifMakerNotes/Canon/ColorDataUnknown.yaml index 17ea67a7c..86f9d16dd 100644 --- a/specs/ExifMakerNotes/Canon/ColorDataUnknown.yaml +++ b/specs/ExifMakerNotes/Canon/ColorDataUnknown.yaml @@ -4,7 +4,7 @@ title: 'Canon Color DataUnknown' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\ColorDataMap DOMNode: map format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ColorInfo.yaml b/specs/ExifMakerNotes/Canon/ColorInfo.yaml index 1b6f41f83..061a47772 100644 --- a/specs/ExifMakerNotes/Canon/ColorInfo.yaml +++ b/specs/ExifMakerNotes/Canon/ColorInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon ColorInfo' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ContrastInfo.yaml b/specs/ExifMakerNotes/Canon/ContrastInfo.yaml index 599ee39a1..ea99faa17 100644 --- a/specs/ExifMakerNotes/Canon/ContrastInfo.yaml +++ b/specs/ExifMakerNotes/Canon/ContrastInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon ContrastInfo' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/CropInfo.yaml b/specs/ExifMakerNotes/Canon/CropInfo.yaml index 62c817add..e76316e55 100644 --- a/specs/ExifMakerNotes/Canon/CropInfo.yaml +++ b/specs/ExifMakerNotes/Canon/CropInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon CropInfo' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ExposureInfo.yaml b/specs/ExifMakerNotes/Canon/ExposureInfo.yaml index 6ce1db42f..8e351592b 100644 --- a/specs/ExifMakerNotes/Canon/ExposureInfo.yaml +++ b/specs/ExifMakerNotes/Canon/ExposureInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon ExposureInfo' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/FaceDetect1.yaml b/specs/ExifMakerNotes/Canon/FaceDetect1.yaml index 68f930ada..4dfb7da86 100644 --- a/specs/ExifMakerNotes/Canon/FaceDetect1.yaml +++ b/specs/ExifMakerNotes/Canon/FaceDetect1.yaml @@ -4,7 +4,7 @@ title: 'Canon FaceDetect1' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/FaceDetect2.yaml b/specs/ExifMakerNotes/Canon/FaceDetect2.yaml index 256a62084..d1670d597 100644 --- a/specs/ExifMakerNotes/Canon/FaceDetect2.yaml +++ b/specs/ExifMakerNotes/Canon/FaceDetect2.yaml @@ -4,7 +4,7 @@ title: 'Canon FaceDetect2' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/FaceDetect3.yaml b/specs/ExifMakerNotes/Canon/FaceDetect3.yaml index 130cced57..50c4f9e7d 100644 --- a/specs/ExifMakerNotes/Canon/FaceDetect3.yaml +++ b/specs/ExifMakerNotes/Canon/FaceDetect3.yaml @@ -4,7 +4,7 @@ title: 'Canon FaceDetect3' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/FileInfo.yaml b/specs/ExifMakerNotes/Canon/FileInfo.yaml index 652a45d04..78548955d 100644 --- a/specs/ExifMakerNotes/Canon/FileInfo.yaml +++ b/specs/ExifMakerNotes/Canon/FileInfo.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Map DOMNode: map hasIndexSize: true format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/FilterInfo.yaml b/specs/ExifMakerNotes/Canon/FilterInfo.yaml index bd2b5d2b1..f563d5579 100644 --- a/specs/ExifMakerNotes/Canon/FilterInfo.yaml +++ b/specs/ExifMakerNotes/Canon/FilterInfo.yaml @@ -3,7 +3,7 @@ name: CanonFilterInfo title: 'Canon FilterInfo' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\FilterInfoIndex DOMNode: filterInfo -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/Flags.yaml b/specs/ExifMakerNotes/Canon/Flags.yaml index 128f25ffa..3bffd9388 100644 --- a/specs/ExifMakerNotes/Canon/Flags.yaml +++ b/specs/ExifMakerNotes/Canon/Flags.yaml @@ -1,10 +1,10 @@ collection: ExifMakerNotes\Canon\Flags name: CanonFlags title: 'Canon Flags' -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/FocalInfo.yaml b/specs/ExifMakerNotes/Canon/FocalInfo.yaml index f637a510e..5bcedb583 100644 --- a/specs/ExifMakerNotes/Canon/FocalInfo.yaml +++ b/specs/ExifMakerNotes/Canon/FocalInfo.yaml @@ -1,10 +1,10 @@ collection: ExifMakerNotes\Canon\FocalInfo name: CanonFocalInfo title: 'Canon FocalInfo' -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: index format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/FocalLength.yaml b/specs/ExifMakerNotes/Canon/FocalLength.yaml index 3622cca7e..61fbf5c1e 100644 --- a/specs/ExifMakerNotes/Canon/FocalLength.yaml +++ b/specs/ExifMakerNotes/Canon/FocalLength.yaml @@ -4,7 +4,7 @@ title: 'Canon Focal Length' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/HDRInfo.yaml b/specs/ExifMakerNotes/Canon/HDRInfo.yaml index 470191fda..cbe0bc079 100644 --- a/specs/ExifMakerNotes/Canon/HDRInfo.yaml +++ b/specs/ExifMakerNotes/Canon/HDRInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon HDRInfo' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/LensInfo.yaml b/specs/ExifMakerNotes/Canon/LensInfo.yaml index 343e33d29..fbb7ec6ee 100644 --- a/specs/ExifMakerNotes/Canon/LensInfo.yaml +++ b/specs/ExifMakerNotes/Canon/LensInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon LensInfo' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Undefined -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/LightingOpt.yaml b/specs/ExifMakerNotes/Canon/LightingOpt.yaml index b44e107a2..5926a6758 100644 --- a/specs/ExifMakerNotes/Canon/LightingOpt.yaml +++ b/specs/ExifMakerNotes/Canon/LightingOpt.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Map DOMNode: map hasIndexSize: true format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/Main.yaml b/specs/ExifMakerNotes/Canon/Main.yaml index 4b9af92fe..26aa5155e 100644 --- a/specs/ExifMakerNotes/Canon/Main.yaml +++ b/specs/ExifMakerNotes/Canon/Main.yaml @@ -1,9 +1,9 @@ collection: ExifMakerNotes\Canon\Main name: Canon title: 'Canon Maker Notes' -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: makerNote -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/MeasuredColor.yaml b/specs/ExifMakerNotes/Canon/MeasuredColor.yaml index 3c7e42c9f..01125df53 100644 --- a/specs/ExifMakerNotes/Canon/MeasuredColor.yaml +++ b/specs/ExifMakerNotes/Canon/MeasuredColor.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Index DOMNode: index hasIndexSize: true format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ModifiedInfo.yaml b/specs/ExifMakerNotes/Canon/ModifiedInfo.yaml index 714b5b1b8..233dc4f09 100644 --- a/specs/ExifMakerNotes/Canon/ModifiedInfo.yaml +++ b/specs/ExifMakerNotes/Canon/ModifiedInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon ModifiedInfo' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/MovieInfo.yaml b/specs/ExifMakerNotes/Canon/MovieInfo.yaml index 809588c44..9581d79fc 100644 --- a/specs/ExifMakerNotes/Canon/MovieInfo.yaml +++ b/specs/ExifMakerNotes/Canon/MovieInfo.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Index DOMNode: index hasIndexSize: true format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/MultiExp.yaml b/specs/ExifMakerNotes/Canon/MultiExp.yaml index 641ae2234..9d84d2935 100644 --- a/specs/ExifMakerNotes/Canon/MultiExp.yaml +++ b/specs/ExifMakerNotes/Canon/MultiExp.yaml @@ -4,7 +4,7 @@ title: 'Canon MultiExp' class: FileEye\MediaProbe\Block\Map DOMNode: map format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/MyColors.yaml b/specs/ExifMakerNotes/Canon/MyColors.yaml index 66d8afbb9..bbb3ae9f6 100644 --- a/specs/ExifMakerNotes/Canon/MyColors.yaml +++ b/specs/ExifMakerNotes/Canon/MyColors.yaml @@ -4,7 +4,7 @@ title: 'Canon MyColors' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/PSInfo.yaml b/specs/ExifMakerNotes/Canon/PSInfo.yaml index eb1f91a8a..c9650a12c 100644 --- a/specs/ExifMakerNotes/Canon/PSInfo.yaml +++ b/specs/ExifMakerNotes/Canon/PSInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon PSInfo' class: FileEye\MediaProbe\Block\IndexMap DOMNode: index format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/PSInfo2.yaml b/specs/ExifMakerNotes/Canon/PSInfo2.yaml index 446de5c20..c3b43fab2 100644 --- a/specs/ExifMakerNotes/Canon/PSInfo2.yaml +++ b/specs/ExifMakerNotes/Canon/PSInfo2.yaml @@ -4,7 +4,7 @@ title: 'Canon PSInfo2' class: FileEye\MediaProbe\Block\IndexMap DOMNode: index format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/Panorama.yaml b/specs/ExifMakerNotes/Canon/Panorama.yaml index a30a967f7..f26a13298 100644 --- a/specs/ExifMakerNotes/Canon/Panorama.yaml +++ b/specs/ExifMakerNotes/Canon/Panorama.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Index DOMNode: index hasIndexSize: true format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/PreviewImageInfo.yaml b/specs/ExifMakerNotes/Canon/PreviewImageInfo.yaml index ed976d829..61a4caca3 100644 --- a/specs/ExifMakerNotes/Canon/PreviewImageInfo.yaml +++ b/specs/ExifMakerNotes/Canon/PreviewImageInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon PreviewImageInfo' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/Processing.yaml b/specs/ExifMakerNotes/Canon/Processing.yaml index d372bbbb5..338b92d85 100644 --- a/specs/ExifMakerNotes/Canon/Processing.yaml +++ b/specs/ExifMakerNotes/Canon/Processing.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Index DOMNode: index hasIndexSize: true format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/SensorInfo.yaml b/specs/ExifMakerNotes/Canon/SensorInfo.yaml index 5bfda36df..84272edd8 100644 --- a/specs/ExifMakerNotes/Canon/SensorInfo.yaml +++ b/specs/ExifMakerNotes/Canon/SensorInfo.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Index DOMNode: index hasIndexSize: true format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/SerialInfo.yaml b/specs/ExifMakerNotes/Canon/SerialInfo.yaml index 40ff293a0..a8dd01faf 100644 --- a/specs/ExifMakerNotes/Canon/SerialInfo.yaml +++ b/specs/ExifMakerNotes/Canon/SerialInfo.yaml @@ -4,7 +4,7 @@ title: 'Canon SerialInfo' class: FileEye\MediaProbe\Block\IndexMap DOMNode: index format: Byte -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/ShotInfo.yaml b/specs/ExifMakerNotes/Canon/ShotInfo.yaml index 859f213a9..83f8f973a 100644 --- a/specs/ExifMakerNotes/Canon/ShotInfo.yaml +++ b/specs/ExifMakerNotes/Canon/ShotInfo.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Map DOMNode: map hasIndexSize: true format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/Skip.yaml b/specs/ExifMakerNotes/Canon/Skip.yaml index 5cc8b2737..14760afb3 100644 --- a/specs/ExifMakerNotes/Canon/Skip.yaml +++ b/specs/ExifMakerNotes/Canon/Skip.yaml @@ -4,7 +4,7 @@ name: CanonSkip title: 'Canon Skip' class: FileEye\MediaProbe\Block\Index DOMNode: index -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/TimeInfo.yaml b/specs/ExifMakerNotes/Canon/TimeInfo.yaml index 5c7563a34..a74af4524 100644 --- a/specs/ExifMakerNotes/Canon/TimeInfo.yaml +++ b/specs/ExifMakerNotes/Canon/TimeInfo.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Map DOMNode: map hasIndexSize: true format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/Uuid.yaml b/specs/ExifMakerNotes/Canon/Uuid.yaml index 1ba826508..cbc8aba30 100644 --- a/specs/ExifMakerNotes/Canon/Uuid.yaml +++ b/specs/ExifMakerNotes/Canon/Uuid.yaml @@ -4,7 +4,7 @@ name: CanonUuid title: 'Canon Uuid' class: FileEye\MediaProbe\Block\Index DOMNode: index -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/VignettingCorr.yaml b/specs/ExifMakerNotes/Canon/VignettingCorr.yaml index b76e3b8e0..a870f4957 100644 --- a/specs/ExifMakerNotes/Canon/VignettingCorr.yaml +++ b/specs/ExifMakerNotes/Canon/VignettingCorr.yaml @@ -4,7 +4,7 @@ title: 'Canon VignettingCorr' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/VignettingCorr2.yaml b/specs/ExifMakerNotes/Canon/VignettingCorr2.yaml index a11bfa8d9..016056499 100644 --- a/specs/ExifMakerNotes/Canon/VignettingCorr2.yaml +++ b/specs/ExifMakerNotes/Canon/VignettingCorr2.yaml @@ -5,7 +5,7 @@ class: FileEye\MediaProbe\Block\Map DOMNode: map hasIndexSize: true format: Long -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/Canon/VignettingCorrUnknown.yaml b/specs/ExifMakerNotes/Canon/VignettingCorrUnknown.yaml index b8914508b..884831e97 100644 --- a/specs/ExifMakerNotes/Canon/VignettingCorrUnknown.yaml +++ b/specs/ExifMakerNotes/Canon/VignettingCorrUnknown.yaml @@ -4,7 +4,7 @@ title: 'Canon VignettingCorrUnknown' class: FileEye\MediaProbe\Block\Index DOMNode: index format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: Canon diff --git a/specs/ExifMakerNotes/CanonCustom/Functions10D.yaml b/specs/ExifMakerNotes/CanonCustom/Functions10D.yaml index 6cfb9f41a..45efea81e 100644 --- a/specs/ExifMakerNotes/CanonCustom/Functions10D.yaml +++ b/specs/ExifMakerNotes/CanonCustom/Functions10D.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom Functions10D' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/Functions1D.yaml b/specs/ExifMakerNotes/CanonCustom/Functions1D.yaml index 88cfdc673..be9e5bcfe 100644 --- a/specs/ExifMakerNotes/CanonCustom/Functions1D.yaml +++ b/specs/ExifMakerNotes/CanonCustom/Functions1D.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom Functions1D' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/Functions2.yaml b/specs/ExifMakerNotes/CanonCustom/Functions2.yaml index 457736107..02669066a 100644 --- a/specs/ExifMakerNotes/CanonCustom/Functions2.yaml +++ b/specs/ExifMakerNotes/CanonCustom/Functions2.yaml @@ -3,7 +3,7 @@ name: CanonCustomFunctions2 title: 'CanonCustom Functions2 - a set of custom function tags which are (reasonably) consistent across models' class: FileEye\MediaProbe\Block\Exif\Vendor\Canon\CustomFunctions2 DOMNode: index -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/Functions20D.yaml b/specs/ExifMakerNotes/CanonCustom/Functions20D.yaml index 4c62c39a8..8c549f400 100644 --- a/specs/ExifMakerNotes/CanonCustom/Functions20D.yaml +++ b/specs/ExifMakerNotes/CanonCustom/Functions20D.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom Functions20D' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/Functions30D.yaml b/specs/ExifMakerNotes/CanonCustom/Functions30D.yaml index 4eae24431..3099a6129 100644 --- a/specs/ExifMakerNotes/CanonCustom/Functions30D.yaml +++ b/specs/ExifMakerNotes/CanonCustom/Functions30D.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom Functions30D' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/Functions350D.yaml b/specs/ExifMakerNotes/CanonCustom/Functions350D.yaml index 8d75720f9..8f4f0271e 100644 --- a/specs/ExifMakerNotes/CanonCustom/Functions350D.yaml +++ b/specs/ExifMakerNotes/CanonCustom/Functions350D.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom Functions350D' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/Functions400D.yaml b/specs/ExifMakerNotes/CanonCustom/Functions400D.yaml index 390d9e730..07386ccdb 100644 --- a/specs/ExifMakerNotes/CanonCustom/Functions400D.yaml +++ b/specs/ExifMakerNotes/CanonCustom/Functions400D.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom Functions400D' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/Functions5D.yaml b/specs/ExifMakerNotes/CanonCustom/Functions5D.yaml index e21eb58bf..c70da0ae4 100644 --- a/specs/ExifMakerNotes/CanonCustom/Functions5D.yaml +++ b/specs/ExifMakerNotes/CanonCustom/Functions5D.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom Functions5D' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/FunctionsD30.yaml b/specs/ExifMakerNotes/CanonCustom/FunctionsD30.yaml index e40bbb43e..8de88ac66 100644 --- a/specs/ExifMakerNotes/CanonCustom/FunctionsD30.yaml +++ b/specs/ExifMakerNotes/CanonCustom/FunctionsD30.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom FunctionsD30' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/PersonalFuncValues.yaml b/specs/ExifMakerNotes/CanonCustom/PersonalFuncValues.yaml index 4cc7e8b95..b7e25e8c0 100644 --- a/specs/ExifMakerNotes/CanonCustom/PersonalFuncValues.yaml +++ b/specs/ExifMakerNotes/CanonCustom/PersonalFuncValues.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom PersonalFuncValues' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonCustom/PersonalFuncs.yaml b/specs/ExifMakerNotes/CanonCustom/PersonalFuncs.yaml index 44691103a..0fe194bb1 100644 --- a/specs/ExifMakerNotes/CanonCustom/PersonalFuncs.yaml +++ b/specs/ExifMakerNotes/CanonCustom/PersonalFuncs.yaml @@ -4,7 +4,7 @@ title: 'CanonCustom PersonalFuncs' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonCustom diff --git a/specs/ExifMakerNotes/CanonRaw/DecoderTable.yaml b/specs/ExifMakerNotes/CanonRaw/DecoderTable.yaml index d19ba09c3..597aba879 100644 --- a/specs/ExifMakerNotes/CanonRaw/DecoderTable.yaml +++ b/specs/ExifMakerNotes/CanonRaw/DecoderTable.yaml @@ -4,7 +4,7 @@ title: 'CanonRaw DecoderTable' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonRaw/ExposureInfo.yaml b/specs/ExifMakerNotes/CanonRaw/ExposureInfo.yaml index 8d6398486..09bf26606 100644 --- a/specs/ExifMakerNotes/CanonRaw/ExposureInfo.yaml +++ b/specs/ExifMakerNotes/CanonRaw/ExposureInfo.yaml @@ -4,7 +4,7 @@ title: 'CanonRaw ExposureInfo' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonRaw/FlashInfo.yaml b/specs/ExifMakerNotes/CanonRaw/FlashInfo.yaml index 784158075..9bcc4d988 100644 --- a/specs/ExifMakerNotes/CanonRaw/FlashInfo.yaml +++ b/specs/ExifMakerNotes/CanonRaw/FlashInfo.yaml @@ -4,7 +4,7 @@ title: 'CanonRaw FlashInfo' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonRaw/ImageFormat.yaml b/specs/ExifMakerNotes/CanonRaw/ImageFormat.yaml index 922e81742..b2e1da8bf 100644 --- a/specs/ExifMakerNotes/CanonRaw/ImageFormat.yaml +++ b/specs/ExifMakerNotes/CanonRaw/ImageFormat.yaml @@ -4,7 +4,7 @@ title: 'CanonRaw ImageFormat' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonRaw/ImageInfo.yaml b/specs/ExifMakerNotes/CanonRaw/ImageInfo.yaml index 9cbe0910b..20e46c0b2 100644 --- a/specs/ExifMakerNotes/CanonRaw/ImageInfo.yaml +++ b/specs/ExifMakerNotes/CanonRaw/ImageInfo.yaml @@ -4,7 +4,7 @@ title: 'CanonRaw ImageInfo' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonRaw/Main.yaml b/specs/ExifMakerNotes/CanonRaw/Main.yaml index 18a2bb64f..5f6de618c 100644 --- a/specs/ExifMakerNotes/CanonRaw/Main.yaml +++ b/specs/ExifMakerNotes/CanonRaw/Main.yaml @@ -4,7 +4,7 @@ title: CanonRaw class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonRaw/MakeModel.yaml b/specs/ExifMakerNotes/CanonRaw/MakeModel.yaml index 5bac8dc12..bec1df9bd 100644 --- a/specs/ExifMakerNotes/CanonRaw/MakeModel.yaml +++ b/specs/ExifMakerNotes/CanonRaw/MakeModel.yaml @@ -4,7 +4,7 @@ title: 'CanonRaw MakeModel' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonRaw/RawJpgInfo.yaml b/specs/ExifMakerNotes/CanonRaw/RawJpgInfo.yaml index 7780a0f9b..06c62bb5e 100644 --- a/specs/ExifMakerNotes/CanonRaw/RawJpgInfo.yaml +++ b/specs/ExifMakerNotes/CanonRaw/RawJpgInfo.yaml @@ -4,7 +4,7 @@ title: 'CanonRaw RawJpgInfo' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonRaw/TimeStamp.yaml b/specs/ExifMakerNotes/CanonRaw/TimeStamp.yaml index 3cc368313..5a262bad7 100644 --- a/specs/ExifMakerNotes/CanonRaw/TimeStamp.yaml +++ b/specs/ExifMakerNotes/CanonRaw/TimeStamp.yaml @@ -4,7 +4,7 @@ title: 'CanonRaw TimeStamp' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonRaw/WhiteSample.yaml b/specs/ExifMakerNotes/CanonRaw/WhiteSample.yaml index a631e2060..4d6096034 100644 --- a/specs/ExifMakerNotes/CanonRaw/WhiteSample.yaml +++ b/specs/ExifMakerNotes/CanonRaw/WhiteSample.yaml @@ -4,7 +4,7 @@ title: 'CanonRaw WhiteSample' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonRaw diff --git a/specs/ExifMakerNotes/CanonVRD/CropInfo.yaml b/specs/ExifMakerNotes/CanonVRD/CropInfo.yaml index edbd386e9..9fa4c0008 100644 --- a/specs/ExifMakerNotes/CanonVRD/CropInfo.yaml +++ b/specs/ExifMakerNotes/CanonVRD/CropInfo.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD CropInfo' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/DLOInfo.yaml b/specs/ExifMakerNotes/CanonVRD/DLOInfo.yaml index d6f75b85c..e7255903c 100644 --- a/specs/ExifMakerNotes/CanonVRD/DLOInfo.yaml +++ b/specs/ExifMakerNotes/CanonVRD/DLOInfo.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD DLOInfo' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/DR4.yaml b/specs/ExifMakerNotes/CanonVRD/DR4.yaml index 0f95327ab..f67e63aa3 100644 --- a/specs/ExifMakerNotes/CanonVRD/DR4.yaml +++ b/specs/ExifMakerNotes/CanonVRD/DR4.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD DR4' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/DR4Header.yaml b/specs/ExifMakerNotes/CanonVRD/DR4Header.yaml index b4fafa4c1..26a8d34c2 100644 --- a/specs/ExifMakerNotes/CanonVRD/DR4Header.yaml +++ b/specs/ExifMakerNotes/CanonVRD/DR4Header.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD DR4Header' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/DustInfo.yaml b/specs/ExifMakerNotes/CanonVRD/DustInfo.yaml index 044e5e750..4d112ae80 100644 --- a/specs/ExifMakerNotes/CanonVRD/DustInfo.yaml +++ b/specs/ExifMakerNotes/CanonVRD/DustInfo.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD DustInfo' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/GammaInfo.yaml b/specs/ExifMakerNotes/CanonVRD/GammaInfo.yaml index 0a23aaf0d..86ec9d3b7 100644 --- a/specs/ExifMakerNotes/CanonVRD/GammaInfo.yaml +++ b/specs/ExifMakerNotes/CanonVRD/GammaInfo.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD GammaInfo' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/IHL.yaml b/specs/ExifMakerNotes/CanonVRD/IHL.yaml index f6790ce74..d3b05e28b 100644 --- a/specs/ExifMakerNotes/CanonVRD/IHL.yaml +++ b/specs/ExifMakerNotes/CanonVRD/IHL.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD IHL' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/Main.yaml b/specs/ExifMakerNotes/CanonVRD/Main.yaml index f46cf8305..eb8e15d02 100644 --- a/specs/ExifMakerNotes/CanonVRD/Main.yaml +++ b/specs/ExifMakerNotes/CanonVRD/Main.yaml @@ -4,7 +4,7 @@ title: CanonVRD class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/StampInfo.yaml b/specs/ExifMakerNotes/CanonVRD/StampInfo.yaml index 5b1a7c50b..d214d3079 100644 --- a/specs/ExifMakerNotes/CanonVRD/StampInfo.yaml +++ b/specs/ExifMakerNotes/CanonVRD/StampInfo.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD StampInfo' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/StampTool.yaml b/specs/ExifMakerNotes/CanonVRD/StampTool.yaml index 2b32f7070..f5fcad61d 100644 --- a/specs/ExifMakerNotes/CanonVRD/StampTool.yaml +++ b/specs/ExifMakerNotes/CanonVRD/StampTool.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD StampTool' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/ToneCurve.yaml b/specs/ExifMakerNotes/CanonVRD/ToneCurve.yaml index 734b2a86e..ebebfcdd2 100644 --- a/specs/ExifMakerNotes/CanonVRD/ToneCurve.yaml +++ b/specs/ExifMakerNotes/CanonVRD/ToneCurve.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD ToneCurve' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/Ver1.yaml b/specs/ExifMakerNotes/CanonVRD/Ver1.yaml index b15aba8a2..92846581e 100644 --- a/specs/ExifMakerNotes/CanonVRD/Ver1.yaml +++ b/specs/ExifMakerNotes/CanonVRD/Ver1.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD Ver1' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/ExifMakerNotes/CanonVRD/Ver2.yaml b/specs/ExifMakerNotes/CanonVRD/Ver2.yaml index e5d3be5b7..67cf2ef87 100644 --- a/specs/ExifMakerNotes/CanonVRD/Ver2.yaml +++ b/specs/ExifMakerNotes/CanonVRD/Ver2.yaml @@ -4,7 +4,7 @@ title: 'CanonVRD Ver2' class: tbd DOMNode: tbd format: Short -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: CanonVRD diff --git a/specs/Exif/Exif.yaml b/specs/Jpeg/Exif.yaml similarity index 57% rename from specs/Exif/Exif.yaml rename to specs/Jpeg/Exif.yaml index 3efaf899a..59a9e862e 100644 --- a/specs/Exif/Exif.yaml +++ b/specs/Jpeg/Exif.yaml @@ -1,6 +1,6 @@ -collection: Exif\Exif +collection: Jpeg\Exif title: 'JPEG Exif data' -class: FileEye\MediaProbe\Block\Exif\Exif +class: FileEye\MediaProbe\Block\Jpeg\Exif DOMNode: exif items: Tiff: diff --git a/specs/Jpeg/Jpeg.yaml b/specs/Jpeg/Jpeg.yaml index 0187cef76..9b43882f1 100644 --- a/specs/Jpeg/Jpeg.yaml +++ b/specs/Jpeg/Jpeg.yaml @@ -1,6 +1,6 @@ collection: Jpeg\Jpeg title: JPEG image -class: FileEye\MediaProbe\Block\Jpeg +class: FileEye\MediaProbe\Block\Jpeg\Jpeg parser: FileEye\MediaProbe\Parser\Jpeg\Jpeg writer: FileEye\MediaProbe\Writer\Jpeg\Jpeg DOMNode: jpeg diff --git a/specs/Jpeg/Segment.yaml b/specs/Jpeg/Segment.yaml index 5af468f73..072be861b 100644 --- a/specs/Jpeg/Segment.yaml +++ b/specs/Jpeg/Segment.yaml @@ -1,5 +1,5 @@ collection: Jpeg\Segment title: Generic JPEG data segment -class: FileEye\MediaProbe\Block\JpegSegment +class: FileEye\MediaProbe\Block\Jpeg\Segment DOMNode: jpegSegment items: {} diff --git a/specs/Jpeg/SegmentApp1.yaml b/specs/Jpeg/SegmentApp1.yaml index db88ed5fd..89ede9e20 100644 --- a/specs/Jpeg/SegmentApp1.yaml +++ b/specs/Jpeg/SegmentApp1.yaml @@ -2,8 +2,8 @@ collection: Jpeg\SegmentApp1 name: APP1 title: 'JPEG Application segment 1' payload: variable -class: FileEye\MediaProbe\Block\JpegSegmentApp1 +class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 DOMNode: jpegSegment items: Exif: - collection: Exif\Exif + collection: Jpeg\Exif diff --git a/specs/Jpeg/SegmentCom.yaml b/specs/Jpeg/SegmentCom.yaml index 7e410225d..e1ce52afb 100644 --- a/specs/Jpeg/SegmentCom.yaml +++ b/specs/Jpeg/SegmentCom.yaml @@ -2,6 +2,6 @@ collection: Jpeg\SegmentCom name: COM title: 'JPEG Comment' payload: variable -class: FileEye\MediaProbe\Block\JpegSegmentCom +class: FileEye\MediaProbe\Block\Jpeg\SegmentCom DOMNode: jpegSegment items: {} diff --git a/specs/Jpeg/SegmentSos.yaml b/specs/Jpeg/SegmentSos.yaml index 064fca180..44adb511c 100644 --- a/specs/Jpeg/SegmentSos.yaml +++ b/specs/Jpeg/SegmentSos.yaml @@ -2,6 +2,6 @@ collection: Jpeg\SegmentSos name: SOS title: 'JPEG Start of scan' payload: scan -class: FileEye\MediaProbe\Block\JpegSegmentSos +class: FileEye\MediaProbe\Block\Jpeg\SegmentSos DOMNode: jpegSegment items: {} diff --git a/specs/Tag.yaml b/specs/Tag.yaml deleted file mode 100644 index cf7313ada..000000000 --- a/specs/Tag.yaml +++ /dev/null @@ -1,5 +0,0 @@ -collection: Tag -title: 'Tag' -class: FileEye\MediaProbe\Block\Tag -DOMNode: tag -items: {} diff --git a/specs/Tiff/Ifd0.yaml b/specs/Tiff/Ifd0.yaml index 69f0ed08a..0b5b18d50 100644 --- a/specs/Tiff/Ifd0.yaml +++ b/specs/Tiff/Ifd0.yaml @@ -1,15 +1,15 @@ collection: Tiff\Ifd0 name: IFD0 title: IFD0 -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: ifd -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag alias: - '0' - Main postParse: - - 'FileEye\MediaProbe\Block\Exif\Ifd::thumbnailToBlock' - - 'FileEye\MediaProbe\Block\Exif\Ifd::makerNoteToBlock' + - 'FileEye\MediaProbe\Block\Tiff\Ifd::thumbnailToBlock' + - 'FileEye\MediaProbe\Block\Tiff\Ifd::makerNoteToBlock' compiler: exiftool: g1: IFD0 diff --git a/specs/Tiff/Ifd1.yaml b/specs/Tiff/Ifd1.yaml index c880f42f4..a603d16b9 100644 --- a/specs/Tiff/Ifd1.yaml +++ b/specs/Tiff/Ifd1.yaml @@ -1,14 +1,14 @@ collection: Tiff\Ifd1 name: IFD1 title: IFD1 -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: ifd -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag alias: - '1' - Thumbnail postParse: - - 'FileEye\MediaProbe\Block\Exif\Ifd::thumbnailToBlock' + - 'FileEye\MediaProbe\Block\Tiff\Ifd::thumbnailToBlock' compiler: exiftool: g1: IFD1 diff --git a/specs/Tiff/IfdAny.yaml b/specs/Tiff/IfdAny.yaml index 2f1c49c5b..56f5361c1 100644 --- a/specs/Tiff/IfdAny.yaml +++ b/specs/Tiff/IfdAny.yaml @@ -1,7 +1,7 @@ collection: Tiff\IfdAny title: 'A catchall generic IFD definition, used as a fallback to describe tags that are not expected in a specific IFD.' -class: FileEye\MediaProbe\Block\Exif\Ifd -defaultItemCollection: Tag +class: FileEye\MediaProbe\Block\Tiff\Ifd +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: '*' diff --git a/specs/Tiff/IfdExif.yaml b/specs/Tiff/IfdExif.yaml index a8a87a5ca..659b66c88 100644 --- a/specs/Tiff/IfdExif.yaml +++ b/specs/Tiff/IfdExif.yaml @@ -1,9 +1,9 @@ collection: Tiff\IfdExif name: ExifIFD title: 'Exif IFD' -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: ifd -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: xpath: '//table[@name=''Exif::Main'']/tag[@g1=''ExifIFD'']' diff --git a/specs/Tiff/IfdGps.yaml b/specs/Tiff/IfdGps.yaml index 7ef74d458..f7197f4a8 100644 --- a/specs/Tiff/IfdGps.yaml +++ b/specs/Tiff/IfdGps.yaml @@ -1,9 +1,9 @@ collection: Tiff\IfdGps name: GPS title: 'GPS IFD' -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: ifd -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: g1: GPS diff --git a/specs/Tiff/IfdInteroperability.yaml b/specs/Tiff/IfdInteroperability.yaml index 4f0e29153..e89451b16 100644 --- a/specs/Tiff/IfdInteroperability.yaml +++ b/specs/Tiff/IfdInteroperability.yaml @@ -1,11 +1,11 @@ collection: Tiff\IfdInteroperability name: InteropIFD title: 'Interoperability IFD' -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: ifd alias: - Interop -defaultItemCollection: Tag +defaultItemCollection: Tiff\Tag compiler: exiftool: xpath: '//table[@name=''Exif::Main'']/tag[@g1=''InteropIFD'']' diff --git a/specs/Tiff/Tag.yaml b/specs/Tiff/Tag.yaml new file mode 100644 index 000000000..852a02ac1 --- /dev/null +++ b/specs/Tiff/Tag.yaml @@ -0,0 +1,5 @@ +collection: Tiff\Tag +title: 'Tag' +class: FileEye\MediaProbe\Block\Tiff\Tag +DOMNode: tag +items: {} diff --git a/specs/Tiff/Tiff.yaml b/specs/Tiff/Tiff.yaml index 57b06c0f0..d6cfcde93 100644 --- a/specs/Tiff/Tiff.yaml +++ b/specs/Tiff/Tiff.yaml @@ -1,6 +1,6 @@ collection: Tiff\Tiff title: 'TIFF image data' -class: FileEye\MediaProbe\Block\Tiff +class: FileEye\MediaProbe\Block\Tiff\Tiff parser: FileEye\MediaProbe\Parser\Tiff\Tiff writer: FileEye\MediaProbe\Writer\Tiff\Tiff DOMNode: tiff diff --git a/specs/Tiff/UnknownTag.yaml b/specs/Tiff/UnknownTag.yaml new file mode 100644 index 000000000..0c50e5895 --- /dev/null +++ b/specs/Tiff/UnknownTag.yaml @@ -0,0 +1,5 @@ +collection: Tiff\UnknownTag +title: 'Unknown Tag' +class: FileEye\MediaProbe\Block\Tiff\Tag +DOMNode: tag +items: {} diff --git a/specs/UnknownTag.yaml b/specs/UnknownTag.yaml deleted file mode 100644 index fdb8ce5ab..000000000 --- a/specs/UnknownTag.yaml +++ /dev/null @@ -1,5 +0,0 @@ -collection: UnknownTag -title: 'Unknown Tag' -class: FileEye\MediaProbe\Block\Tag -DOMNode: tag -items: {} diff --git a/src/Block/Exif/Vendor/Apple/MakerNote.php b/src/Block/Exif/Vendor/Apple/MakerNote.php index 732ae24f9..63953e948 100644 --- a/src/Block/Exif/Vendor/Apple/MakerNote.php +++ b/src/Block/Exif/Vendor/Apple/MakerNote.php @@ -2,10 +2,10 @@ namespace FileEye\MediaProbe\Block\Exif\Vendor\Apple; -use FileEye\MediaProbe\Block\Exif\Ifd; +use FileEye\MediaProbe\Block\Tiff\Ifd; use FileEye\MediaProbe\Block\ListBase; use FileEye\MediaProbe\Block\RawData; -use FileEye\MediaProbe\Block\Tag; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataException; @@ -23,33 +23,33 @@ class MakerNote extends Ifd /** * {@inheritdoc} */ - public function parseData(DataElement $data_element, int $start = 0, ?int $size = null, $xxx = 0): void + public function parseData(DataElement $dataElement, int $start = 0, ?int $size = null, $xxx = 0): void { $offset = $this->getDefinition()->getDataOffset(); // Load Apple's header as a raw data block. $header_data_definition = new ItemDefinition(CollectionFactory::get('RawData', ['name' => 'appleHeader']), DataFormat::BYTE, 14); - $header_data_window = new DataWindow($data_element, $offset, 14); + $header_data_window = new DataWindow($dataElement, $offset, 14); $header = new RawData($header_data_definition, $this); $header->parseData($header_data_window); $offset += 14; // Get the number of entries. - $n = $this->getItemsCountFromData($data_element, $offset); - assert($this->debugInfo(['dataElement' => $data_element, 'sequence' => $n])); + $n = $this->getItemsCountFromData($dataElement, $offset); + assert($this->debugInfo(['dataElement' => $dataElement, 'sequence' => $n])); // Load the Blocks. for ($i = 0; $i < $n; $i++) { $i_offset = $offset + 2 + 12 * $i; try { - $item_definition = $this->getItemDefinitionFromData($i, $data_element, $i_offset); + $item_definition = $this->getItemDefinitionFromData($i, $dataElement, $i_offset); $item_class = $item_definition->getCollection()->getPropertyValue('class'); $item = new $item_class($item_definition, $this); if (is_a($item_class, Ifd::class, true)) { - $item->parseData($data_element); + $item->parseData($dataElement); } else { - $item_data_window = new DataWindow($data_element, $item_definition->getDataOffset(), $item_definition->getSize()); + $item_data_window = new DataWindow($dataElement, $item_definition->getDataOffset(), $item_definition->getSize()); $item->parseData($item_data_window); } } catch (DataException $e) { @@ -58,7 +58,7 @@ public function parseData(DataElement $data_element, int $start = 0, ?int $size } // Invoke post-load callbacks. - $this->executePostParseCallbacks($data_element); + $this->executePostParseCallbacks($dataElement); } /** diff --git a/src/Block/Exif/Vendor/Apple/RunTime.php b/src/Block/Exif/Vendor/Apple/RunTime.php index 98533c876..9282e5ac0 100644 --- a/src/Block/Exif/Vendor/Apple/RunTime.php +++ b/src/Block/Exif/Vendor/Apple/RunTime.php @@ -6,7 +6,7 @@ use CFPropertyList\CFNumber; use CFPropertyList\CFPropertyList; use FileEye\MediaProbe\Block\ListBase; -use FileEye\MediaProbe\Block\Tag; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataString; use FileEye\MediaProbe\Data\DataWindow; diff --git a/src/Block/Exif/Vendor/Canon/AFInfoIndex.php b/src/Block/Exif/Vendor/Canon/AFInfoIndex.php index 5b7f1ece2..6509e202c 100644 --- a/src/Block/Exif/Vendor/Canon/AFInfoIndex.php +++ b/src/Block/Exif/Vendor/Canon/AFInfoIndex.php @@ -3,7 +3,7 @@ namespace FileEye\MediaProbe\Block\Exif\Vendor\Canon; use FileEye\MediaProbe\Block\Index; -use FileEye\MediaProbe\Block\Tag; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataWindow; use FileEye\MediaProbe\ItemDefinition; diff --git a/src/Block/Exif/Vendor/Canon/CameraInfoMap.php b/src/Block/Exif/Vendor/Canon/CameraInfoMap.php index 8c84f1e09..e1bdbd964 100644 --- a/src/Block/Exif/Vendor/Canon/CameraInfoMap.php +++ b/src/Block/Exif/Vendor/Canon/CameraInfoMap.php @@ -4,7 +4,7 @@ use FileEye\MediaProbe\Block\Index; use FileEye\MediaProbe\Block\Map; -use FileEye\MediaProbe\Block\Tag; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\ItemDefinition; use FileEye\MediaProbe\Data\DataFormat; @@ -20,9 +20,9 @@ class CameraInfoMap extends Map /** * {@inheritdoc} */ - protected function validate(DataElement $data_element): void + protected function validate(DataElement $dataElement): void { - parent::validate($data_element); + parent::validate($dataElement); // Gets the Model from IFD0. $model_entry = $this->getRootElement()->getElement("//ifd[@name='IFD0']/tag[@name='Model']/entry"); diff --git a/src/Block/Exif/Vendor/Canon/ColorDataMap.php b/src/Block/Exif/Vendor/Canon/ColorDataMap.php index b357ee8eb..0955d7ebc 100644 --- a/src/Block/Exif/Vendor/Canon/ColorDataMap.php +++ b/src/Block/Exif/Vendor/Canon/ColorDataMap.php @@ -4,7 +4,7 @@ use FileEye\MediaProbe\Block\Index; use FileEye\MediaProbe\Block\Map; -use FileEye\MediaProbe\Block\Tag; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\ItemDefinition; use FileEye\MediaProbe\Data\DataFormat; @@ -20,9 +20,9 @@ class ColorDataMap extends Map /** * {@inheritdoc} */ - protected function validate(DataElement $data_element): void + protected function validate(DataElement $dataElement): void { - parent::validate($data_element); + parent::validate($dataElement); // Find the appropriate map collection. foreach ($this->getCollection()->listItemIds() as $color_data_map) { diff --git a/src/Block/Exif/Vendor/Canon/CustomFunctions2.php b/src/Block/Exif/Vendor/Canon/CustomFunctions2.php index 2146ea597..9a4c4c177 100644 --- a/src/Block/Exif/Vendor/Canon/CustomFunctions2.php +++ b/src/Block/Exif/Vendor/Canon/CustomFunctions2.php @@ -3,7 +3,7 @@ namespace FileEye\MediaProbe\Block\Exif\Vendor\Canon; use FileEye\MediaProbe\Block\ListBase; -use FileEye\MediaProbe\Block\Tag; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataException; use FileEye\MediaProbe\Data\DataWindow; @@ -45,7 +45,7 @@ protected function doParseData(DataElement $data): void $item_collection = $this->getCollection()->getItemCollection( $id, null, - 'UnknownTag', + 'Tiff\UnknownTag', ['item' => $id, 'DOMNode' => 'tag'], $num, $this->getRootElement() diff --git a/src/Block/Exif/Vendor/Canon/CustomFunctions2Header.php b/src/Block/Exif/Vendor/Canon/CustomFunctions2Header.php index 0f7ed72a8..08267c421 100644 --- a/src/Block/Exif/Vendor/Canon/CustomFunctions2Header.php +++ b/src/Block/Exif/Vendor/Canon/CustomFunctions2Header.php @@ -3,7 +3,7 @@ namespace FileEye\MediaProbe\Block\Exif\Vendor\Canon; use FileEye\MediaProbe\Block\ListBase; -use FileEye\MediaProbe\Block\Tag; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataException; use FileEye\MediaProbe\Data\DataWindow; diff --git a/src/Block/Exif/Vendor/Canon/Filter.php b/src/Block/Exif/Vendor/Canon/Filter.php index d00969d58..9ed7ab36f 100644 --- a/src/Block/Exif/Vendor/Canon/Filter.php +++ b/src/Block/Exif/Vendor/Canon/Filter.php @@ -6,7 +6,7 @@ use FileEye\MediaProbe\Block\ListBase; use FileEye\MediaProbe\Block\Map; use FileEye\MediaProbe\Block\RawData; -use FileEye\MediaProbe\Block\Tag; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataFormat; use FileEye\MediaProbe\Data\DataWindow; diff --git a/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php b/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php index e0d0f7b04..f9c9b27f8 100644 --- a/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php +++ b/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php @@ -5,7 +5,7 @@ use FileEye\MediaProbe\Block\Index; use FileEye\MediaProbe\Block\Map; use FileEye\MediaProbe\Block\RawData; -use FileEye\MediaProbe\Block\Tag; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataWindow; diff --git a/src/Block/Index.php b/src/Block/Index.php index 6cb4c9468..984a6de77 100644 --- a/src/Block/Index.php +++ b/src/Block/Index.php @@ -17,7 +17,7 @@ class Index extends ListBase /** * Validates the list against the specification. */ - protected function validate(DataElement $data_element): void + protected function validate(DataElement $dataElement): void { // Warn if format is not as expected. $expected_format = $this->getCollection()->getPropertyValue('format'); @@ -37,7 +37,7 @@ protected function validate(DataElement $data_element): void // itself). This should match the size determined in the parent IFD. if ($this->getCollection()->getPropertyValue('hasIndexSize')) { $offset = 0; - $index_size = $this->getValueFromData($data_element, $offset, $this->getCollection()->getPropertyValue('format')[0]); + $index_size = $this->getValueFromData($dataElement, $offset, $this->getCollection()->getPropertyValue('format')[0]); if ($index_size !== $this->getDefinition()->getSize()) { $this->error("Size mismatch between IFD and index header"); } @@ -83,7 +83,7 @@ protected function doParseData(DataElement $data): void * The sequence (0-index) of the item in the index. * @param mixed $id * The id of the item in the index. - * @param DataElement $data_element + * @param DataElement $dataElement * the data element that will provide the data. * @param int $offset * the offset within the data element where the count can be @@ -92,11 +92,11 @@ protected function doParseData(DataElement $data): void * @return \FileEye\MediaProbe\ItemDefinition * the ItemDefinition object of the IFD item. */ - protected function getItemDefinitionFromData(int $seq, $id, DataElement $data_element, int $offset): ItemDefinition + protected function getItemDefinitionFromData(int $seq, $id, DataElement $dataElement, int $offset): ItemDefinition { // In case the item is not found in the collection for the index, // we still load it as a 'tag'. - $item_collection = $this->getCollection()->getItemCollection($id, 0, 'UnknownTag', [ + $item_collection = $this->getCollection()->getItemCollection($id, 0, 'Tiff\UnknownTag', [ 'item' => $id, 'DOMNode' => 'tag', ]); @@ -108,9 +108,9 @@ protected function getItemDefinitionFromData(int $seq, $id, DataElement $data_el /** * @todo xxx */ - protected function getValueFromData(DataElement $data_element, int &$offset, int $format, int $count = 1): mixed + protected function getValueFromData(DataElement $dataElement, int &$offset, int $format, int $count = 1): mixed { - $dataWindow = $this->getDataWindowFromData($data_element, $offset, $format, $count); + $dataWindow = $this->getDataWindowFromData($dataElement, $offset, $format, $count); switch ($format) { case DataFormat::BYTE: return $dataWindow->getByte(); @@ -136,7 +136,7 @@ protected function getValueFromData(DataElement $data_element, int &$offset, int /** * @todo xxx */ - protected function getDataWindowFromData(DataElement $data_element, int &$offset, int $format, int $count = 1): DataWindow + protected function getDataWindowFromData(DataElement $dataElement, int &$offset, int $format, int $count = 1): DataWindow { switch ($format) { case DataFormat::ASCII: @@ -160,7 +160,7 @@ protected function getDataWindowFromData(DataElement $data_element, int &$offset default: $this->error("Unsupported format."); } - $value = new DataWindow($data_element, $offset, $count * $size); + $value = new DataWindow($dataElement, $offset, $count * $size); $offset += ($count * $size); return $value; } diff --git a/src/Block/Jpeg.php b/src/Block/Jpeg.php deleted file mode 100644 index d9ed4bd01..000000000 --- a/src/Block/Jpeg.php +++ /dev/null @@ -1,30 +0,0 @@ -getSize() - $offset < strlen(self::EXIF_HEADER)) { + if ($dataElement->getSize() - $offset < strlen(self::EXIF_HEADER)) { return false; } // Verify the Exif header. - if ($data_element->getBytes($offset, strlen(self::EXIF_HEADER)) === self::EXIF_HEADER) { + if ($dataElement->getBytes($offset, strlen(self::EXIF_HEADER)) === self::EXIF_HEADER) { return true; } diff --git a/src/Block/Jpeg/Jpeg.php b/src/Block/Jpeg/Jpeg.php new file mode 100644 index 000000000..63f62761d --- /dev/null +++ b/src/Block/Jpeg/Jpeg.php @@ -0,0 +1,21 @@ +debugInfo(['dataElement' => $data])); // If we have an Exif table, parse it. if (Exif::isExifSegment($data, 4)) { - $exif = new ItemDefinition(CollectionFactory::get('Exif\Exif')); + $exif = new ItemDefinition(CollectionFactory::get('Jpeg\Exif')); $this->addBlock($exif)->parseData($data, 4, $data->getSize() - 4); } else { // We store the data as normal JPEG content if it could not be diff --git a/src/Block/JpegSegmentBase.php b/src/Block/Jpeg/SegmentBase.php similarity index 74% rename from src/Block/JpegSegmentBase.php rename to src/Block/Jpeg/SegmentBase.php index 36de8b646..077c8871a 100644 --- a/src/Block/JpegSegmentBase.php +++ b/src/Block/Jpeg/SegmentBase.php @@ -1,13 +1,13 @@ getDefinition()->getDataOffset(); // Get the number of entries. - $n = $this->getItemsCountFromData($data_element, $offset); - assert($this->debugInfo(['dataElement' => $data_element, 'itemsCount' => $n])); + $n = $this->getItemsCountFromData($dataElement, $offset); + assert($this->debugInfo(['dataElement' => $dataElement, 'itemsCount' => $n])); // Parse the items. for ($i = 0; $i < $n; $i++) { $i_offset = $offset + 2 + 12 * $i; - $item_definition = $this->getItemDefinitionFromData($i, $data_element, $i_offset, $xxx, 'Tiff\IfdAny'); + $item_definition = $this->getItemDefinitionFromData($i, $dataElement, $i_offset, $xxx, 'Tiff\IfdAny'); $item_class = $item_definition->getCollection()->getPropertyValue('class'); // Check data is accessible, warn otherwise. - if ($item_definition->getDataOffset() >= $data_element->getSize()) { + if ($item_definition->getDataOffset() >= $dataElement->getSize()) { $this->warning( 'Could not access value for item {item} in \'{ifd}\', overflow', [ @@ -56,15 +56,15 @@ public function parseData(DataElement $data_element, int $start = 0, ?int $size } /* $this->debug( 'Item Offset {o} Components {c} Format {f} Formatsize {fs} Size {s} DataElement Size {des}', [ - 'o' => MediaProbe::dumpIntHex($data_element->getAbsoluteOffset($item_definition->getDataOffset())), + 'o' => MediaProbe::dumpIntHex($dataElement->getAbsoluteOffset($item_definition->getDataOffset())), 'c' => $item_definition->getValuesCount(), 'f' => $item_definition->getFormat(), 'fs' => DataFormat::getSize($item_definition->getFormat()), 's' => MediaProbe::dumpIntHex($item_definition->getSize()), - 'des' => MediaProbe::dumpIntHex($data_element->getSize()), + 'des' => MediaProbe::dumpIntHex($dataElement->getSize()), ] );*/ - if ($item_definition->getDataOffset() + $item_definition->getSize() > $data_element->getSize()) { + if ($item_definition->getDataOffset() + $item_definition->getSize() > $dataElement->getSize()) { $this->warning( 'Could not get value for item {item} in \'{ifd}\', not enough data', [ @@ -79,13 +79,13 @@ public function parseData(DataElement $data_element, int $start = 0, ?int $size $item = new $item_class($item_definition, $this); try { if (is_a($item_class, Ifd::class, true)) { - $item->parseData($data_element); + $item->parseData($dataElement); } else { // In case of an IFD terminator item entry, i.e. zero // components, the data window size is still 4 bytes, from // the IFD index area. $item_data_window_size = $item_definition->getValuesCount() > 0 ? $item_definition->getSize() : 4; - $item->parseData($data_element, $item_definition->getDataOffset(), $item_data_window_size); + $item->parseData($dataElement, $item_definition->getDataOffset(), $item_data_window_size); } } catch (DataException $e) { $item->error($e->getMessage()); @@ -94,7 +94,7 @@ public function parseData(DataElement $data_element, int $start = 0, ?int $size } // Invoke post-load callbacks. - $this->executePostParseCallbacks($data_element); + $this->executePostParseCallbacks($dataElement); } /** @@ -109,7 +109,7 @@ protected function doParseData(DataElement $data): void * * Items can be TAGs, other IFDs, etc. * - * @param DataElement $data_element + * @param DataElement $dataElement * the data element that will provide the data. * @param int $offset * the offset within the data element where the count can be @@ -118,14 +118,14 @@ protected function doParseData(DataElement $data): void * @return int * the number of items in the IFD. */ - protected function getItemsCountFromData(DataElement $data_element, $offset): int + protected function getItemsCountFromData(DataElement $dataElement, $offset): int { // Get the number of tags. - $entries_count = $data_element->getShort($offset); + $entries_count = $dataElement->getShort($offset); // Check if we have enough data. - if (2 + 12 * $entries_count > $data_element->getSize()) { - $entries_count = floor(($offset - $data_element->getSize()) / 12); + if (2 + 12 * $entries_count > $dataElement->getSize()) { + $entries_count = floor(($offset - $dataElement->getSize()) / 12); $this->warning('Wrong number of IFD entries in ifd {ifdname}, adjusted to {tags}', [ 'ifdname' => $this->getAttribute('name'), 'tags' => $entries_count, @@ -140,7 +140,7 @@ protected function getItemsCountFromData(DataElement $data_element, $offset): in * * @param int $seq * The sequence (0-index) of the item in the IFD. - * @param DataElement $data_element + * @param DataElement $dataElement * the data element that will provide the data. * @param int $offset * the offset within the data element where the count can be @@ -153,10 +153,10 @@ protected function getItemsCountFromData(DataElement $data_element, $offset): in * @return \FileEye\MediaProbe\ItemDefinition * the ItemDefinition object of the IFD item. */ - protected function getItemDefinitionFromData(int $seq, DataElement $data_element, int $offset, int $data_offset_shift = 0, string $fallback_collection_id = null): ItemDefinition + protected function getItemDefinitionFromData(int $seq, DataElement $dataElement, int $offset, int $data_offset_shift = 0, string $fallback_collection_id = null): ItemDefinition { - $id = $data_element->getShort($offset); - $format = $data_element->getShort($offset + 2); + $id = $dataElement->getShort($offset); + $format = $dataElement->getShort($offset + 2); // Fall back to the generic IFD collection if the item is missing from // the appropriate one. @@ -164,12 +164,12 @@ protected function getItemDefinitionFromData(int $seq, DataElement $data_element $item_collection = $this->getCollection()->getItemCollection($id); } catch (MediaProbeException $e) { if ($fallback_collection_id !== null) { - $item_collection = CollectionFactory::get($fallback_collection_id)->getItemCollection($id, 0, 'UnknownTag', [ + $item_collection = CollectionFactory::get($fallback_collection_id)->getItemCollection($id, 0, 'Tiff\UnknownTag', [ 'item' => $id, 'DOMNode' => 'tag', ]); } else { - $item_collection = $this->getCollection()->getItemCollection($id, 0, 'UnknownTag', [ + $item_collection = $this->getCollection()->getItemCollection($id, 0, 'Tiff\UnknownTag', [ 'item' => $id, 'DOMNode' => 'tag', ]); @@ -178,8 +178,8 @@ protected function getItemDefinitionFromData(int $seq, DataElement $data_element if (is_a($item_collection->getPropertyValue('class'), Ifd::class, true)) { // If the item is an Ifd, recurse in loading the item at offset. - $data_offset = $data_element->getLong($offset + 8); - $components = $data_element->getShort($data_offset); + $data_offset = $dataElement->getLong($offset + 8); + $components = $dataElement->getShort($data_offset); // The first 2 bytes indicate the number of directory entries contained // in the IFD. Then directory entries (12 bytes per entry) follow. // After last directory entry, there are 4 bytes indicating the @@ -187,19 +187,19 @@ protected function getItemDefinitionFromData(int $seq, DataElement $data_element $size = 2 + $components * DataFormat::getSize($format) + 4; } else { // The data is a tag. - $components = $data_element->getLong($offset + 4); + $components = $dataElement->getLong($offset + 4); // If the data size is bigger than 4 bytes, then actual data is not in // the TAG's data element, but at the the offset stored in the data // element. $size = DataFormat::getSize($format) * $components; if ($size > 4) { - $data_offset = $data_element->getLong($offset + 8) + $data_offset_shift; + $data_offset = $dataElement->getLong($offset + 8) + $data_offset_shift; } else { $data_offset = $offset + 8; } } - return new ItemDefinition($item_collection, $format, $components, $data_offset, $data_element->getStart() + $offset, $seq); + return new ItemDefinition($item_collection, $format, $components, $data_offset, $dataElement->getStart() + $offset, $seq); } /** @@ -284,11 +284,11 @@ public function toBytes(int $byte_order = ConvertBytes::LITTLE_ENDIAN, int $offs /** * xx - * @param DataWindow $data_element + * @param DataWindow $dataElement * the data from which the thumbnail will be * extracted. */ - public static function thumbnailToBlock(DataElement $data_element, Ifd $ifd): void + public static function thumbnailToBlock(DataElement $dataElement, Ifd $ifd): void { if (!$ifd->getElement("tag[@name='ThumbnailOffset']") || !$ifd->getElement("tag[@name='ThumbnailLength']")) { return; @@ -315,10 +315,10 @@ public static function thumbnailToBlock(DataElement $data_element, Ifd $ifd): vo return; } - if ($offset > $data_element->getSize()) { + if ($offset > $dataElement->getSize()) { $ifd->error('Offset {offset} overflows total size ({size}) for JPEG thumbnail.', [ 'offset' => $offset, - 'size' => $data_element->getSize(), + 'size' => $dataElement->getSize(), ]); $ifd->valid = false; return; @@ -326,17 +326,17 @@ public static function thumbnailToBlock(DataElement $data_element, Ifd $ifd): vo // Some images have a broken length, so we try to carefully check // the length before we store the thumbnail. - if ($offset + $length > $data_element->getSize()) { + if ($offset + $length > $dataElement->getSize()) { $ifd->warning('Thumbnail length ({length} bytes) adjusted to {adjusted_length} bytes.', [ 'length' => $length, - 'adjusted_length' => $data_element->getSize() - $offset, + 'adjusted_length' => $dataElement->getSize() - $offset, ]); - $length = $data_element->getSize() - $offset; + $length = $dataElement->getSize() - $offset; } // Now set the thumbnail normally. try { - $dataxx = new DataWindow($data_element, $offset, $length); + $dataxx = new DataWindow($dataElement, $offset, $length); // xx todo $dataxx->logInfo($ifd->getLogger()); $size = $dataxx->getSize(); diff --git a/src/Block/Tag.php b/src/Block/Tiff/Tag.php similarity index 98% rename from src/Block/Tag.php rename to src/Block/Tiff/Tag.php index 74dc60f2a..c75e00f4b 100644 --- a/src/Block/Tag.php +++ b/src/Block/Tiff/Tag.php @@ -1,6 +1,6 @@ getCollection()->getPropertyValue('id'), ['VoidCollection', 'UnknownTag'])) { + if (in_array($this->getCollection()->getPropertyValue('id'), ['VoidCollection', 'Tiff\UnknownTag'])) { $this->notice("Unknown item {item} in '{parent}'", [ 'item' => MediaProbe::dumpIntHex($this->getAttribute('id')), 'parent' => $this->getParentElement()->getCollection()->getPropertyValue('name') ?? 'n/a', diff --git a/src/Block/Tiff.php b/src/Block/Tiff/Tiff.php similarity index 89% rename from src/Block/Tiff.php rename to src/Block/Tiff/Tiff.php index aa4763209..a64ad5cea 100644 --- a/src/Block/Tiff.php +++ b/src/Block/Tiff/Tiff.php @@ -1,16 +1,8 @@ 'ExifMakerNotes\\Canon\\VignettingCorr2', 'ExifMakerNotes\\Canon\\VignettingCorrUnknown' => 'ExifMakerNotes\\Canon\\VignettingCorrUnknown', 'ExifMakerNotes\\MakerNotes' => 'ExifMakerNotes\\MakerNotes', - 'Exif\\Exif' => 'Exif\\Exif', 'Format' => 'Format', + 'Jpeg\\Exif' => 'Jpeg\\Exif', 'Jpeg\\Jpeg' => 'Jpeg\\Jpeg', 'Jpeg\\Segment' => 'Jpeg\\Segment', 'Jpeg\\SegmentApp1' => 'Jpeg\\SegmentApp1', @@ -155,7 +155,6 @@ public function getNamespace(): string 'Media' => 'Media', 'MediaType' => 'MediaType', 'RawData' => 'RawData', - 'Tag' => 'Tag', 'Thumbnail' => 'Thumbnail', 'Tiff\\Ifd0' => 'Tiff\\Ifd0', 'Tiff\\Ifd1' => 'Tiff\\Ifd1', @@ -163,8 +162,9 @@ public function getNamespace(): string 'Tiff\\IfdExif' => 'Tiff\\IfdExif', 'Tiff\\IfdGps' => 'Tiff\\IfdGps', 'Tiff\\IfdInteroperability' => 'Tiff\\IfdInteroperability', + 'Tiff\\Tag' => 'Tiff\\Tag', 'Tiff\\Tiff' => 'Tiff\\Tiff', - 'UnknownTag' => 'UnknownTag', + 'Tiff\\UnknownTag' => 'Tiff\\UnknownTag', 'VoidCollection' => 'VoidCollection', ), 'collectionsByName' => @@ -301,13 +301,13 @@ public function getNamespace(): string 'ExifIFD' => 'Tiff\\IfdExif', 'ExifMakerNotes\\Canon\\Filter' => 'ExifMakerNotes\\Canon\\Filter', 'ExifMakerNotes\\MakerNotes' => 'ExifMakerNotes\\MakerNotes', - 'Exif\\Exif' => 'Exif\\Exif', 'Format' => 'Format', 'GPS' => 'Tiff\\IfdGps', 'IFD0' => 'Tiff\\Ifd0', 'IFD1' => 'Tiff\\Ifd1', 'Interop' => 'Tiff\\IfdInteroperability', 'InteropIFD' => 'Tiff\\IfdInteroperability', + 'Jpeg\\Exif' => 'Jpeg\\Exif', 'Jpeg\\Jpeg' => 'Jpeg\\Jpeg', 'Jpeg\\Segment' => 'Jpeg\\Segment', 'Main' => 'Tiff\\Ifd0', @@ -315,11 +315,11 @@ public function getNamespace(): string 'MediaType' => 'MediaType', 'RawData' => 'RawData', 'SOS' => 'Jpeg\\SegmentSos', - 'Tag' => 'Tag', 'Thumbnail' => 'Tiff\\Ifd1', 'Tiff\\IfdAny' => 'Tiff\\IfdAny', + 'Tiff\\Tag' => 'Tiff\\Tag', 'Tiff\\Tiff' => 'Tiff\\Tiff', - 'UnknownTag' => 'UnknownTag', + 'Tiff\\UnknownTag' => 'Tiff\\UnknownTag', 'VoidCollection' => 'VoidCollection', ), ); diff --git a/src/Collection/ExifMakerNotes/Apple/Main.php b/src/Collection/ExifMakerNotes/Apple/Main.php index caf0d9b3a..bf4ddb6ae 100644 --- a/src/Collection/ExifMakerNotes/Apple/Main.php +++ b/src/Collection/ExifMakerNotes/Apple/Main.php @@ -17,7 +17,7 @@ class Main extends CollectionBase { 'title' => 'Apple Maker Notes', 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Vendor\\Apple\\MakerNote', 'DOMNode' => 'makerNote', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Apple\\Main', 'itemsByName' => array ( @@ -60,7 +60,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AccelerationVector', 'title' => 'Acceleration Vector', 'components' => 3, @@ -75,7 +75,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HDRImageType', 'title' => 'HDR Image Type', 'format' => @@ -97,7 +97,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BurstUUID', 'title' => 'Burst UUID', 'format' => @@ -111,7 +111,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContentIdentifier', 'title' => 'Content Identifier', 'format' => @@ -125,7 +125,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageUniqueID', 'title' => 'Image Unique ID', 'format' => diff --git a/src/Collection/ExifMakerNotes/Apple/RunTime.php b/src/Collection/ExifMakerNotes/Apple/RunTime.php index 7b4634a9c..88ad2ec98 100644 --- a/src/Collection/ExifMakerNotes/Apple/RunTime.php +++ b/src/Collection/ExifMakerNotes/Apple/RunTime.php @@ -17,7 +17,7 @@ class RunTime extends CollectionBase { 'title' => 'Apple Runtime', 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Vendor\\Apple\\RunTime', 'DOMNode' => 'plist', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Apple\\RunTime', 'itemsByName' => array ( @@ -67,7 +67,7 @@ class RunTime extends CollectionBase { array ( 0 => 2000, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RunTimeEpoch', 'title' => 'Run Time Epoch', 'exiftoolDOMNode' => 'Apple:RunTimeEpoch', @@ -81,7 +81,7 @@ class RunTime extends CollectionBase { array ( 0 => 2000, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RunTimeFlags', 'title' => 'Run Time Flags', 'text' => @@ -106,7 +106,7 @@ class RunTime extends CollectionBase { array ( 0 => 2000, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RunTimeScale', 'title' => 'Run Time Scale', 'exiftoolDOMNode' => 'Apple:RunTimeScale', @@ -120,7 +120,7 @@ class RunTime extends CollectionBase { array ( 0 => 2000, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RunTimeValue', 'title' => 'Run Time Value', 'exiftoolDOMNode' => 'Apple:RunTimeValue', diff --git a/src/Collection/ExifMakerNotes/Canon/AFConfig.php b/src/Collection/ExifMakerNotes/Canon/AFConfig.php index b1b2fe34c..843f5ec56 100644 --- a/src/Collection/ExifMakerNotes/Canon/AFConfig.php +++ b/src/Collection/ExifMakerNotes/Canon/AFConfig.php @@ -22,7 +22,7 @@ class AFConfig extends CollectionBase { 0 => 4, ), 'hasIndexSize' => true, - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\AFConfig', 'itemsByName' => array ( @@ -125,7 +125,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFConfigTool', 'title' => 'AF Config Tool', 'format' => @@ -139,7 +139,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFTrackingSensitivity', 'title' => 'AF Tracking Sensitivity', 'format' => @@ -153,7 +153,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAccelDecelTracking', 'title' => 'AF Accel/Decel Tracking', 'format' => @@ -167,7 +167,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointSwitching', 'title' => 'AF Point Switching', 'format' => @@ -181,7 +181,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AIServoFirstImage', 'title' => 'AI Servo First Image', 'format' => @@ -204,7 +204,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AIServoSecondImage', 'title' => 'AI Servo Second Image', 'format' => @@ -229,7 +229,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'USMLensElectronicMF', 'title' => 'USM Lens Electronic MF', 'format' => @@ -252,7 +252,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssistBeam', 'title' => 'AF Assist Beam', 'format' => @@ -275,7 +275,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OneShotAFRelease', 'title' => 'One Shot AF Release', 'format' => @@ -297,7 +297,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoAFPointSelEOSiTRAF', 'title' => 'Auto AF Point Sel EOS iTR AF', 'format' => @@ -319,7 +319,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensDriveWhenAFImpossible', 'title' => 'Lens Drive When AF Impossible', 'format' => @@ -341,7 +341,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SelectAFAreaSelectionMode', 'title' => 'Select AF Area Selection Mode', 'format' => @@ -367,7 +367,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaSelectionMethod', 'title' => 'AF Area Selection Method', 'format' => @@ -389,7 +389,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OrientationLinkedAF', 'title' => 'Orientation Linked AF', 'format' => @@ -412,7 +412,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ManualAFPointSelPattern', 'title' => 'Manual AF Point Sel Pattern', 'format' => @@ -434,7 +434,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointDisplayDuringFocus', 'title' => 'AF Point Display During Focus', 'format' => @@ -459,7 +459,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VFDisplayIllumination', 'title' => 'VF Display Illumination', 'format' => @@ -482,7 +482,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFStatusViewfinder', 'title' => 'AF Status Viewfinder', 'format' => @@ -504,7 +504,7 @@ class AFConfig extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InitialAFPointInServo', 'title' => 'Initial AF Point In Servo', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/AFInfo.php b/src/Collection/ExifMakerNotes/Canon/AFInfo.php index 321b34f4c..89e077aae 100644 --- a/src/Collection/ExifMakerNotes/Canon/AFInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/AFInfo.php @@ -21,7 +21,7 @@ class AFInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\AFInfo', 'itemsByName' => array ( @@ -141,7 +141,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NumAFPoints', 'title' => 'Num AF Points', 'format' => @@ -155,7 +155,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ValidAFPoints', 'title' => 'Valid AF Points', 'format' => @@ -169,7 +169,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonImageWidth', 'title' => 'Canon Image Width', 'format' => @@ -183,7 +183,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonImageHeight', 'title' => 'Canon Image Height', 'format' => @@ -197,7 +197,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFImageWidth', 'title' => 'AF Image Width', 'format' => @@ -211,7 +211,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFImageHeight', 'title' => 'AF Image Height', 'format' => @@ -225,7 +225,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaWidth', 'title' => 'AF Area Width', 'format' => @@ -239,7 +239,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaHeight', 'title' => 'AF Area Height', 'format' => @@ -253,7 +253,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaXPositions', 'title' => 'AF Area X Positions', 'format' => @@ -267,7 +267,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaYPositions', 'title' => 'AF Area Y Positions', 'format' => @@ -282,7 +282,7 @@ class AFInfo extends CollectionBase { 0 => array ( '__todo' => 'add decoding', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointsInFocus', 'title' => 'AF Points In Focus', 'format' => @@ -296,7 +296,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PrimaryAFPoint', 'title' => 'Primary AF Point', 'format' => @@ -307,7 +307,7 @@ class AFInfo extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Canon_AFInfo_0x000b', 'title' => 'Canon AF Info 0x000b', 'components' => 8, @@ -322,7 +322,7 @@ class AFInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PrimaryAFPoint', 'title' => 'Primary AF Point', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/AFInfo2.php b/src/Collection/ExifMakerNotes/Canon/AFInfo2.php index 08916e1fb..31b3a7043 100644 --- a/src/Collection/ExifMakerNotes/Canon/AFInfo2.php +++ b/src/Collection/ExifMakerNotes/Canon/AFInfo2.php @@ -22,7 +22,7 @@ class AFInfo2 extends CollectionBase { 0 => 3, ), 'hasIndexSize' => true, - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\AFInfo2', 'itemsByName' => array ( @@ -178,7 +178,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaMode', 'title' => 'AF Area Mode', 'format' => @@ -211,7 +211,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NumAFPoints', 'title' => 'Num AF Points', 'format' => @@ -225,7 +225,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ValidAFPoints', 'title' => 'Valid AF Points', 'format' => @@ -239,7 +239,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonImageWidth', 'title' => 'Canon Image Width', 'format' => @@ -253,7 +253,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonImageHeight', 'title' => 'Canon Image Height', 'format' => @@ -267,7 +267,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFImageWidth', 'title' => 'AF Image Width', 'format' => @@ -281,7 +281,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFImageHeight', 'title' => 'AF Image Height', 'format' => @@ -295,7 +295,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaWidths', 'title' => 'AF Area Widths', 'format' => @@ -309,7 +309,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaHeights', 'title' => 'AF Area Heights', 'format' => @@ -323,7 +323,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaXPositions', 'title' => 'AF Area X Positions', 'format' => @@ -337,7 +337,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaYPositions', 'title' => 'AF Area Y Positions', 'format' => @@ -352,7 +352,7 @@ class AFInfo2 extends CollectionBase { 0 => array ( '__todo' => 'add decoding', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointsInFocus', 'title' => 'AF Points In Focus', 'format' => @@ -367,7 +367,7 @@ class AFInfo2 extends CollectionBase { 0 => array ( '__todo' => 'add decoding', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointsSelected', 'title' => 'AF Points Selected', 'format' => @@ -379,7 +379,7 @@ class AFInfo2 extends CollectionBase { 1 => array ( '__todo' => 'add decoding', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Canon_AFInfo2_0x000d', 'title' => 'Canon AF Info 2 0x000d', 'format' => @@ -393,7 +393,7 @@ class AFInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PrimaryAFPoint', 'title' => 'Primary AF Point', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/AFMicroAdj.php b/src/Collection/ExifMakerNotes/Canon/AFMicroAdj.php index 2ccf51f3b..4314d28e3 100644 --- a/src/Collection/ExifMakerNotes/Canon/AFMicroAdj.php +++ b/src/Collection/ExifMakerNotes/Canon/AFMicroAdj.php @@ -22,7 +22,7 @@ class AFMicroAdj extends CollectionBase { 0 => 4, ), 'hasIndexSize' => true, - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\AFMicroAdj', 'itemsByName' => array ( @@ -57,7 +57,7 @@ class AFMicroAdj extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFMicroAdjMode', 'title' => 'AF Micro Adj Mode', 'format' => @@ -80,7 +80,7 @@ class AFMicroAdj extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFMicroAdjValue', 'title' => 'AF Micro Adj Value', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/Ambience.php b/src/Collection/ExifMakerNotes/Canon/Ambience.php index c173e2988..c74cfc30d 100644 --- a/src/Collection/ExifMakerNotes/Canon/Ambience.php +++ b/src/Collection/ExifMakerNotes/Canon/Ambience.php @@ -22,7 +22,7 @@ class Ambience extends CollectionBase { 0 => 4, ), 'hasIndexSize' => true, - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\Ambience', 'itemsByName' => array ( @@ -53,7 +53,7 @@ class Ambience extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AmbienceSelection', 'title' => 'Ambience Selection', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/AspectInfo.php b/src/Collection/ExifMakerNotes/Canon/AspectInfo.php index c678addb4..62f17aa23 100644 --- a/src/Collection/ExifMakerNotes/Canon/AspectInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/AspectInfo.php @@ -21,7 +21,7 @@ class AspectInfo extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\AspectInfo', 'itemsByName' => array ( @@ -75,7 +75,7 @@ class AspectInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AspectRatio', 'title' => 'Aspect Ratio', 'format' => @@ -100,7 +100,7 @@ class AspectInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CroppedImageWidth', 'title' => 'Cropped Image Width', 'format' => @@ -114,7 +114,7 @@ class AspectInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CroppedImageHeight', 'title' => 'Cropped Image Height', 'format' => @@ -128,7 +128,7 @@ class AspectInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CroppedImageLeft', 'title' => 'Cropped Image Left', 'format' => @@ -142,7 +142,7 @@ class AspectInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CroppedImageTop', 'title' => 'Cropped Image Top', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CNTH.php b/src/Collection/ExifMakerNotes/Canon/CNTH.php index 27b2ff723..a6d6602e8 100644 --- a/src/Collection/ExifMakerNotes/Canon/CNTH.php +++ b/src/Collection/ExifMakerNotes/Canon/CNTH.php @@ -18,7 +18,7 @@ class CNTH extends CollectionBase { 'title' => 'Canon CNTH', 'class' => 'FileEye\\MediaProbe\\Block\\Index', 'DOMNode' => 'index', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CNTH', 'itemsByName' => array ( @@ -40,7 +40,7 @@ class CNTH extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailImage', 'title' => 'Thumbnail Image', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CTMD.php b/src/Collection/ExifMakerNotes/Canon/CTMD.php index d5fe5d4e9..84308078e 100644 --- a/src/Collection/ExifMakerNotes/Canon/CTMD.php +++ b/src/Collection/ExifMakerNotes/Canon/CTMD.php @@ -18,7 +18,7 @@ class CTMD extends CollectionBase { 'title' => 'Canon CTMD', 'class' => 'FileEye\\MediaProbe\\Block\\Index', 'DOMNode' => 'index', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CTMD', 'itemsByName' => array ( @@ -40,7 +40,7 @@ class CTMD extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeStamp', 'title' => 'Time Stamp', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo1000D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo1000D.php index 18c6ca5ef..e66d0596e 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo1000D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo1000D.php @@ -21,7 +21,7 @@ class CameraInfo1000D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo1000D', 'itemsByName' => array ( @@ -188,7 +188,7 @@ class CameraInfo1000D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -203,7 +203,7 @@ class CameraInfo1000D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -218,7 +218,7 @@ class CameraInfo1000D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -232,7 +232,7 @@ class CameraInfo1000D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -258,7 +258,7 @@ class CameraInfo1000D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -273,7 +273,7 @@ class CameraInfo1000D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\MacroMagnification', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MacroMagnification', 'title' => 'Macro Magnification', 'format' => @@ -291,7 +291,7 @@ class CameraInfo1000D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -305,7 +305,7 @@ class CameraInfo1000D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -329,7 +329,7 @@ class CameraInfo1000D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -344,7 +344,7 @@ class CameraInfo1000D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -358,7 +358,7 @@ class CameraInfo1000D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -400,7 +400,7 @@ class CameraInfo1000D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -818,7 +818,7 @@ class CameraInfo1000D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -836,7 +836,7 @@ class CameraInfo1000D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -854,7 +854,7 @@ class CameraInfo1000D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -868,7 +868,7 @@ class CameraInfo1000D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -884,7 +884,7 @@ class CameraInfo1000D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => @@ -899,7 +899,7 @@ class CameraInfo1000D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -913,7 +913,7 @@ class CameraInfo1000D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensModel', 'title' => 'Lens Model', 'components' => 64, diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo1D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo1D.php index fcc8a7274..9bca6cc2f 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo1D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo1D.php @@ -21,7 +21,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo1D', 'itemsByName' => array ( @@ -126,7 +126,7 @@ class CameraInfo1D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -144,7 +144,7 @@ class CameraInfo1D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -562,7 +562,7 @@ class CameraInfo1D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -580,7 +580,7 @@ class CameraInfo1D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -598,7 +598,7 @@ class CameraInfo1D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -612,7 +612,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessFrequency', 'title' => 'Sharpness Frequency', 'format' => @@ -638,7 +638,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -652,7 +652,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -694,7 +694,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessFrequency', 'title' => 'Sharpness Frequency', 'format' => @@ -720,7 +720,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -731,7 +731,7 @@ class CameraInfo1D extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -745,7 +745,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -787,7 +787,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -831,7 +831,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -845,7 +845,7 @@ class CameraInfo1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DX.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DX.php index 96f28aa32..3fa579731 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DX.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DX.php @@ -21,7 +21,7 @@ class CameraInfo1DX extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo1DX', 'itemsByName' => array ( @@ -179,7 +179,7 @@ class CameraInfo1DX extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersionLookAhead', 'title' => 'Firmware Version Look Ahead', 'format' => @@ -194,7 +194,7 @@ class CameraInfo1DX extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -209,7 +209,7 @@ class CameraInfo1DX extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -224,7 +224,7 @@ class CameraInfo1DX extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -239,7 +239,7 @@ class CameraInfo1DX extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -257,7 +257,7 @@ class CameraInfo1DX extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -271,7 +271,7 @@ class CameraInfo1DX extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -295,7 +295,7 @@ class CameraInfo1DX extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -310,7 +310,7 @@ class CameraInfo1DX extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -324,7 +324,7 @@ class CameraInfo1DX extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -366,7 +366,7 @@ class CameraInfo1DX extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -380,7 +380,7 @@ class CameraInfo1DX extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -828,7 +828,7 @@ class CameraInfo1DX extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -846,7 +846,7 @@ class CameraInfo1DX extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -864,7 +864,7 @@ class CameraInfo1DX extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -878,7 +878,7 @@ class CameraInfo1DX extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -894,7 +894,7 @@ class CameraInfo1DX extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -909,7 +909,7 @@ class CameraInfo1DX extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkII.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkII.php index 555120f1f..838509237 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkII.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkII.php @@ -21,7 +21,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo1DmkII', 'itemsByName' => array ( @@ -164,7 +164,7 @@ class CameraInfo1DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -182,7 +182,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -600,7 +600,7 @@ class CameraInfo1DmkII extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -618,7 +618,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -636,7 +636,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -650,7 +650,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalType', 'title' => 'Focal Type', 'format' => @@ -672,7 +672,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -714,7 +714,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -728,7 +728,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonImageSize', 'title' => 'Canon Image Size', 'format' => @@ -767,7 +767,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGQuality', 'title' => 'JPEG Quality', 'format' => @@ -781,7 +781,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -825,7 +825,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Saturation', 'title' => 'Saturation', 'format' => @@ -846,7 +846,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTone', 'title' => 'Color Tone', 'format' => @@ -867,7 +867,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -881,7 +881,7 @@ class CameraInfo1DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Contrast', 'title' => 'Contrast', 'format' => @@ -903,7 +903,7 @@ class CameraInfo1DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'components' => 5, diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIII.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIII.php index a80f67f6f..7558175b1 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIII.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIII.php @@ -21,7 +21,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo1DmkIII', 'itemsByName' => array ( @@ -204,7 +204,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -219,7 +219,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -234,7 +234,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -249,7 +249,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -264,7 +264,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\MacroMagnification', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MacroMagnification', 'title' => 'Macro Magnification', 'format' => @@ -282,7 +282,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -296,7 +296,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -320,7 +320,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -335,7 +335,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -349,7 +349,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -391,7 +391,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -405,7 +405,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -853,7 +853,7 @@ class CameraInfo1DmkIII extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -871,7 +871,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -889,7 +889,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -903,7 +903,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -919,7 +919,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -934,7 +934,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ShutterCount', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCount', 'title' => 'Shutter Count', 'format' => @@ -949,7 +949,7 @@ class CameraInfo1DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => @@ -965,7 +965,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\Timestamp', 'outputFormat' => 2, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeStamp1', 'title' => 'Time Stamp 1', 'format' => @@ -981,7 +981,7 @@ class CameraInfo1DmkIII extends CollectionBase { array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\Timestamp', 'outputFormat' => 2, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeStamp', 'title' => 'Time Stamp', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIIN.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIIN.php index 08d2adbe5..96f664c93 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIIN.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIIN.php @@ -21,7 +21,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo1DmkIIN', 'itemsByName' => array ( @@ -140,7 +140,7 @@ class CameraInfo1DmkIIN extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -158,7 +158,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -576,7 +576,7 @@ class CameraInfo1DmkIIN extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -594,7 +594,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -612,7 +612,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -626,7 +626,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -668,7 +668,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -682,7 +682,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -726,7 +726,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -740,7 +740,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Contrast', 'title' => 'Contrast', 'format' => @@ -761,7 +761,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Saturation', 'title' => 'Saturation', 'format' => @@ -782,7 +782,7 @@ class CameraInfo1DmkIIN extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTone', 'title' => 'Color Tone', 'format' => @@ -804,7 +804,7 @@ class CameraInfo1DmkIIN extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'components' => 5, diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIV.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIV.php index a3bb2c1ab..d5c64098a 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIV.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo1DmkIV.php @@ -21,7 +21,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo1DmkIV', 'itemsByName' => array ( @@ -116,7 +116,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersionLookAhead', 'title' => 'Firmware Version Look Ahead', 'format' => @@ -130,7 +130,7 @@ class CameraInfo1DmkIV extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -144,7 +144,7 @@ class CameraInfo1DmkIV extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -158,7 +158,7 @@ class CameraInfo1DmkIV extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -171,7 +171,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightTonePriority', 'title' => 'Highlight Tone Priority', 'format' => @@ -192,7 +192,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeasuredEV2', 'title' => 'Measured EV 2', 'format' => @@ -205,7 +205,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeasuredEV3', 'title' => 'Measured EV 3', 'format' => @@ -218,7 +218,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -243,7 +243,7 @@ class CameraInfo1DmkIV extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -260,7 +260,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -273,7 +273,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -296,7 +296,7 @@ class CameraInfo1DmkIV extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -310,7 +310,7 @@ class CameraInfo1DmkIV extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -323,7 +323,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -364,7 +364,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -781,7 +781,7 @@ class CameraInfo1DmkIV extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -798,7 +798,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -815,7 +815,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -828,7 +828,7 @@ class CameraInfo1DmkIV extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -843,7 +843,7 @@ class CameraInfo1DmkIV extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -857,7 +857,7 @@ class CameraInfo1DmkIV extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo40D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo40D.php index ca951b71a..d92ab565c 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo40D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo40D.php @@ -21,7 +21,7 @@ class CameraInfo40D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo40D', 'itemsByName' => array ( @@ -188,7 +188,7 @@ class CameraInfo40D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -203,7 +203,7 @@ class CameraInfo40D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -218,7 +218,7 @@ class CameraInfo40D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -232,7 +232,7 @@ class CameraInfo40D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -258,7 +258,7 @@ class CameraInfo40D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -273,7 +273,7 @@ class CameraInfo40D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\MacroMagnification', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MacroMagnification', 'title' => 'Macro Magnification', 'format' => @@ -291,7 +291,7 @@ class CameraInfo40D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -305,7 +305,7 @@ class CameraInfo40D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -329,7 +329,7 @@ class CameraInfo40D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -344,7 +344,7 @@ class CameraInfo40D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -358,7 +358,7 @@ class CameraInfo40D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -400,7 +400,7 @@ class CameraInfo40D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -818,7 +818,7 @@ class CameraInfo40D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -836,7 +836,7 @@ class CameraInfo40D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -854,7 +854,7 @@ class CameraInfo40D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -868,7 +868,7 @@ class CameraInfo40D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -884,7 +884,7 @@ class CameraInfo40D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -899,7 +899,7 @@ class CameraInfo40D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => @@ -913,7 +913,7 @@ class CameraInfo40D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensModel', 'title' => 'Lens Model', 'components' => 64, diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo450D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo450D.php index 42b281813..be3ee7aef 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo450D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo450D.php @@ -21,7 +21,7 @@ class CameraInfo450D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo450D', 'itemsByName' => array ( @@ -180,7 +180,7 @@ class CameraInfo450D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -195,7 +195,7 @@ class CameraInfo450D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -210,7 +210,7 @@ class CameraInfo450D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -224,7 +224,7 @@ class CameraInfo450D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -250,7 +250,7 @@ class CameraInfo450D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -265,7 +265,7 @@ class CameraInfo450D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\MacroMagnification', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MacroMagnification', 'title' => 'Macro Magnification', 'format' => @@ -283,7 +283,7 @@ class CameraInfo450D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -297,7 +297,7 @@ class CameraInfo450D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -321,7 +321,7 @@ class CameraInfo450D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -336,7 +336,7 @@ class CameraInfo450D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -350,7 +350,7 @@ class CameraInfo450D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -392,7 +392,7 @@ class CameraInfo450D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -810,7 +810,7 @@ class CameraInfo450D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -824,7 +824,7 @@ class CameraInfo450D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -839,7 +839,7 @@ class CameraInfo450D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OwnerName', 'title' => 'Owner Name', 'components' => 32, @@ -855,7 +855,7 @@ class CameraInfo450D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => @@ -870,7 +870,7 @@ class CameraInfo450D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -884,7 +884,7 @@ class CameraInfo450D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensModel', 'title' => 'Lens Model', 'components' => 64, diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo500D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo500D.php index c1601176f..874eb611b 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo500D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo500D.php @@ -21,7 +21,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo500D', 'itemsByName' => array ( @@ -204,7 +204,7 @@ class CameraInfo500D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -219,7 +219,7 @@ class CameraInfo500D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -234,7 +234,7 @@ class CameraInfo500D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -248,7 +248,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightTonePriority', 'title' => 'Highlight Tone Priority', 'format' => @@ -270,7 +270,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -296,7 +296,7 @@ class CameraInfo500D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -314,7 +314,7 @@ class CameraInfo500D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -328,7 +328,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -352,7 +352,7 @@ class CameraInfo500D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -367,7 +367,7 @@ class CameraInfo500D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -381,7 +381,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -423,7 +423,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -437,7 +437,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -481,7 +481,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighISONoiseReduction', 'title' => 'High ISO Noise Reduction', 'format' => @@ -505,7 +505,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizer', 'title' => 'Auto Lighting Optimizer', 'format' => @@ -933,7 +933,7 @@ class CameraInfo500D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -951,7 +951,7 @@ class CameraInfo500D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -969,7 +969,7 @@ class CameraInfo500D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -983,7 +983,7 @@ class CameraInfo500D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -999,7 +999,7 @@ class CameraInfo500D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -1014,7 +1014,7 @@ class CameraInfo500D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo50D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo50D.php index 88ef8199d..c4b87b26d 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo50D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo50D.php @@ -21,7 +21,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo50D', 'itemsByName' => array ( @@ -211,7 +211,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersionLookAhead', 'title' => 'Firmware Version Look Ahead', 'components' => 164, @@ -227,7 +227,7 @@ class CameraInfo50D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -242,7 +242,7 @@ class CameraInfo50D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -257,7 +257,7 @@ class CameraInfo50D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -271,7 +271,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightTonePriority', 'title' => 'Highlight Tone Priority', 'format' => @@ -293,7 +293,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -319,7 +319,7 @@ class CameraInfo50D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -337,7 +337,7 @@ class CameraInfo50D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -351,7 +351,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -375,7 +375,7 @@ class CameraInfo50D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -390,7 +390,7 @@ class CameraInfo50D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -404,7 +404,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -446,7 +446,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -460,7 +460,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -504,7 +504,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighISONoiseReduction', 'title' => 'High ISO Noise Reduction', 'format' => @@ -528,7 +528,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizer', 'title' => 'Auto Lighting Optimizer', 'format' => @@ -956,7 +956,7 @@ class CameraInfo50D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -974,7 +974,7 @@ class CameraInfo50D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -992,7 +992,7 @@ class CameraInfo50D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -1006,7 +1006,7 @@ class CameraInfo50D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -1022,7 +1022,7 @@ class CameraInfo50D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -1037,7 +1037,7 @@ class CameraInfo50D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo550D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo550D.php index 08e890673..9901e3894 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo550D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo550D.php @@ -21,7 +21,7 @@ class CameraInfo550D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo550D', 'itemsByName' => array ( @@ -188,7 +188,7 @@ class CameraInfo550D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -203,7 +203,7 @@ class CameraInfo550D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -218,7 +218,7 @@ class CameraInfo550D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -232,7 +232,7 @@ class CameraInfo550D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightTonePriority', 'title' => 'Highlight Tone Priority', 'format' => @@ -254,7 +254,7 @@ class CameraInfo550D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -280,7 +280,7 @@ class CameraInfo550D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -298,7 +298,7 @@ class CameraInfo550D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -312,7 +312,7 @@ class CameraInfo550D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -336,7 +336,7 @@ class CameraInfo550D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -351,7 +351,7 @@ class CameraInfo550D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -365,7 +365,7 @@ class CameraInfo550D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -407,7 +407,7 @@ class CameraInfo550D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -421,7 +421,7 @@ class CameraInfo550D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -869,7 +869,7 @@ class CameraInfo550D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -887,7 +887,7 @@ class CameraInfo550D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -905,7 +905,7 @@ class CameraInfo550D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -919,7 +919,7 @@ class CameraInfo550D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -935,7 +935,7 @@ class CameraInfo550D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -950,7 +950,7 @@ class CameraInfo550D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo5D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo5D.php index 3d86a7ee2..4127b18d1 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo5D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo5D.php @@ -21,7 +21,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo5D', 'itemsByName' => array ( @@ -502,7 +502,7 @@ class CameraInfo5D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -517,7 +517,7 @@ class CameraInfo5D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -532,7 +532,7 @@ class CameraInfo5D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -950,7 +950,7 @@ class CameraInfo5D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -965,7 +965,7 @@ class CameraInfo5D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -980,7 +980,7 @@ class CameraInfo5D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\MacroMagnification', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MacroMagnification', 'title' => 'Macro Magnification', 'format' => @@ -994,7 +994,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -1021,7 +1021,7 @@ class CameraInfo5D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -1035,7 +1035,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointsInFocus5D', 'title' => 'AF Points In Focus 5D', 'format' => @@ -1071,7 +1071,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -1113,7 +1113,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -1127,7 +1127,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -1175,7 +1175,7 @@ class CameraInfo5D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -1193,7 +1193,7 @@ class CameraInfo5D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -1611,7 +1611,7 @@ class CameraInfo5D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -1625,7 +1625,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareRevision', 'title' => 'Firmware Revision', 'components' => 8, @@ -1640,7 +1640,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShortOwnerName', 'title' => 'Short Owner Name', 'components' => 16, @@ -1656,7 +1656,7 @@ class CameraInfo5D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => @@ -1671,7 +1671,7 @@ class CameraInfo5D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -1685,7 +1685,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastStandard', 'title' => 'Contrast Standard', 'format' => @@ -1699,7 +1699,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastPortrait', 'title' => 'Contrast Portrait', 'format' => @@ -1713,7 +1713,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastLandscape', 'title' => 'Contrast Landscape', 'format' => @@ -1727,7 +1727,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastNeutral', 'title' => 'Contrast Neutral', 'format' => @@ -1741,7 +1741,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastFaithful', 'title' => 'Contrast Faithful', 'format' => @@ -1755,7 +1755,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastMonochrome', 'title' => 'Contrast Monochrome', 'format' => @@ -1769,7 +1769,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastUserDef1', 'title' => 'Contrast User Def 1', 'format' => @@ -1783,7 +1783,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastUserDef2', 'title' => 'Contrast User Def 2', 'format' => @@ -1797,7 +1797,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastUserDef3', 'title' => 'Contrast User Def 3', 'format' => @@ -1811,7 +1811,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessStandard', 'title' => 'Sharpness Standard', 'format' => @@ -1825,7 +1825,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessPortrait', 'title' => 'Sharpness Portrait', 'format' => @@ -1839,7 +1839,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessLandscape', 'title' => 'Sharpness Landscape', 'format' => @@ -1853,7 +1853,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessNeutral', 'title' => 'Sharpness Neutral', 'format' => @@ -1867,7 +1867,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessFaithful', 'title' => 'Sharpness Faithful', 'format' => @@ -1881,7 +1881,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessMonochrome', 'title' => 'Sharpness Monochrome', 'format' => @@ -1895,7 +1895,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessUserDef1', 'title' => 'Sharpness User Def 1', 'format' => @@ -1909,7 +1909,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessUserDef2', 'title' => 'Sharpness User Def 2', 'format' => @@ -1923,7 +1923,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessUserDef3', 'title' => 'Sharpness User Def 3', 'format' => @@ -1937,7 +1937,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationStandard', 'title' => 'Saturation Standard', 'format' => @@ -1951,7 +1951,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationPortrait', 'title' => 'Saturation Portrait', 'format' => @@ -1965,7 +1965,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationLandscape', 'title' => 'Saturation Landscape', 'format' => @@ -1979,7 +1979,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationNeutral', 'title' => 'Saturation Neutral', 'format' => @@ -1993,7 +1993,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationFaithful', 'title' => 'Saturation Faithful', 'format' => @@ -2007,7 +2007,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectMonochrome', 'title' => 'Filter Effect Monochrome', 'format' => @@ -2033,7 +2033,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationUserDef1', 'title' => 'Saturation User Def 1', 'format' => @@ -2047,7 +2047,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationUserDef2', 'title' => 'Saturation User Def 2', 'format' => @@ -2061,7 +2061,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationUserDef3', 'title' => 'Saturation User Def 3', 'format' => @@ -2075,7 +2075,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneStandard', 'title' => 'Color Tone Standard', 'format' => @@ -2089,7 +2089,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTonePortrait', 'title' => 'Color Tone Portrait', 'format' => @@ -2103,7 +2103,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneLandscape', 'title' => 'Color Tone Landscape', 'format' => @@ -2117,7 +2117,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneNeutral', 'title' => 'Color Tone Neutral', 'format' => @@ -2131,7 +2131,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneFaithful', 'title' => 'Color Tone Faithful', 'format' => @@ -2145,7 +2145,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectMonochrome', 'title' => 'Toning Effect Monochrome', 'format' => @@ -2171,7 +2171,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneUserDef1', 'title' => 'Color Tone User Def 1', 'format' => @@ -2185,7 +2185,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneUserDef2', 'title' => 'Color Tone User Def 2', 'format' => @@ -2199,7 +2199,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneUserDef3', 'title' => 'Color Tone User Def 3', 'format' => @@ -2213,7 +2213,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserDef1PictureStyle', 'title' => 'User Def 1 Picture Style', 'format' => @@ -2243,7 +2243,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserDef2PictureStyle', 'title' => 'User Def 2 Picture Style', 'format' => @@ -2273,7 +2273,7 @@ class CameraInfo5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserDef3PictureStyle', 'title' => 'User Def 3 Picture Style', 'format' => @@ -2305,7 +2305,7 @@ class CameraInfo5D extends CollectionBase { array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\Timestamp', 'outputFormat' => 2, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeStamp', 'title' => 'Time Stamp', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo5DmkII.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo5DmkII.php index 070f938c5..16d208a31 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo5DmkII.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo5DmkII.php @@ -21,7 +21,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo5DmkII', 'itemsByName' => array ( @@ -219,7 +219,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersionLookAhead', 'title' => 'Firmware Version Look Ahead', 'components' => 184, @@ -235,7 +235,7 @@ class CameraInfo5DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -250,7 +250,7 @@ class CameraInfo5DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -265,7 +265,7 @@ class CameraInfo5DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -279,7 +279,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightTonePriority', 'title' => 'Highlight Tone Priority', 'format' => @@ -301,7 +301,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -327,7 +327,7 @@ class CameraInfo5DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -342,7 +342,7 @@ class CameraInfo5DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\MacroMagnification', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MacroMagnification', 'title' => 'Macro Magnification', 'format' => @@ -360,7 +360,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -374,7 +374,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -398,7 +398,7 @@ class CameraInfo5DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -413,7 +413,7 @@ class CameraInfo5DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -427,7 +427,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -469,7 +469,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -483,7 +483,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -527,7 +527,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighISONoiseReduction', 'title' => 'High ISO Noise Reduction', 'format' => @@ -551,7 +551,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizer', 'title' => 'Auto Lighting Optimizer', 'format' => @@ -979,7 +979,7 @@ class CameraInfo5DmkII extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -997,7 +997,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -1015,7 +1015,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -1029,7 +1029,7 @@ class CameraInfo5DmkII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -1045,7 +1045,7 @@ class CameraInfo5DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -1060,7 +1060,7 @@ class CameraInfo5DmkII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo5DmkIII.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo5DmkIII.php index f00b8c67d..85f10ff17 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo5DmkIII.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo5DmkIII.php @@ -21,7 +21,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo5DmkIII', 'itemsByName' => array ( @@ -203,7 +203,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersionLookAhead', 'title' => 'Firmware Version Look Ahead', 'format' => @@ -218,7 +218,7 @@ class CameraInfo5DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -233,7 +233,7 @@ class CameraInfo5DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -248,7 +248,7 @@ class CameraInfo5DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -263,7 +263,7 @@ class CameraInfo5DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -281,7 +281,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -295,7 +295,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -319,7 +319,7 @@ class CameraInfo5DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -334,7 +334,7 @@ class CameraInfo5DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -348,7 +348,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -390,7 +390,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -404,7 +404,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -852,7 +852,7 @@ class CameraInfo5DmkIII extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -870,7 +870,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -888,7 +888,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -904,7 +904,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\LensSerialNumber', 'outputFormat' => 2, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensSerialNumber', 'title' => 'Lens Serial Number', 'components' => 5, @@ -919,7 +919,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -935,7 +935,7 @@ class CameraInfo5DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -949,7 +949,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex2', 'title' => 'File Index 2', 'format' => @@ -964,7 +964,7 @@ class CameraInfo5DmkIII extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => @@ -978,7 +978,7 @@ class CameraInfo5DmkIII extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex2', 'title' => 'Directory Index 2', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo600D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo600D.php index 351cbf5f8..fce2086c8 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo600D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo600D.php @@ -21,7 +21,7 @@ class CameraInfo600D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo600D', 'itemsByName' => array ( @@ -188,7 +188,7 @@ class CameraInfo600D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -203,7 +203,7 @@ class CameraInfo600D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -218,7 +218,7 @@ class CameraInfo600D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -232,7 +232,7 @@ class CameraInfo600D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightTonePriority', 'title' => 'Highlight Tone Priority', 'format' => @@ -254,7 +254,7 @@ class CameraInfo600D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -280,7 +280,7 @@ class CameraInfo600D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -298,7 +298,7 @@ class CameraInfo600D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -312,7 +312,7 @@ class CameraInfo600D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -336,7 +336,7 @@ class CameraInfo600D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -351,7 +351,7 @@ class CameraInfo600D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -365,7 +365,7 @@ class CameraInfo600D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -407,7 +407,7 @@ class CameraInfo600D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -421,7 +421,7 @@ class CameraInfo600D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -869,7 +869,7 @@ class CameraInfo600D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -887,7 +887,7 @@ class CameraInfo600D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -905,7 +905,7 @@ class CameraInfo600D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -919,7 +919,7 @@ class CameraInfo600D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -935,7 +935,7 @@ class CameraInfo600D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -950,7 +950,7 @@ class CameraInfo600D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo60D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo60D.php index c20cfa640..df4089d7d 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo60D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo60D.php @@ -21,7 +21,7 @@ class CameraInfo60D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo60D', 'itemsByName' => array ( @@ -156,7 +156,7 @@ class CameraInfo60D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -171,7 +171,7 @@ class CameraInfo60D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -186,7 +186,7 @@ class CameraInfo60D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -201,7 +201,7 @@ class CameraInfo60D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -219,7 +219,7 @@ class CameraInfo60D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -233,7 +233,7 @@ class CameraInfo60D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -257,7 +257,7 @@ class CameraInfo60D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -272,7 +272,7 @@ class CameraInfo60D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -286,7 +286,7 @@ class CameraInfo60D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -704,7 +704,7 @@ class CameraInfo60D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -722,7 +722,7 @@ class CameraInfo60D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -740,7 +740,7 @@ class CameraInfo60D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -754,7 +754,7 @@ class CameraInfo60D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -770,7 +770,7 @@ class CameraInfo60D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -785,7 +785,7 @@ class CameraInfo60D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo650D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo650D.php index 68836b42f..6aa89bfb9 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo650D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo650D.php @@ -21,7 +21,7 @@ class CameraInfo650D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo650D', 'itemsByName' => array ( @@ -178,7 +178,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -193,7 +193,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -208,7 +208,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -223,7 +223,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -241,7 +241,7 @@ class CameraInfo650D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -255,7 +255,7 @@ class CameraInfo650D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -279,7 +279,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -294,7 +294,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -308,7 +308,7 @@ class CameraInfo650D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -350,7 +350,7 @@ class CameraInfo650D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -364,7 +364,7 @@ class CameraInfo650D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -812,7 +812,7 @@ class CameraInfo650D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -830,7 +830,7 @@ class CameraInfo650D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -848,7 +848,7 @@ class CameraInfo650D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -862,7 +862,7 @@ class CameraInfo650D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -877,7 +877,7 @@ class CameraInfo650D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -893,7 +893,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -908,7 +908,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -923,7 +923,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => @@ -938,7 +938,7 @@ class CameraInfo650D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo6D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo6D.php index f29171cf4..5fba944ff 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo6D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo6D.php @@ -21,7 +21,7 @@ class CameraInfo6D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo6D', 'itemsByName' => array ( @@ -172,7 +172,7 @@ class CameraInfo6D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -187,7 +187,7 @@ class CameraInfo6D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -202,7 +202,7 @@ class CameraInfo6D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -217,7 +217,7 @@ class CameraInfo6D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -235,7 +235,7 @@ class CameraInfo6D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -249,7 +249,7 @@ class CameraInfo6D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -273,7 +273,7 @@ class CameraInfo6D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -288,7 +288,7 @@ class CameraInfo6D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -302,7 +302,7 @@ class CameraInfo6D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -344,7 +344,7 @@ class CameraInfo6D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -358,7 +358,7 @@ class CameraInfo6D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -806,7 +806,7 @@ class CameraInfo6D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -824,7 +824,7 @@ class CameraInfo6D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -842,7 +842,7 @@ class CameraInfo6D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -856,7 +856,7 @@ class CameraInfo6D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -872,7 +872,7 @@ class CameraInfo6D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -887,7 +887,7 @@ class CameraInfo6D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo70D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo70D.php index bd4c27ff0..6289821f4 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo70D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo70D.php @@ -21,7 +21,7 @@ class CameraInfo70D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo70D', 'itemsByName' => array ( @@ -156,7 +156,7 @@ class CameraInfo70D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -171,7 +171,7 @@ class CameraInfo70D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -186,7 +186,7 @@ class CameraInfo70D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -201,7 +201,7 @@ class CameraInfo70D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -219,7 +219,7 @@ class CameraInfo70D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -233,7 +233,7 @@ class CameraInfo70D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -257,7 +257,7 @@ class CameraInfo70D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -272,7 +272,7 @@ class CameraInfo70D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -286,7 +286,7 @@ class CameraInfo70D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -704,7 +704,7 @@ class CameraInfo70D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -722,7 +722,7 @@ class CameraInfo70D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -740,7 +740,7 @@ class CameraInfo70D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -754,7 +754,7 @@ class CameraInfo70D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -770,7 +770,7 @@ class CameraInfo70D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -785,7 +785,7 @@ class CameraInfo70D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo750D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo750D.php index 9534f71f7..127456545 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo750D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo750D.php @@ -21,7 +21,7 @@ class CameraInfo750D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo750D', 'itemsByName' => array ( @@ -150,7 +150,7 @@ class CameraInfo750D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -165,7 +165,7 @@ class CameraInfo750D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -180,7 +180,7 @@ class CameraInfo750D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -195,7 +195,7 @@ class CameraInfo750D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -213,7 +213,7 @@ class CameraInfo750D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -228,7 +228,7 @@ class CameraInfo750D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -243,7 +243,7 @@ class CameraInfo750D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -257,7 +257,7 @@ class CameraInfo750D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -299,7 +299,7 @@ class CameraInfo750D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -313,7 +313,7 @@ class CameraInfo750D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -761,7 +761,7 @@ class CameraInfo750D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -779,7 +779,7 @@ class CameraInfo750D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -797,7 +797,7 @@ class CameraInfo750D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -811,7 +811,7 @@ class CameraInfo750D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -826,7 +826,7 @@ class CameraInfo750D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo7D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo7D.php index 03b55ce9c..5808fd5e2 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo7D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo7D.php @@ -21,7 +21,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo7D', 'itemsByName' => array ( @@ -219,7 +219,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersionLookAhead', 'title' => 'Firmware Version Look Ahead', 'components' => 2, @@ -235,7 +235,7 @@ class CameraInfo7D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -250,7 +250,7 @@ class CameraInfo7D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -265,7 +265,7 @@ class CameraInfo7D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -279,7 +279,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightTonePriority', 'title' => 'Highlight Tone Priority', 'format' => @@ -301,7 +301,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeasuredEV2', 'title' => 'Measured EV 2', 'format' => @@ -315,7 +315,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeasuredEV', 'title' => 'Measured EV', 'format' => @@ -329,7 +329,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashMeteringMode', 'title' => 'Flash Metering Mode', 'format' => @@ -355,7 +355,7 @@ class CameraInfo7D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -373,7 +373,7 @@ class CameraInfo7D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -387,7 +387,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -411,7 +411,7 @@ class CameraInfo7D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -426,7 +426,7 @@ class CameraInfo7D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -440,7 +440,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -482,7 +482,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -496,7 +496,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraPictureStyle', 'title' => 'Camera Picture Style', 'format' => @@ -525,7 +525,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighISONoiseReduction', 'title' => 'High ISO Noise Reduction', 'format' => @@ -953,7 +953,7 @@ class CameraInfo7D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -971,7 +971,7 @@ class CameraInfo7D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -989,7 +989,7 @@ class CameraInfo7D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -1003,7 +1003,7 @@ class CameraInfo7D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -1019,7 +1019,7 @@ class CameraInfo7D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -1034,7 +1034,7 @@ class CameraInfo7D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfo80D.php b/src/Collection/ExifMakerNotes/Canon/CameraInfo80D.php index dae1d1ec2..4680ce707 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfo80D.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfo80D.php @@ -21,7 +21,7 @@ class CameraInfo80D extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfo80D', 'itemsByName' => array ( @@ -156,7 +156,7 @@ class CameraInfo80D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -171,7 +171,7 @@ class CameraInfo80D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -186,7 +186,7 @@ class CameraInfo80D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -201,7 +201,7 @@ class CameraInfo80D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -219,7 +219,7 @@ class CameraInfo80D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -233,7 +233,7 @@ class CameraInfo80D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraOrientation', 'title' => 'Camera Orientation', 'format' => @@ -257,7 +257,7 @@ class CameraInfo80D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -272,7 +272,7 @@ class CameraInfo80D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -286,7 +286,7 @@ class CameraInfo80D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -704,7 +704,7 @@ class CameraInfo80D extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -722,7 +722,7 @@ class CameraInfo80D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -740,7 +740,7 @@ class CameraInfo80D extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -754,7 +754,7 @@ class CameraInfo80D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareVersion', 'title' => 'Firmware Version', 'components' => 6, @@ -770,7 +770,7 @@ class CameraInfo80D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FileIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileIndex', 'title' => 'File Index', 'format' => @@ -785,7 +785,7 @@ class CameraInfo80D extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\DirectoryIndex', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DirectoryIndex', 'title' => 'Directory Index', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfoPowerShot.php b/src/Collection/ExifMakerNotes/Canon/CameraInfoPowerShot.php index 3a5a72447..ba9b695ca 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfoPowerShot.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfoPowerShot.php @@ -21,7 +21,7 @@ class CameraInfoPowerShot extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfoPowerShot', 'itemsByName' => array ( @@ -78,7 +78,7 @@ class CameraInfoPowerShot extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -93,7 +93,7 @@ class CameraInfoPowerShot extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -108,7 +108,7 @@ class CameraInfoPowerShot extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -122,7 +122,7 @@ class CameraInfoPowerShot extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Rotation', 'title' => 'Rotation', 'format' => @@ -137,7 +137,7 @@ class CameraInfoPowerShot extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -152,7 +152,7 @@ class CameraInfoPowerShot extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfoPowerShot2.php b/src/Collection/ExifMakerNotes/Canon/CameraInfoPowerShot2.php index c604df9ae..804207561 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfoPowerShot2.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfoPowerShot2.php @@ -21,7 +21,7 @@ class CameraInfoPowerShot2 extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfoPowerShot2', 'itemsByName' => array ( @@ -84,7 +84,7 @@ class CameraInfoPowerShot2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -99,7 +99,7 @@ class CameraInfoPowerShot2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -114,7 +114,7 @@ class CameraInfoPowerShot2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -128,7 +128,7 @@ class CameraInfoPowerShot2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Rotation', 'title' => 'Rotation', 'format' => @@ -143,7 +143,7 @@ class CameraInfoPowerShot2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -158,7 +158,7 @@ class CameraInfoPowerShot2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -173,7 +173,7 @@ class CameraInfoPowerShot2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -188,7 +188,7 @@ class CameraInfoPowerShot2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -203,7 +203,7 @@ class CameraInfoPowerShot2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfoUnknown.php b/src/Collection/ExifMakerNotes/Canon/CameraInfoUnknown.php index 43c5e7fbc..5a9024b23 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfoUnknown.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfoUnknown.php @@ -21,7 +21,7 @@ class CameraInfoUnknown extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfoUnknown', 'itemsByName' => array ( @@ -45,7 +45,7 @@ class CameraInfoUnknown extends CollectionBase { array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\LensSerialNumber', 'outputFormat' => 2, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensSerialNumber', 'title' => 'Lens Serial Number', 'components' => 5, diff --git a/src/Collection/ExifMakerNotes/Canon/CameraInfoUnknown32.php b/src/Collection/ExifMakerNotes/Canon/CameraInfoUnknown32.php index 903b76046..e8442e7e8 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraInfoUnknown32.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraInfoUnknown32.php @@ -21,7 +21,7 @@ class CameraInfoUnknown32 extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraInfoUnknown32', 'itemsByName' => array ( @@ -54,7 +54,7 @@ class CameraInfoUnknown32 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -69,7 +69,7 @@ class CameraInfoUnknown32 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -84,7 +84,7 @@ class CameraInfoUnknown32 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -99,7 +99,7 @@ class CameraInfoUnknown32 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -114,7 +114,7 @@ class CameraInfoUnknown32 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -129,7 +129,7 @@ class CameraInfoUnknown32 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraInfo\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CameraSettings.php b/src/Collection/ExifMakerNotes/Canon/CameraSettings.php index f54a19c16..fc940aacc 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraSettings.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraSettings.php @@ -22,7 +22,7 @@ class CameraSettings extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CameraSettings', 'itemsByName' => array ( @@ -341,7 +341,7 @@ class CameraSettings extends CollectionBase { 2 => 'Normal', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MacroMode', 'title' => 'Macro Mode', 'format' => @@ -362,7 +362,7 @@ class CameraSettings extends CollectionBase { 0 => 'Off', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SelfTimer', 'title' => 'Self Timer', 'format' => @@ -376,7 +376,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Quality', 'title' => 'Quality', 'format' => @@ -405,7 +405,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonFlashMode', 'title' => 'Canon Flash Mode', 'format' => @@ -434,7 +434,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContinuousDrive', 'title' => 'Continuous Drive', 'format' => @@ -463,7 +463,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusMode', 'title' => 'Focus Mode', 'format' => @@ -494,7 +494,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RecordMode', 'title' => 'Record Mode', 'format' => @@ -526,7 +526,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonImageSize', 'title' => 'Canon Image Size', 'format' => @@ -565,7 +565,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'EasyMode', 'title' => 'Easy Mode', 'format' => @@ -667,7 +667,7 @@ class CameraSettings extends CollectionBase { 3 => 'Other', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DigitalZoom', 'title' => 'Digital Zoom', 'format' => @@ -682,7 +682,7 @@ class CameraSettings extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Contrast', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Contrast', 'title' => 'Contrast', 'format' => @@ -704,7 +704,7 @@ class CameraSettings extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Saturation', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Saturation', 'title' => 'Saturation', 'format' => @@ -726,7 +726,7 @@ class CameraSettings extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Sharpness', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -741,7 +741,7 @@ class CameraSettings extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraISO', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraISO', 'title' => 'Camera ISO', 'format' => @@ -755,7 +755,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeteringMode', 'title' => 'Metering Mode', 'format' => @@ -781,7 +781,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusRange', 'title' => 'Focus Range', 'format' => @@ -812,7 +812,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPoint', 'title' => 'AF Point', 'format' => @@ -840,7 +840,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonExposureMode', 'title' => 'Canon Exposure Mode', 'format' => @@ -1273,7 +1273,7 @@ class CameraSettings extends CollectionBase { 65535 => 'n/a', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensType', 'title' => 'Lens Type', 'format' => @@ -1292,7 +1292,7 @@ class CameraSettings extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxFocalLength', 'title' => 'Max Focal Length', 'format' => @@ -1311,7 +1311,7 @@ class CameraSettings extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinFocalLength', 'title' => 'Min Focal Length', 'format' => @@ -1329,7 +1329,7 @@ class CameraSettings extends CollectionBase { array ( 'default' => '{value}/mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalUnits', 'title' => 'Focal Units', 'format' => @@ -1344,7 +1344,7 @@ class CameraSettings extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ApertureValue', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxAperture', 'title' => 'Max Aperture', 'format' => @@ -1359,7 +1359,7 @@ class CameraSettings extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ApertureValue', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinAperture', 'title' => 'Min Aperture', 'format' => @@ -1373,7 +1373,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashActivity', 'title' => 'Flash Activity', 'format' => @@ -1387,7 +1387,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashBits', 'title' => 'Flash Bits', 'format' => @@ -1417,7 +1417,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusContinuous', 'title' => 'Focus Continuous', 'format' => @@ -1440,7 +1440,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AESetting', 'title' => 'AE Setting', 'format' => @@ -1465,7 +1465,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageStabilization', 'title' => 'Image Stabilization', 'format' => @@ -1496,7 +1496,7 @@ class CameraSettings extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\DisplayAperture', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DisplayAperture', 'title' => 'Display Aperture', 'format' => @@ -1510,7 +1510,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ZoomSourceWidth', 'title' => 'Zoom Source Width', 'format' => @@ -1524,7 +1524,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ZoomTargetWidth', 'title' => 'Zoom Target Width', 'format' => @@ -1538,7 +1538,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpotMeteringMode', 'title' => 'Spot Metering Mode', 'format' => @@ -1560,7 +1560,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PhotoEffect', 'title' => 'Photo Effect', 'format' => @@ -1588,7 +1588,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ManualFlashOutput', 'title' => 'Manual Flash Output', 'format' => @@ -1613,7 +1613,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTone', 'title' => 'Color Tone', 'format' => @@ -1634,7 +1634,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SRAWQuality', 'title' => 'SRAW Quality', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorBalance.php b/src/Collection/ExifMakerNotes/Canon/ColorBalance.php index ca329f2c8..42103c2b9 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorBalance.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorBalance.php @@ -22,7 +22,7 @@ class ColorBalance extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorBalance', 'itemsByName' => array ( @@ -116,7 +116,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -131,7 +131,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -146,7 +146,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -161,7 +161,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -176,7 +176,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -191,7 +191,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -206,7 +206,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -221,7 +221,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCustom', 'title' => 'WB RGGB Levels Custom', 'components' => 4, @@ -236,7 +236,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsKelvin', 'title' => 'WB RGGB Levels Kelvin', 'components' => 4, @@ -251,7 +251,7 @@ class ColorBalance extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBBlackLevels', 'title' => 'WB RGGB Black Levels', 'components' => 4, diff --git a/src/Collection/ExifMakerNotes/Canon/ColorCalib.php b/src/Collection/ExifMakerNotes/Canon/ColorCalib.php index 184d78075..5c28a9b84 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorCalib.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorCalib.php @@ -21,7 +21,7 @@ class ColorCalib extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorCalib', 'itemsByName' => array ( @@ -155,7 +155,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration01', 'title' => 'Camera Color Calibration 01', 'components' => 4, @@ -170,7 +170,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration02', 'title' => 'Camera Color Calibration 02', 'components' => 4, @@ -185,7 +185,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration03', 'title' => 'Camera Color Calibration 03', 'components' => 4, @@ -200,7 +200,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration04', 'title' => 'Camera Color Calibration 04', 'components' => 4, @@ -215,7 +215,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration05', 'title' => 'Camera Color Calibration 05', 'components' => 4, @@ -230,7 +230,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration06', 'title' => 'Camera Color Calibration 06', 'components' => 4, @@ -245,7 +245,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration07', 'title' => 'Camera Color Calibration 07', 'components' => 4, @@ -260,7 +260,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration08', 'title' => 'Camera Color Calibration 08', 'components' => 4, @@ -275,7 +275,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration09', 'title' => 'Camera Color Calibration 09', 'components' => 4, @@ -290,7 +290,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration10', 'title' => 'Camera Color Calibration 10', 'components' => 4, @@ -305,7 +305,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration11', 'title' => 'Camera Color Calibration 11', 'components' => 4, @@ -320,7 +320,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration12', 'title' => 'Camera Color Calibration 12', 'components' => 4, @@ -335,7 +335,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration13', 'title' => 'Camera Color Calibration 13', 'components' => 4, @@ -350,7 +350,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration14', 'title' => 'Camera Color Calibration 14', 'components' => 4, @@ -365,7 +365,7 @@ class ColorCalib extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration15', 'title' => 'Camera Color Calibration 15', 'components' => 4, diff --git a/src/Collection/ExifMakerNotes/Canon/ColorCalib2.php b/src/Collection/ExifMakerNotes/Canon/ColorCalib2.php index 87ac6983a..2c2365ac6 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorCalib2.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorCalib2.php @@ -21,7 +21,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorCalib2', 'itemsByName' => array ( @@ -155,7 +155,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration01', 'title' => 'Camera Color Calibration 01', 'components' => 5, @@ -170,7 +170,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration02', 'title' => 'Camera Color Calibration 02', 'components' => 5, @@ -185,7 +185,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration03', 'title' => 'Camera Color Calibration 03', 'components' => 5, @@ -200,7 +200,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration04', 'title' => 'Camera Color Calibration 04', 'components' => 5, @@ -215,7 +215,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration05', 'title' => 'Camera Color Calibration 05', 'components' => 5, @@ -230,7 +230,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration06', 'title' => 'Camera Color Calibration 06', 'components' => 5, @@ -245,7 +245,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration07', 'title' => 'Camera Color Calibration 07', 'components' => 5, @@ -260,7 +260,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration08', 'title' => 'Camera Color Calibration 08', 'components' => 5, @@ -275,7 +275,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration09', 'title' => 'Camera Color Calibration 09', 'components' => 5, @@ -290,7 +290,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration10', 'title' => 'Camera Color Calibration 10', 'components' => 5, @@ -305,7 +305,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration11', 'title' => 'Camera Color Calibration 11', 'components' => 5, @@ -320,7 +320,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration12', 'title' => 'Camera Color Calibration 12', 'components' => 5, @@ -335,7 +335,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration13', 'title' => 'Camera Color Calibration 13', 'components' => 5, @@ -350,7 +350,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration14', 'title' => 'Camera Color Calibration 14', 'components' => 5, @@ -365,7 +365,7 @@ class ColorCalib2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraColorCalibration15', 'title' => 'Camera Color Calibration 15', 'components' => 5, diff --git a/src/Collection/ExifMakerNotes/Canon/ColorCoefs.php b/src/Collection/ExifMakerNotes/Canon/ColorCoefs.php index 7d35f3ada..a003a6f2e 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorCoefs.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorCoefs.php @@ -21,7 +21,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorCoefs', 'itemsByName' => array ( @@ -403,7 +403,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAsShot', 'title' => 'WB RGGB Levels As Shot', 'components' => 4, @@ -418,7 +418,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAsShot', 'title' => 'Color Temp As Shot', 'format' => @@ -432,7 +432,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -447,7 +447,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAuto', 'title' => 'Color Temp Auto', 'format' => @@ -461,7 +461,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsMeasured', 'title' => 'WB RGGB Levels Measured', 'components' => 4, @@ -476,7 +476,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempMeasured', 'title' => 'Color Temp Measured', 'format' => @@ -490,7 +490,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown', 'title' => 'WB RGGB Levels Unknown', 'components' => 4, @@ -505,7 +505,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown', 'title' => 'Color Temp Unknown', 'format' => @@ -519,7 +519,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -534,7 +534,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempDaylight', 'title' => 'Color Temp Daylight', 'format' => @@ -548,7 +548,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -563,7 +563,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempShade', 'title' => 'Color Temp Shade', 'format' => @@ -577,7 +577,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -592,7 +592,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCloudy', 'title' => 'Color Temp Cloudy', 'format' => @@ -606,7 +606,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -621,7 +621,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempTungsten', 'title' => 'Color Temp Tungsten', 'format' => @@ -635,7 +635,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -650,7 +650,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFluorescent', 'title' => 'Color Temp Fluorescent', 'format' => @@ -664,7 +664,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsKelvin', 'title' => 'WB RGGB Levels Kelvin', 'components' => 4, @@ -679,7 +679,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempKelvin', 'title' => 'Color Temp Kelvin', 'format' => @@ -693,7 +693,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -708,7 +708,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlash', 'title' => 'Color Temp Flash', 'format' => @@ -722,7 +722,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown2', 'title' => 'WB RGGB Levels Unknown 2', 'components' => 4, @@ -737,7 +737,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown2', 'title' => 'Color Temp Unknown 2', 'format' => @@ -751,7 +751,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown3', 'title' => 'WB RGGB Levels Unknown 3', 'components' => 4, @@ -766,7 +766,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown3', 'title' => 'Color Temp Unknown 3', 'format' => @@ -780,7 +780,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown4', 'title' => 'WB RGGB Levels Unknown 4', 'components' => 4, @@ -795,7 +795,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown4', 'title' => 'Color Temp Unknown 4', 'format' => @@ -809,7 +809,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown5', 'title' => 'WB RGGB Levels Unknown 5', 'components' => 4, @@ -824,7 +824,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown5', 'title' => 'Color Temp Unknown 5', 'format' => @@ -838,7 +838,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown6', 'title' => 'WB RGGB Levels Unknown 6', 'components' => 4, @@ -853,7 +853,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown6', 'title' => 'Color Temp Unknown 6', 'format' => @@ -867,7 +867,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown7', 'title' => 'WB RGGB Levels Unknown 7', 'components' => 4, @@ -882,7 +882,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown7', 'title' => 'Color Temp Unknown 7', 'format' => @@ -896,7 +896,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown8', 'title' => 'WB RGGB Levels Unknown 8', 'components' => 4, @@ -911,7 +911,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown8', 'title' => 'Color Temp Unknown 8', 'format' => @@ -925,7 +925,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown9', 'title' => 'WB RGGB Levels Unknown 9', 'components' => 4, @@ -940,7 +940,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown9', 'title' => 'Color Temp Unknown 9', 'format' => @@ -954,7 +954,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown10', 'title' => 'WB RGGB Levels Unknown 10', 'components' => 4, @@ -969,7 +969,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown10', 'title' => 'Color Temp Unknown 10', 'format' => @@ -983,7 +983,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown11', 'title' => 'WB RGGB Levels Unknown 11', 'components' => 4, @@ -998,7 +998,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown11', 'title' => 'Color Temp Unknown 11', 'format' => @@ -1012,7 +1012,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown12', 'title' => 'WB RGGB Levels Unknown 12', 'components' => 4, @@ -1027,7 +1027,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown12', 'title' => 'Color Temp Unknown 12', 'format' => @@ -1041,7 +1041,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown13', 'title' => 'WB RGGB Levels Unknown 13', 'components' => 4, @@ -1056,7 +1056,7 @@ class ColorCoefs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown13', 'title' => 'Color Temp Unknown 13', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorCoefs2.php b/src/Collection/ExifMakerNotes/Canon/ColorCoefs2.php index d89976a39..e9086a41e 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorCoefs2.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorCoefs2.php @@ -21,7 +21,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorCoefs2', 'itemsByName' => array ( @@ -403,7 +403,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAsShot', 'title' => 'WB RGGB Levels As Shot', 'components' => 4, @@ -418,7 +418,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAsShot', 'title' => 'Color Temp As Shot', 'format' => @@ -432,7 +432,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -447,7 +447,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAuto', 'title' => 'Color Temp Auto', 'format' => @@ -461,7 +461,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsMeasured', 'title' => 'WB RGGB Levels Measured', 'components' => 4, @@ -476,7 +476,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempMeasured', 'title' => 'Color Temp Measured', 'format' => @@ -490,7 +490,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown', 'title' => 'WB RGGB Levels Unknown', 'components' => 4, @@ -505,7 +505,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown', 'title' => 'Color Temp Unknown', 'format' => @@ -519,7 +519,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -534,7 +534,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempDaylight', 'title' => 'Color Temp Daylight', 'format' => @@ -548,7 +548,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -563,7 +563,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempShade', 'title' => 'Color Temp Shade', 'format' => @@ -577,7 +577,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -592,7 +592,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCloudy', 'title' => 'Color Temp Cloudy', 'format' => @@ -606,7 +606,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -621,7 +621,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempTungsten', 'title' => 'Color Temp Tungsten', 'format' => @@ -635,7 +635,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -650,7 +650,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFluorescent', 'title' => 'Color Temp Fluorescent', 'format' => @@ -664,7 +664,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsKelvin', 'title' => 'WB RGGB Levels Kelvin', 'components' => 4, @@ -679,7 +679,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempKelvin', 'title' => 'Color Temp Kelvin', 'format' => @@ -693,7 +693,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -708,7 +708,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlash', 'title' => 'Color Temp Flash', 'format' => @@ -722,7 +722,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown2', 'title' => 'WB RGGB Levels Unknown 2', 'components' => 4, @@ -737,7 +737,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown2', 'title' => 'Color Temp Unknown 2', 'format' => @@ -751,7 +751,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown3', 'title' => 'WB RGGB Levels Unknown 3', 'components' => 4, @@ -766,7 +766,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown3', 'title' => 'Color Temp Unknown 3', 'format' => @@ -780,7 +780,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown4', 'title' => 'WB RGGB Levels Unknown 4', 'components' => 4, @@ -795,7 +795,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown4', 'title' => 'Color Temp Unknown 4', 'format' => @@ -809,7 +809,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown5', 'title' => 'WB RGGB Levels Unknown 5', 'components' => 4, @@ -824,7 +824,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown5', 'title' => 'Color Temp Unknown 5', 'format' => @@ -838,7 +838,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown6', 'title' => 'WB RGGB Levels Unknown 6', 'components' => 4, @@ -853,7 +853,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown6', 'title' => 'Color Temp Unknown 6', 'format' => @@ -867,7 +867,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown7', 'title' => 'WB RGGB Levels Unknown 7', 'components' => 4, @@ -882,7 +882,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown7', 'title' => 'Color Temp Unknown 7', 'format' => @@ -896,7 +896,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown8', 'title' => 'WB RGGB Levels Unknown 8', 'components' => 4, @@ -911,7 +911,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown8', 'title' => 'Color Temp Unknown 8', 'format' => @@ -925,7 +925,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown9', 'title' => 'WB RGGB Levels Unknown 9', 'components' => 4, @@ -940,7 +940,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown9', 'title' => 'Color Temp Unknown 9', 'format' => @@ -954,7 +954,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown10', 'title' => 'WB RGGB Levels Unknown 10', 'components' => 4, @@ -969,7 +969,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown10', 'title' => 'Color Temp Unknown 10', 'format' => @@ -983,7 +983,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown11', 'title' => 'WB RGGB Levels Unknown 11', 'components' => 4, @@ -998,7 +998,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown11', 'title' => 'Color Temp Unknown 11', 'format' => @@ -1012,7 +1012,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown12', 'title' => 'WB RGGB Levels Unknown 12', 'components' => 4, @@ -1027,7 +1027,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown12', 'title' => 'Color Temp Unknown 12', 'format' => @@ -1041,7 +1041,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown13', 'title' => 'WB RGGB Levels Unknown 13', 'components' => 4, @@ -1056,7 +1056,7 @@ class ColorCoefs2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown13', 'title' => 'Color Temp Unknown 13', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorData1.php b/src/Collection/ExifMakerNotes/Canon/ColorData1.php index 4ac823578..6a10d3fa8 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorData1.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorData1.php @@ -21,7 +21,7 @@ class ColorData1 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorData1', 'itemsByName' => array ( @@ -195,7 +195,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAsShot', 'title' => 'WB RGGB Levels As Shot', 'components' => 4, @@ -210,7 +210,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAsShot', 'title' => 'Color Temp As Shot', 'format' => @@ -224,7 +224,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -239,7 +239,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAuto', 'title' => 'Color Temp Auto', 'format' => @@ -253,7 +253,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -268,7 +268,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempDaylight', 'title' => 'Color Temp Daylight', 'format' => @@ -282,7 +282,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -297,7 +297,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempShade', 'title' => 'Color Temp Shade', 'format' => @@ -311,7 +311,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -326,7 +326,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCloudy', 'title' => 'Color Temp Cloudy', 'format' => @@ -340,7 +340,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -355,7 +355,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempTungsten', 'title' => 'Color Temp Tungsten', 'format' => @@ -369,7 +369,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -384,7 +384,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFluorescent', 'title' => 'Color Temp Fluorescent', 'format' => @@ -398,7 +398,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -413,7 +413,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlash', 'title' => 'Color Temp Flash', 'format' => @@ -427,7 +427,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCustom1', 'title' => 'WB RGGB Levels Custom 1', 'components' => 4, @@ -442,7 +442,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCustom1', 'title' => 'Color Temp Custom 1', 'format' => @@ -456,7 +456,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCustom2', 'title' => 'WB RGGB Levels Custom 2', 'components' => 4, @@ -471,7 +471,7 @@ class ColorData1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCustom2', 'title' => 'Color Temp Custom 2', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorData2.php b/src/Collection/ExifMakerNotes/Canon/ColorData2.php index e74032284..14d4bc790 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorData2.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorData2.php @@ -21,7 +21,7 @@ class ColorData2 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorData2', 'itemsByName' => array ( @@ -491,7 +491,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -506,7 +506,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAuto', 'title' => 'Color Temp Auto', 'format' => @@ -520,7 +520,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown', 'title' => 'WB RGGB Levels Unknown', 'components' => 4, @@ -535,7 +535,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown', 'title' => 'Color Temp Unknown', 'format' => @@ -549,7 +549,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAsShot', 'title' => 'WB RGGB Levels As Shot', 'components' => 4, @@ -564,7 +564,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAsShot', 'title' => 'Color Temp As Shot', 'format' => @@ -578,7 +578,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -593,7 +593,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempDaylight', 'title' => 'Color Temp Daylight', 'format' => @@ -607,7 +607,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -622,7 +622,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempShade', 'title' => 'Color Temp Shade', 'format' => @@ -636,7 +636,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -651,7 +651,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCloudy', 'title' => 'Color Temp Cloudy', 'format' => @@ -665,7 +665,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -680,7 +680,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempTungsten', 'title' => 'Color Temp Tungsten', 'format' => @@ -694,7 +694,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -709,7 +709,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFluorescent', 'title' => 'Color Temp Fluorescent', 'format' => @@ -723,7 +723,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsKelvin', 'title' => 'WB RGGB Levels Kelvin', 'components' => 4, @@ -738,7 +738,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempKelvin', 'title' => 'Color Temp Kelvin', 'format' => @@ -752,7 +752,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -767,7 +767,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlash', 'title' => 'Color Temp Flash', 'format' => @@ -781,7 +781,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown2', 'title' => 'WB RGGB Levels Unknown 2', 'components' => 4, @@ -796,7 +796,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown2', 'title' => 'Color Temp Unknown 2', 'format' => @@ -810,7 +810,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown3', 'title' => 'WB RGGB Levels Unknown 3', 'components' => 4, @@ -825,7 +825,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown3', 'title' => 'Color Temp Unknown 3', 'format' => @@ -839,7 +839,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown4', 'title' => 'WB RGGB Levels Unknown 4', 'components' => 4, @@ -854,7 +854,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown4', 'title' => 'Color Temp Unknown 4', 'format' => @@ -868,7 +868,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown5', 'title' => 'WB RGGB Levels Unknown 5', 'components' => 4, @@ -883,7 +883,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown5', 'title' => 'Color Temp Unknown 5', 'format' => @@ -897,7 +897,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown6', 'title' => 'WB RGGB Levels Unknown 6', 'components' => 4, @@ -912,7 +912,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown6', 'title' => 'Color Temp Unknown 6', 'format' => @@ -926,7 +926,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown7', 'title' => 'WB RGGB Levels Unknown 7', 'components' => 4, @@ -941,7 +941,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown7', 'title' => 'Color Temp Unknown 7', 'format' => @@ -955,7 +955,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown8', 'title' => 'WB RGGB Levels Unknown 8', 'components' => 4, @@ -970,7 +970,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown8', 'title' => 'Color Temp Unknown 8', 'format' => @@ -984,7 +984,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown9', 'title' => 'WB RGGB Levels Unknown 9', 'components' => 4, @@ -999,7 +999,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown9', 'title' => 'Color Temp Unknown 9', 'format' => @@ -1013,7 +1013,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown10', 'title' => 'WB RGGB Levels Unknown 10', 'components' => 4, @@ -1028,7 +1028,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown10', 'title' => 'Color Temp Unknown 10', 'format' => @@ -1042,7 +1042,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown11', 'title' => 'WB RGGB Levels Unknown 11', 'components' => 4, @@ -1057,7 +1057,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown11', 'title' => 'Color Temp Unknown 11', 'format' => @@ -1071,7 +1071,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown12', 'title' => 'WB RGGB Levels Unknown 12', 'components' => 4, @@ -1086,7 +1086,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown12', 'title' => 'Color Temp Unknown 12', 'format' => @@ -1100,7 +1100,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown13', 'title' => 'WB RGGB Levels Unknown 13', 'components' => 4, @@ -1115,7 +1115,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown13', 'title' => 'Color Temp Unknown 13', 'format' => @@ -1129,7 +1129,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown14', 'title' => 'WB RGGB Levels Unknown 14', 'components' => 4, @@ -1144,7 +1144,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown14', 'title' => 'Color Temp Unknown 14', 'format' => @@ -1158,7 +1158,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown15', 'title' => 'WB RGGB Levels Unknown 15', 'components' => 4, @@ -1173,7 +1173,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown15', 'title' => 'Color Temp Unknown 15', 'format' => @@ -1187,7 +1187,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsPC1', 'title' => 'WB RGGB Levels PC1', 'components' => 4, @@ -1202,7 +1202,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempPC1', 'title' => 'Color Temp PC1', 'format' => @@ -1216,7 +1216,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsPC2', 'title' => 'WB RGGB Levels PC2', 'components' => 4, @@ -1231,7 +1231,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempPC2', 'title' => 'Color Temp PC2', 'format' => @@ -1245,7 +1245,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsPC3', 'title' => 'WB RGGB Levels PC3', 'components' => 4, @@ -1260,7 +1260,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempPC3', 'title' => 'Color Temp PC3', 'format' => @@ -1274,7 +1274,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown16', 'title' => 'WB RGGB Levels Unknown 16', 'components' => 4, @@ -1289,7 +1289,7 @@ class ColorData2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown16', 'title' => 'Color Temp Unknown 16', 'format' => @@ -1304,7 +1304,7 @@ class ColorData2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\RawMeasuredRGGB', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawMeasuredRGGB', 'title' => 'Raw Measured RGGB', 'components' => 4, diff --git a/src/Collection/ExifMakerNotes/Canon/ColorData3.php b/src/Collection/ExifMakerNotes/Canon/ColorData3.php index 1ecc0c83f..aba917d06 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorData3.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorData3.php @@ -21,7 +21,7 @@ class ColorData3 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorData3', 'itemsByName' => array ( @@ -307,7 +307,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorDataVersion', 'title' => 'Color Data Version', 'format' => @@ -328,7 +328,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAsShot', 'title' => 'WB RGGB Levels As Shot', 'components' => 4, @@ -343,7 +343,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAsShot', 'title' => 'Color Temp As Shot', 'format' => @@ -357,7 +357,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -372,7 +372,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAuto', 'title' => 'Color Temp Auto', 'format' => @@ -386,7 +386,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsMeasured', 'title' => 'WB RGGB Levels Measured', 'components' => 4, @@ -401,7 +401,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempMeasured', 'title' => 'Color Temp Measured', 'format' => @@ -415,7 +415,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -430,7 +430,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempDaylight', 'title' => 'Color Temp Daylight', 'format' => @@ -444,7 +444,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -459,7 +459,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempShade', 'title' => 'Color Temp Shade', 'format' => @@ -473,7 +473,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -488,7 +488,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCloudy', 'title' => 'Color Temp Cloudy', 'format' => @@ -502,7 +502,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -517,7 +517,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempTungsten', 'title' => 'Color Temp Tungsten', 'format' => @@ -531,7 +531,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -546,7 +546,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFluorescent', 'title' => 'Color Temp Fluorescent', 'format' => @@ -560,7 +560,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsKelvin', 'title' => 'WB RGGB Levels Kelvin', 'components' => 4, @@ -575,7 +575,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempKelvin', 'title' => 'Color Temp Kelvin', 'format' => @@ -589,7 +589,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -604,7 +604,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlash', 'title' => 'Color Temp Flash', 'format' => @@ -618,7 +618,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsPC1', 'title' => 'WB RGGB Levels PC1', 'components' => 4, @@ -633,7 +633,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempPC1', 'title' => 'Color Temp PC1', 'format' => @@ -647,7 +647,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsPC2', 'title' => 'WB RGGB Levels PC2', 'components' => 4, @@ -662,7 +662,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempPC2', 'title' => 'Color Temp PC2', 'format' => @@ -676,7 +676,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsPC3', 'title' => 'WB RGGB Levels PC3', 'components' => 4, @@ -691,7 +691,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempPC3', 'title' => 'Color Temp PC3', 'format' => @@ -705,7 +705,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCustom', 'title' => 'WB RGGB Levels Custom', 'components' => 4, @@ -720,7 +720,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCustom', 'title' => 'Color Temp Custom', 'format' => @@ -734,7 +734,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -749,7 +749,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashOutput', 'title' => 'Flash Output', 'format' => @@ -763,7 +763,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashBatteryLevel', 'title' => 'Flash Battery Level', 'format' => @@ -777,7 +777,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlashData', 'title' => 'Color Temp Flash Data', 'format' => @@ -791,7 +791,7 @@ class ColorData3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeasuredRGGBData', 'title' => 'Measured RGGB Data', 'components' => 4, diff --git a/src/Collection/ExifMakerNotes/Canon/ColorData4.php b/src/Collection/ExifMakerNotes/Canon/ColorData4.php index b0f28e90b..388786433 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorData4.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorData4.php @@ -21,7 +21,7 @@ class ColorData4 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorData4', 'itemsByName' => array ( @@ -107,7 +107,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorDataVersion', 'title' => 'Color Data Version', 'format' => @@ -134,7 +134,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AverageBlackLevel', 'title' => 'Average Black Level', 'components' => 4, @@ -150,7 +150,7 @@ class ColorData4 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\RawMeasuredRGGB', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawMeasuredRGGB', 'title' => 'Raw Measured RGGB', 'components' => 4, @@ -165,7 +165,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -180,7 +180,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NormalWhiteLevel', 'title' => 'Normal White Level', 'format' => @@ -194,7 +194,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpecularWhiteLevel', 'title' => 'Specular White Level', 'format' => @@ -208,7 +208,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearityUpperMargin', 'title' => 'Linearity Upper Margin', 'format' => @@ -222,7 +222,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -237,7 +237,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NormalWhiteLevel', 'title' => 'Normal White Level', 'format' => @@ -248,7 +248,7 @@ class ColorData4 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -263,7 +263,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpecularWhiteLevel', 'title' => 'Specular White Level', 'format' => @@ -277,7 +277,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearityUpperMargin', 'title' => 'Linearity Upper Margin', 'format' => @@ -291,7 +291,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NormalWhiteLevel', 'title' => 'Normal White Level', 'format' => @@ -305,7 +305,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpecularWhiteLevel', 'title' => 'Specular White Level', 'format' => @@ -319,7 +319,7 @@ class ColorData4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearityUpperMargin', 'title' => 'Linearity Upper Margin', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorData5.php b/src/Collection/ExifMakerNotes/Canon/ColorData5.php index a6cedb70c..15ad65a30 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorData5.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorData5.php @@ -21,7 +21,7 @@ class ColorData5 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorData5', 'itemsByName' => array ( @@ -53,7 +53,7 @@ class ColorData5 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorDataVersion', 'title' => 'Color Data Version', 'format' => @@ -75,7 +75,7 @@ class ColorData5 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -90,7 +90,7 @@ class ColorData5 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, diff --git a/src/Collection/ExifMakerNotes/Canon/ColorData6.php b/src/Collection/ExifMakerNotes/Canon/ColorData6.php index 6e9c70d50..279b4d596 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorData6.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorData6.php @@ -21,7 +21,7 @@ class ColorData6 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorData6', 'itemsByName' => array ( @@ -491,7 +491,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorDataVersion', 'title' => 'Color Data Version', 'format' => @@ -512,7 +512,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAsShot', 'title' => 'WB RGGB Levels As Shot', 'components' => 4, @@ -527,7 +527,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAsShot', 'title' => 'Color Temp As Shot', 'format' => @@ -541,7 +541,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -556,7 +556,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAuto', 'title' => 'Color Temp Auto', 'format' => @@ -570,7 +570,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsMeasured', 'title' => 'WB RGGB Levels Measured', 'components' => 4, @@ -585,7 +585,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempMeasured', 'title' => 'Color Temp Measured', 'format' => @@ -599,7 +599,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown', 'title' => 'WB RGGB Levels Unknown', 'components' => 4, @@ -614,7 +614,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown', 'title' => 'Color Temp Unknown', 'format' => @@ -628,7 +628,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown2', 'title' => 'WB RGGB Levels Unknown 2', 'components' => 4, @@ -643,7 +643,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown2', 'title' => 'Color Temp Unknown 2', 'format' => @@ -657,7 +657,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown3', 'title' => 'WB RGGB Levels Unknown 3', 'components' => 4, @@ -672,7 +672,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown3', 'title' => 'Color Temp Unknown 3', 'format' => @@ -686,7 +686,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown4', 'title' => 'WB RGGB Levels Unknown 4', 'components' => 4, @@ -701,7 +701,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown4', 'title' => 'Color Temp Unknown 4', 'format' => @@ -715,7 +715,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown5', 'title' => 'WB RGGB Levels Unknown 5', 'components' => 4, @@ -730,7 +730,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown5', 'title' => 'Color Temp Unknown 5', 'format' => @@ -744,7 +744,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -759,7 +759,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempDaylight', 'title' => 'Color Temp Daylight', 'format' => @@ -773,7 +773,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -788,7 +788,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempShade', 'title' => 'Color Temp Shade', 'format' => @@ -802,7 +802,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -817,7 +817,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCloudy', 'title' => 'Color Temp Cloudy', 'format' => @@ -831,7 +831,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -846,7 +846,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempTungsten', 'title' => 'Color Temp Tungsten', 'format' => @@ -860,7 +860,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -875,7 +875,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFluorescent', 'title' => 'Color Temp Fluorescent', 'format' => @@ -889,7 +889,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsKelvin', 'title' => 'WB RGGB Levels Kelvin', 'components' => 4, @@ -904,7 +904,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempKelvin', 'title' => 'Color Temp Kelvin', 'format' => @@ -918,7 +918,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -933,7 +933,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlash', 'title' => 'Color Temp Flash', 'format' => @@ -947,7 +947,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown6', 'title' => 'WB RGGB Levels Unknown 6', 'components' => 4, @@ -962,7 +962,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown6', 'title' => 'Color Temp Unknown 6', 'format' => @@ -976,7 +976,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown7', 'title' => 'WB RGGB Levels Unknown 7', 'components' => 4, @@ -991,7 +991,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown7', 'title' => 'Color Temp Unknown 7', 'format' => @@ -1005,7 +1005,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown8', 'title' => 'WB RGGB Levels Unknown 8', 'components' => 4, @@ -1020,7 +1020,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown8', 'title' => 'Color Temp Unknown 8', 'format' => @@ -1034,7 +1034,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown9', 'title' => 'WB RGGB Levels Unknown 9', 'components' => 4, @@ -1049,7 +1049,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown9', 'title' => 'Color Temp Unknown 9', 'format' => @@ -1063,7 +1063,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown10', 'title' => 'WB RGGB Levels Unknown 10', 'components' => 4, @@ -1078,7 +1078,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown10', 'title' => 'Color Temp Unknown 10', 'format' => @@ -1092,7 +1092,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown11', 'title' => 'WB RGGB Levels Unknown 11', 'components' => 4, @@ -1107,7 +1107,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown11', 'title' => 'Color Temp Unknown 11', 'format' => @@ -1121,7 +1121,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown12', 'title' => 'WB RGGB Levels Unknown 12', 'components' => 4, @@ -1136,7 +1136,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown12', 'title' => 'Color Temp Unknown 12', 'format' => @@ -1150,7 +1150,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown13', 'title' => 'WB RGGB Levels Unknown 13', 'components' => 4, @@ -1165,7 +1165,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown13', 'title' => 'Color Temp Unknown 13', 'format' => @@ -1179,7 +1179,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown14', 'title' => 'WB RGGB Levels Unknown 14', 'components' => 4, @@ -1194,7 +1194,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown14', 'title' => 'Color Temp Unknown 14', 'format' => @@ -1208,7 +1208,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown15', 'title' => 'WB RGGB Levels Unknown 15', 'components' => 4, @@ -1223,7 +1223,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown15', 'title' => 'Color Temp Unknown 15', 'format' => @@ -1237,7 +1237,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AverageBlackLevel', 'title' => 'Average Black Level', 'components' => 4, @@ -1253,7 +1253,7 @@ class ColorData6 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\RawMeasuredRGGB', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawMeasuredRGGB', 'title' => 'Raw Measured RGGB', 'components' => 4, @@ -1268,7 +1268,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -1283,7 +1283,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NormalWhiteLevel', 'title' => 'Normal White Level', 'format' => @@ -1297,7 +1297,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpecularWhiteLevel', 'title' => 'Specular White Level', 'format' => @@ -1311,7 +1311,7 @@ class ColorData6 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearityUpperMargin', 'title' => 'Linearity Upper Margin', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorData7.php b/src/Collection/ExifMakerNotes/Canon/ColorData7.php index a41c771de..b8db4109c 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorData7.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorData7.php @@ -21,7 +21,7 @@ class ColorData7 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorData7', 'itemsByName' => array ( @@ -581,7 +581,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorDataVersion', 'title' => 'Color Data Version', 'format' => @@ -603,7 +603,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAsShot', 'title' => 'WB RGGB Levels As Shot', 'components' => 4, @@ -618,7 +618,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAsShot', 'title' => 'Color Temp As Shot', 'format' => @@ -632,7 +632,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -647,7 +647,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAuto', 'title' => 'Color Temp Auto', 'format' => @@ -661,7 +661,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsMeasured', 'title' => 'WB RGGB Levels Measured', 'components' => 4, @@ -676,7 +676,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempMeasured', 'title' => 'Color Temp Measured', 'format' => @@ -690,7 +690,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown', 'title' => 'WB RGGB Levels Unknown', 'components' => 4, @@ -705,7 +705,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown', 'title' => 'Color Temp Unknown', 'format' => @@ -719,7 +719,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown2', 'title' => 'WB RGGB Levels Unknown 2', 'components' => 4, @@ -734,7 +734,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown2', 'title' => 'Color Temp Unknown 2', 'format' => @@ -748,7 +748,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown3', 'title' => 'WB RGGB Levels Unknown 3', 'components' => 4, @@ -763,7 +763,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown3', 'title' => 'Color Temp Unknown 3', 'format' => @@ -777,7 +777,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown4', 'title' => 'WB RGGB Levels Unknown 4', 'components' => 4, @@ -792,7 +792,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown4', 'title' => 'Color Temp Unknown 4', 'format' => @@ -806,7 +806,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown5', 'title' => 'WB RGGB Levels Unknown 5', 'components' => 4, @@ -821,7 +821,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown5', 'title' => 'Color Temp Unknown 5', 'format' => @@ -835,7 +835,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown6', 'title' => 'WB RGGB Levels Unknown 6', 'components' => 4, @@ -850,7 +850,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown6', 'title' => 'Color Temp Unknown 6', 'format' => @@ -864,7 +864,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown7', 'title' => 'WB RGGB Levels Unknown 7', 'components' => 4, @@ -879,7 +879,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown7', 'title' => 'Color Temp Unknown 7', 'format' => @@ -893,7 +893,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown8', 'title' => 'WB RGGB Levels Unknown 8', 'components' => 4, @@ -908,7 +908,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown8', 'title' => 'Color Temp Unknown 8', 'format' => @@ -922,7 +922,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown9', 'title' => 'WB RGGB Levels Unknown 9', 'components' => 4, @@ -937,7 +937,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown9', 'title' => 'Color Temp Unknown 9', 'format' => @@ -951,7 +951,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown10', 'title' => 'WB RGGB Levels Unknown 10', 'components' => 4, @@ -966,7 +966,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown10', 'title' => 'Color Temp Unknown 10', 'format' => @@ -980,7 +980,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -995,7 +995,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempDaylight', 'title' => 'Color Temp Daylight', 'format' => @@ -1009,7 +1009,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -1024,7 +1024,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempShade', 'title' => 'Color Temp Shade', 'format' => @@ -1038,7 +1038,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -1053,7 +1053,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCloudy', 'title' => 'Color Temp Cloudy', 'format' => @@ -1067,7 +1067,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -1082,7 +1082,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempTungsten', 'title' => 'Color Temp Tungsten', 'format' => @@ -1096,7 +1096,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -1111,7 +1111,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFluorescent', 'title' => 'Color Temp Fluorescent', 'format' => @@ -1125,7 +1125,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsKelvin', 'title' => 'WB RGGB Levels Kelvin', 'components' => 4, @@ -1140,7 +1140,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempKelvin', 'title' => 'Color Temp Kelvin', 'format' => @@ -1154,7 +1154,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -1169,7 +1169,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlash', 'title' => 'Color Temp Flash', 'format' => @@ -1183,7 +1183,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown11', 'title' => 'WB RGGB Levels Unknown 11', 'components' => 4, @@ -1198,7 +1198,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown11', 'title' => 'Color Temp Unknown 11', 'format' => @@ -1212,7 +1212,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown12', 'title' => 'WB RGGB Levels Unknown 12', 'components' => 4, @@ -1227,7 +1227,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown12', 'title' => 'Color Temp Unknown 12', 'format' => @@ -1241,7 +1241,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown13', 'title' => 'WB RGGB Levels Unknown 13', 'components' => 4, @@ -1256,7 +1256,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown13', 'title' => 'Color Temp Unknown 13', 'format' => @@ -1270,7 +1270,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown14', 'title' => 'WB RGGB Levels Unknown 14', 'components' => 4, @@ -1285,7 +1285,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown14', 'title' => 'Color Temp Unknown 14', 'format' => @@ -1299,7 +1299,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown15', 'title' => 'WB RGGB Levels Unknown 15', 'components' => 4, @@ -1314,7 +1314,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown15', 'title' => 'Color Temp Unknown 15', 'format' => @@ -1328,7 +1328,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown16', 'title' => 'WB RGGB Levels Unknown 16', 'components' => 4, @@ -1343,7 +1343,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown16', 'title' => 'Color Temp Unknown 16', 'format' => @@ -1357,7 +1357,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown17', 'title' => 'WB RGGB Levels Unknown 17', 'components' => 4, @@ -1372,7 +1372,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown17', 'title' => 'Color Temp Unknown 17', 'format' => @@ -1386,7 +1386,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown18', 'title' => 'WB RGGB Levels Unknown 18', 'components' => 4, @@ -1401,7 +1401,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown18', 'title' => 'Color Temp Unknown 18', 'format' => @@ -1415,7 +1415,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown19', 'title' => 'WB RGGB Levels Unknown 19', 'components' => 4, @@ -1430,7 +1430,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown19', 'title' => 'Color Temp Unknown 19', 'format' => @@ -1444,7 +1444,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown20', 'title' => 'WB RGGB Levels Unknown 20', 'components' => 4, @@ -1459,7 +1459,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown20', 'title' => 'Color Temp Unknown 20', 'format' => @@ -1473,7 +1473,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AverageBlackLevel', 'title' => 'Average Black Level', 'components' => 4, @@ -1489,7 +1489,7 @@ class ColorData7 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\RawMeasuredRGGB', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawMeasuredRGGB', 'title' => 'Raw Measured RGGB', 'components' => 4, @@ -1504,7 +1504,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -1519,7 +1519,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NormalWhiteLevel', 'title' => 'Normal White Level', 'format' => @@ -1533,7 +1533,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpecularWhiteLevel', 'title' => 'Specular White Level', 'format' => @@ -1547,7 +1547,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearityUpperMargin', 'title' => 'Linearity Upper Margin', 'format' => @@ -1562,7 +1562,7 @@ class ColorData7 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\RawMeasuredRGGB', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawMeasuredRGGB', 'title' => 'Raw Measured RGGB', 'components' => 4, @@ -1577,7 +1577,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -1592,7 +1592,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NormalWhiteLevel', 'title' => 'Normal White Level', 'format' => @@ -1606,7 +1606,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpecularWhiteLevel', 'title' => 'Specular White Level', 'format' => @@ -1620,7 +1620,7 @@ class ColorData7 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearityUpperMargin', 'title' => 'Linearity Upper Margin', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorData8.php b/src/Collection/ExifMakerNotes/Canon/ColorData8.php index f700cb2a8..449e64877 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorData8.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorData8.php @@ -21,7 +21,7 @@ class ColorData8 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorData8', 'itemsByName' => array ( @@ -731,7 +731,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorDataVersion', 'title' => 'Color Data Version', 'format' => @@ -755,7 +755,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAsShot', 'title' => 'WB RGGB Levels As Shot', 'components' => 4, @@ -770,7 +770,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAsShot', 'title' => 'Color Temp As Shot', 'format' => @@ -784,7 +784,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -799,7 +799,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAuto', 'title' => 'Color Temp Auto', 'format' => @@ -813,7 +813,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsMeasured', 'title' => 'WB RGGB Levels Measured', 'components' => 4, @@ -828,7 +828,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempMeasured', 'title' => 'Color Temp Measured', 'format' => @@ -842,7 +842,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown', 'title' => 'WB RGGB Levels Unknown', 'components' => 4, @@ -857,7 +857,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown', 'title' => 'Color Temp Unknown', 'format' => @@ -871,7 +871,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown2', 'title' => 'WB RGGB Levels Unknown 2', 'components' => 4, @@ -886,7 +886,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown2', 'title' => 'Color Temp Unknown 2', 'format' => @@ -900,7 +900,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown3', 'title' => 'WB RGGB Levels Unknown 3', 'components' => 4, @@ -915,7 +915,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown3', 'title' => 'Color Temp Unknown 3', 'format' => @@ -929,7 +929,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown4', 'title' => 'WB RGGB Levels Unknown 4', 'components' => 4, @@ -944,7 +944,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown4', 'title' => 'Color Temp Unknown 4', 'format' => @@ -958,7 +958,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown5', 'title' => 'WB RGGB Levels Unknown 5', 'components' => 4, @@ -973,7 +973,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown5', 'title' => 'Color Temp Unknown 5', 'format' => @@ -987,7 +987,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown6', 'title' => 'WB RGGB Levels Unknown 6', 'components' => 4, @@ -1002,7 +1002,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown6', 'title' => 'Color Temp Unknown 6', 'format' => @@ -1016,7 +1016,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown7', 'title' => 'WB RGGB Levels Unknown 7', 'components' => 4, @@ -1031,7 +1031,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown7', 'title' => 'Color Temp Unknown 7', 'format' => @@ -1045,7 +1045,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown8', 'title' => 'WB RGGB Levels Unknown 8', 'components' => 4, @@ -1060,7 +1060,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown8', 'title' => 'Color Temp Unknown 8', 'format' => @@ -1074,7 +1074,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown9', 'title' => 'WB RGGB Levels Unknown 9', 'components' => 4, @@ -1089,7 +1089,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown9', 'title' => 'Color Temp Unknown 9', 'format' => @@ -1103,7 +1103,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown10', 'title' => 'WB RGGB Levels Unknown 10', 'components' => 4, @@ -1118,7 +1118,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown10', 'title' => 'Color Temp Unknown 10', 'format' => @@ -1132,7 +1132,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown11', 'title' => 'WB RGGB Levels Unknown 11', 'components' => 4, @@ -1147,7 +1147,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown11', 'title' => 'Color Temp Unknown 11', 'format' => @@ -1161,7 +1161,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -1176,7 +1176,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempDaylight', 'title' => 'Color Temp Daylight', 'format' => @@ -1190,7 +1190,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -1205,7 +1205,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempShade', 'title' => 'Color Temp Shade', 'format' => @@ -1219,7 +1219,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -1234,7 +1234,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCloudy', 'title' => 'Color Temp Cloudy', 'format' => @@ -1248,7 +1248,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -1263,7 +1263,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempTungsten', 'title' => 'Color Temp Tungsten', 'format' => @@ -1277,7 +1277,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -1292,7 +1292,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFluorescent', 'title' => 'Color Temp Fluorescent', 'format' => @@ -1306,7 +1306,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsKelvin', 'title' => 'WB RGGB Levels Kelvin', 'components' => 4, @@ -1321,7 +1321,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempKelvin', 'title' => 'Color Temp Kelvin', 'format' => @@ -1335,7 +1335,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -1350,7 +1350,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlash', 'title' => 'Color Temp Flash', 'format' => @@ -1364,7 +1364,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown12', 'title' => 'WB RGGB Levels Unknown 12', 'components' => 4, @@ -1379,7 +1379,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown12', 'title' => 'Color Temp Unknown 12', 'format' => @@ -1393,7 +1393,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown13', 'title' => 'WB RGGB Levels Unknown 13', 'components' => 4, @@ -1408,7 +1408,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown13', 'title' => 'Color Temp Unknown 13', 'format' => @@ -1422,7 +1422,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown14', 'title' => 'WB RGGB Levels Unknown 14', 'components' => 4, @@ -1437,7 +1437,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown14', 'title' => 'Color Temp Unknown 14', 'format' => @@ -1451,7 +1451,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown15', 'title' => 'WB RGGB Levels Unknown 15', 'components' => 4, @@ -1466,7 +1466,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown15', 'title' => 'Color Temp Unknown 15', 'format' => @@ -1480,7 +1480,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown16', 'title' => 'WB RGGB Levels Unknown 16', 'components' => 4, @@ -1495,7 +1495,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown16', 'title' => 'Color Temp Unknown 16', 'format' => @@ -1509,7 +1509,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown17', 'title' => 'WB RGGB Levels Unknown 17', 'components' => 4, @@ -1524,7 +1524,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown17', 'title' => 'Color Temp Unknown 17', 'format' => @@ -1538,7 +1538,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown18', 'title' => 'WB RGGB Levels Unknown 18', 'components' => 4, @@ -1553,7 +1553,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown18', 'title' => 'Color Temp Unknown 18', 'format' => @@ -1567,7 +1567,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown19', 'title' => 'WB RGGB Levels Unknown 19', 'components' => 4, @@ -1582,7 +1582,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown19', 'title' => 'Color Temp Unknown 19', 'format' => @@ -1596,7 +1596,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown20', 'title' => 'WB RGGB Levels Unknown 20', 'components' => 4, @@ -1611,7 +1611,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown20', 'title' => 'Color Temp Unknown 20', 'format' => @@ -1625,7 +1625,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown21', 'title' => 'WB RGGB Levels Unknown 21', 'components' => 4, @@ -1640,7 +1640,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown21', 'title' => 'Color Temp Unknown 21', 'format' => @@ -1654,7 +1654,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown22', 'title' => 'WB RGGB Levels Unknown 22', 'components' => 4, @@ -1669,7 +1669,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown22', 'title' => 'Color Temp Unknown 22', 'format' => @@ -1683,7 +1683,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown23', 'title' => 'WB RGGB Levels Unknown 23', 'components' => 4, @@ -1698,7 +1698,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown23', 'title' => 'Color Temp Unknown 23', 'format' => @@ -1712,7 +1712,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown24', 'title' => 'WB RGGB Levels Unknown 24', 'components' => 4, @@ -1727,7 +1727,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown24', 'title' => 'Color Temp Unknown 24', 'format' => @@ -1741,7 +1741,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown25', 'title' => 'WB RGGB Levels Unknown 25', 'components' => 4, @@ -1756,7 +1756,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown25', 'title' => 'Color Temp Unknown 25', 'format' => @@ -1770,7 +1770,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown26', 'title' => 'WB RGGB Levels Unknown 26', 'components' => 4, @@ -1785,7 +1785,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown26', 'title' => 'Color Temp Unknown 26', 'format' => @@ -1799,7 +1799,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown27', 'title' => 'WB RGGB Levels Unknown 27', 'components' => 4, @@ -1814,7 +1814,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown27', 'title' => 'Color Temp Unknown 27', 'format' => @@ -1828,7 +1828,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown28', 'title' => 'WB RGGB Levels Unknown 28', 'components' => 4, @@ -1843,7 +1843,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown28', 'title' => 'Color Temp Unknown 28', 'format' => @@ -1857,7 +1857,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown29', 'title' => 'WB RGGB Levels Unknown 29', 'components' => 4, @@ -1872,7 +1872,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown29', 'title' => 'Color Temp Unknown 29', 'format' => @@ -1886,7 +1886,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown30', 'title' => 'WB RGGB Levels Unknown 30', 'components' => 4, @@ -1901,7 +1901,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown30', 'title' => 'Color Temp Unknown 30', 'format' => @@ -1915,7 +1915,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AverageBlackLevel', 'title' => 'Average Black Level', 'components' => 4, @@ -1930,7 +1930,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -1945,7 +1945,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NormalWhiteLevel', 'title' => 'Normal White Level', 'format' => @@ -1959,7 +1959,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpecularWhiteLevel', 'title' => 'Specular White Level', 'format' => @@ -1973,7 +1973,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearityUpperMargin', 'title' => 'Linearity Upper Margin', 'format' => @@ -1987,7 +1987,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -2002,7 +2002,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NormalWhiteLevel', 'title' => 'Normal White Level', 'format' => @@ -2016,7 +2016,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpecularWhiteLevel', 'title' => 'Specular White Level', 'format' => @@ -2030,7 +2030,7 @@ class ColorData8 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearityUpperMargin', 'title' => 'Linearity Upper Margin', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorData9.php b/src/Collection/ExifMakerNotes/Canon/ColorData9.php index 081accbf5..e4d9eda6a 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorData9.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorData9.php @@ -21,7 +21,7 @@ class ColorData9 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorData9', 'itemsByName' => array ( @@ -699,7 +699,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorDataVersion', 'title' => 'Color Data Version', 'format' => @@ -720,7 +720,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAsShot', 'title' => 'WB RGGB Levels As Shot', 'components' => 4, @@ -735,7 +735,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAsShot', 'title' => 'Color Temp As Shot', 'format' => @@ -749,7 +749,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsAuto', 'title' => 'WB RGGB Levels Auto', 'components' => 4, @@ -764,7 +764,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempAuto', 'title' => 'Color Temp Auto', 'format' => @@ -778,7 +778,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsMeasured', 'title' => 'WB RGGB Levels Measured', 'components' => 4, @@ -793,7 +793,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempMeasured', 'title' => 'Color Temp Measured', 'format' => @@ -807,7 +807,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown', 'title' => 'WB RGGB Levels Unknown', 'components' => 4, @@ -822,7 +822,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown', 'title' => 'Color Temp Unknown', 'format' => @@ -836,7 +836,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown2', 'title' => 'WB RGGB Levels Unknown 2', 'components' => 4, @@ -851,7 +851,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown2', 'title' => 'Color Temp Unknown 2', 'format' => @@ -865,7 +865,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown3', 'title' => 'WB RGGB Levels Unknown 3', 'components' => 4, @@ -880,7 +880,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown3', 'title' => 'Color Temp Unknown 3', 'format' => @@ -894,7 +894,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown4', 'title' => 'WB RGGB Levels Unknown 4', 'components' => 4, @@ -909,7 +909,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown4', 'title' => 'Color Temp Unknown 4', 'format' => @@ -923,7 +923,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown5', 'title' => 'WB RGGB Levels Unknown 5', 'components' => 4, @@ -938,7 +938,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown5', 'title' => 'Color Temp Unknown 5', 'format' => @@ -952,7 +952,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown6', 'title' => 'WB RGGB Levels Unknown 6', 'components' => 4, @@ -967,7 +967,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown6', 'title' => 'Color Temp Unknown 6', 'format' => @@ -981,7 +981,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown7', 'title' => 'WB RGGB Levels Unknown 7', 'components' => 4, @@ -996,7 +996,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown7', 'title' => 'Color Temp Unknown 7', 'format' => @@ -1010,7 +1010,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown8', 'title' => 'WB RGGB Levels Unknown 8', 'components' => 4, @@ -1025,7 +1025,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown8', 'title' => 'Color Temp Unknown 8', 'format' => @@ -1039,7 +1039,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown9', 'title' => 'WB RGGB Levels Unknown 9', 'components' => 4, @@ -1054,7 +1054,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown9', 'title' => 'Color Temp Unknown 9', 'format' => @@ -1068,7 +1068,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown10', 'title' => 'WB RGGB Levels Unknown 10', 'components' => 4, @@ -1083,7 +1083,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown10', 'title' => 'Color Temp Unknown 10', 'format' => @@ -1097,7 +1097,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsDaylight', 'title' => 'WB RGGB Levels Daylight', 'components' => 4, @@ -1112,7 +1112,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempDaylight', 'title' => 'Color Temp Daylight', 'format' => @@ -1126,7 +1126,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsShade', 'title' => 'WB RGGB Levels Shade', 'components' => 4, @@ -1141,7 +1141,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempShade', 'title' => 'Color Temp Shade', 'format' => @@ -1155,7 +1155,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsCloudy', 'title' => 'WB RGGB Levels Cloudy', 'components' => 4, @@ -1170,7 +1170,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempCloudy', 'title' => 'Color Temp Cloudy', 'format' => @@ -1184,7 +1184,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsTungsten', 'title' => 'WB RGGB Levels Tungsten', 'components' => 4, @@ -1199,7 +1199,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempTungsten', 'title' => 'Color Temp Tungsten', 'format' => @@ -1213,7 +1213,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFluorescent', 'title' => 'WB RGGB Levels Fluorescent', 'components' => 4, @@ -1228,7 +1228,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFluorescent', 'title' => 'Color Temp Fluorescent', 'format' => @@ -1242,7 +1242,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsKelvin', 'title' => 'WB RGGB Levels Kelvin', 'components' => 4, @@ -1257,7 +1257,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempKelvin', 'title' => 'Color Temp Kelvin', 'format' => @@ -1271,7 +1271,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsFlash', 'title' => 'WB RGGB Levels Flash', 'components' => 4, @@ -1286,7 +1286,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempFlash', 'title' => 'Color Temp Flash', 'format' => @@ -1300,7 +1300,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown11', 'title' => 'WB RGGB Levels Unknown 11', 'components' => 4, @@ -1315,7 +1315,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown11', 'title' => 'Color Temp Unknown 11', 'format' => @@ -1329,7 +1329,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown12', 'title' => 'WB RGGB Levels Unknown 12', 'components' => 4, @@ -1344,7 +1344,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown12', 'title' => 'Color Temp Unknown 12', 'format' => @@ -1358,7 +1358,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown13', 'title' => 'WB RGGB Levels Unknown 13', 'components' => 4, @@ -1373,7 +1373,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown13', 'title' => 'Color Temp Unknown 13', 'format' => @@ -1387,7 +1387,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown14', 'title' => 'WB RGGB Levels Unknown 14', 'components' => 4, @@ -1402,7 +1402,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown14', 'title' => 'Color Temp Unknown 14', 'format' => @@ -1416,7 +1416,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown15', 'title' => 'WB RGGB Levels Unknown 15', 'components' => 4, @@ -1431,7 +1431,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown15', 'title' => 'Color Temp Unknown 15', 'format' => @@ -1445,7 +1445,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown16', 'title' => 'WB RGGB Levels Unknown 16', 'components' => 4, @@ -1460,7 +1460,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown16', 'title' => 'Color Temp Unknown 16', 'format' => @@ -1474,7 +1474,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown17', 'title' => 'WB RGGB Levels Unknown 17', 'components' => 4, @@ -1489,7 +1489,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown17', 'title' => 'Color Temp Unknown 17', 'format' => @@ -1503,7 +1503,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown18', 'title' => 'WB RGGB Levels Unknown 18', 'components' => 4, @@ -1518,7 +1518,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown18', 'title' => 'Color Temp Unknown 18', 'format' => @@ -1532,7 +1532,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown19', 'title' => 'WB RGGB Levels Unknown 19', 'components' => 4, @@ -1547,7 +1547,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown19', 'title' => 'Color Temp Unknown 19', 'format' => @@ -1561,7 +1561,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown20', 'title' => 'WB RGGB Levels Unknown 20', 'components' => 4, @@ -1576,7 +1576,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown20', 'title' => 'Color Temp Unknown 20', 'format' => @@ -1590,7 +1590,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown21', 'title' => 'WB RGGB Levels Unknown 21', 'components' => 4, @@ -1605,7 +1605,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown21', 'title' => 'Color Temp Unknown 21', 'format' => @@ -1619,7 +1619,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown22', 'title' => 'WB RGGB Levels Unknown 22', 'components' => 4, @@ -1634,7 +1634,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown22', 'title' => 'Color Temp Unknown 22', 'format' => @@ -1648,7 +1648,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown23', 'title' => 'WB RGGB Levels Unknown 23', 'components' => 4, @@ -1663,7 +1663,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown23', 'title' => 'Color Temp Unknown 23', 'format' => @@ -1677,7 +1677,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown24', 'title' => 'WB RGGB Levels Unknown 24', 'components' => 4, @@ -1692,7 +1692,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown24', 'title' => 'Color Temp Unknown 24', 'format' => @@ -1706,7 +1706,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown25', 'title' => 'WB RGGB Levels Unknown 25', 'components' => 4, @@ -1721,7 +1721,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown25', 'title' => 'Color Temp Unknown 25', 'format' => @@ -1735,7 +1735,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown26', 'title' => 'WB RGGB Levels Unknown 26', 'components' => 4, @@ -1750,7 +1750,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown26', 'title' => 'Color Temp Unknown 26', 'format' => @@ -1764,7 +1764,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown27', 'title' => 'WB RGGB Levels Unknown 27', 'components' => 4, @@ -1779,7 +1779,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown27', 'title' => 'Color Temp Unknown 27', 'format' => @@ -1793,7 +1793,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown28', 'title' => 'WB RGGB Levels Unknown 28', 'components' => 4, @@ -1808,7 +1808,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown28', 'title' => 'Color Temp Unknown 28', 'format' => @@ -1822,7 +1822,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_RGGBLevelsUnknown29', 'title' => 'WB RGGB Levels Unknown 29', 'components' => 4, @@ -1837,7 +1837,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTempUnknown29', 'title' => 'Color Temp Unknown 29', 'format' => @@ -1851,7 +1851,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PerChannelBlackLevel', 'title' => 'Per Channel Black Level', 'components' => 4, @@ -1866,7 +1866,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NormalWhiteLevel', 'title' => 'Normal White Level', 'format' => @@ -1880,7 +1880,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpecularWhiteLevel', 'title' => 'Specular White Level', 'format' => @@ -1894,7 +1894,7 @@ class ColorData9 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearityUpperMargin', 'title' => 'Linearity Upper Margin', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorDataUnknown.php b/src/Collection/ExifMakerNotes/Canon/ColorDataUnknown.php index 96648ca34..9441d5634 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorDataUnknown.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorDataUnknown.php @@ -21,7 +21,7 @@ class ColorDataUnknown extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorDataUnknown', 'itemsByName' => array ( @@ -36,7 +36,7 @@ class ColorDataUnknown extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorDataVersion', 'title' => 'Color Data Version', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ColorInfo.php b/src/Collection/ExifMakerNotes/Canon/ColorInfo.php index 0e5a8a7b1..8e0ea82db 100644 --- a/src/Collection/ExifMakerNotes/Canon/ColorInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/ColorInfo.php @@ -21,7 +21,7 @@ class ColorInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ColorInfo', 'itemsByName' => array ( @@ -59,7 +59,7 @@ class ColorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Saturation', 'title' => 'Saturation', 'format' => @@ -80,7 +80,7 @@ class ColorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTone', 'title' => 'Color Tone', 'format' => @@ -101,7 +101,7 @@ class ColorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorSpace', 'title' => 'Color Space', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ContrastInfo.php b/src/Collection/ExifMakerNotes/Canon/ContrastInfo.php index 10d4d8128..a058fad1f 100644 --- a/src/Collection/ExifMakerNotes/Canon/ContrastInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/ContrastInfo.php @@ -21,7 +21,7 @@ class ContrastInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ContrastInfo', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class ContrastInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IntelligentContrast', 'title' => 'Intelligent Contrast', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/CropInfo.php b/src/Collection/ExifMakerNotes/Canon/CropInfo.php index 849c84e4a..34b21ed6f 100644 --- a/src/Collection/ExifMakerNotes/Canon/CropInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/CropInfo.php @@ -21,7 +21,7 @@ class CropInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\CropInfo', 'itemsByName' => array ( @@ -67,7 +67,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropLeftMargin', 'title' => 'Crop Left Margin', 'format' => @@ -81,7 +81,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropRightMargin', 'title' => 'Crop Right Margin', 'format' => @@ -95,7 +95,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropTopMargin', 'title' => 'Crop Top Margin', 'format' => @@ -109,7 +109,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropBottomMargin', 'title' => 'Crop Bottom Margin', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ExposureInfo.php b/src/Collection/ExifMakerNotes/Canon/ExposureInfo.php index 55f6fee65..5961e35f5 100644 --- a/src/Collection/ExifMakerNotes/Canon/ExposureInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/ExposureInfo.php @@ -21,7 +21,7 @@ class ExposureInfo extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ExposureInfo', 'itemsByName' => array ( @@ -59,7 +59,7 @@ class ExposureInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -73,7 +73,7 @@ class ExposureInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -87,7 +87,7 @@ class ExposureInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/FaceDetect1.php b/src/Collection/ExifMakerNotes/Canon/FaceDetect1.php index cb273082d..817560cc8 100644 --- a/src/Collection/ExifMakerNotes/Canon/FaceDetect1.php +++ b/src/Collection/ExifMakerNotes/Canon/FaceDetect1.php @@ -21,7 +21,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\FaceDetect1', 'itemsByName' => array ( @@ -123,7 +123,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FacesDetected', 'title' => 'Faces Detected', 'format' => @@ -137,7 +137,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaceDetectFrameSize', 'title' => 'Face Detect Frame Size', 'components' => 2, @@ -152,7 +152,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Face1Position', 'title' => 'Face 1 Position', 'components' => 2, @@ -167,7 +167,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Face2Position', 'title' => 'Face 2 Position', 'components' => 2, @@ -182,7 +182,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Face3Position', 'title' => 'Face 3 Position', 'components' => 2, @@ -197,7 +197,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Face4Position', 'title' => 'Face 4 Position', 'components' => 2, @@ -212,7 +212,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Face5Position', 'title' => 'Face 5 Position', 'components' => 2, @@ -227,7 +227,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Face6Position', 'title' => 'Face 6 Position', 'components' => 2, @@ -242,7 +242,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Face7Position', 'title' => 'Face 7 Position', 'components' => 2, @@ -257,7 +257,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Face8Position', 'title' => 'Face 8 Position', 'components' => 2, @@ -272,7 +272,7 @@ class FaceDetect1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Face9Position', 'title' => 'Face 9 Position', 'components' => 2, diff --git a/src/Collection/ExifMakerNotes/Canon/FaceDetect2.php b/src/Collection/ExifMakerNotes/Canon/FaceDetect2.php index 0df20bad2..8bc23f672 100644 --- a/src/Collection/ExifMakerNotes/Canon/FaceDetect2.php +++ b/src/Collection/ExifMakerNotes/Canon/FaceDetect2.php @@ -21,7 +21,7 @@ class FaceDetect2 extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\FaceDetect2', 'itemsByName' => array ( @@ -51,7 +51,7 @@ class FaceDetect2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaceWidth', 'title' => 'Face Width', 'format' => @@ -65,7 +65,7 @@ class FaceDetect2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FacesDetected', 'title' => 'Faces Detected', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/FaceDetect3.php b/src/Collection/ExifMakerNotes/Canon/FaceDetect3.php index 9c756da2f..8b68f24c7 100644 --- a/src/Collection/ExifMakerNotes/Canon/FaceDetect3.php +++ b/src/Collection/ExifMakerNotes/Canon/FaceDetect3.php @@ -21,7 +21,7 @@ class FaceDetect3 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\FaceDetect3', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class FaceDetect3 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FacesDetected', 'title' => 'Faces Detected', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/FileInfo.php b/src/Collection/ExifMakerNotes/Canon/FileInfo.php index 5b31accef..224b5a301 100644 --- a/src/Collection/ExifMakerNotes/Canon/FileInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/FileInfo.php @@ -22,7 +22,7 @@ class FileInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\FileInfo', 'itemsByName' => array ( @@ -181,7 +181,7 @@ class FileInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FileNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileNumber', 'title' => 'File Number', 'format' => @@ -193,7 +193,7 @@ class FileInfo extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FileNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileNumber', 'title' => 'File Number', 'format' => @@ -205,7 +205,7 @@ class FileInfo extends CollectionBase { 2 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FileNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCount', 'title' => 'Shutter Count', 'format' => @@ -217,7 +217,7 @@ class FileInfo extends CollectionBase { 3 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FileNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCount', 'title' => 'Shutter Count', 'format' => @@ -231,7 +231,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BracketMode', 'title' => 'Bracket Mode', 'format' => @@ -256,7 +256,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BracketValue', 'title' => 'Bracket Value', 'format' => @@ -270,7 +270,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BracketShotNumber', 'title' => 'Bracket Shot Number', 'format' => @@ -284,7 +284,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawJpgQuality', 'title' => 'Raw Jpg Quality', 'format' => @@ -313,7 +313,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawJpgSize', 'title' => 'Raw Jpg Size', 'format' => @@ -352,7 +352,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LongExposureNoiseReduction2', 'title' => 'Long Exposure Noise Reduction 2', 'format' => @@ -376,7 +376,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBBracketMode', 'title' => 'WB Bracket Mode', 'format' => @@ -399,7 +399,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBBracketValueAB', 'title' => 'WB Bracket Value AB', 'format' => @@ -413,7 +413,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBBracketValueGM', 'title' => 'WB Bracket Value GM', 'format' => @@ -427,7 +427,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffect', 'title' => 'Filter Effect', 'format' => @@ -452,7 +452,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffect', 'title' => 'Toning Effect', 'format' => @@ -477,7 +477,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MacroMagnification', 'title' => 'Macro Magnification', 'format' => @@ -491,7 +491,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LiveViewShooting', 'title' => 'Live View Shooting', 'format' => @@ -514,7 +514,7 @@ class FileInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -529,7 +529,7 @@ class FileInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FocusDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -543,7 +543,7 @@ class FileInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashExposureLock', 'title' => 'Flash Exposure Lock', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/FilterInfo.php b/src/Collection/ExifMakerNotes/Canon/FilterInfo.php index a9141252d..a4afbdb31 100644 --- a/src/Collection/ExifMakerNotes/Canon/FilterInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/FilterInfo.php @@ -17,7 +17,7 @@ class FilterInfo extends CollectionBase { 'title' => 'Canon FilterInfo', 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Vendor\\Canon\\FilterInfoIndex', 'DOMNode' => 'filterInfo', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\FilterInfo', 'itemsByName' => array ( @@ -115,7 +115,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GrainyBWFilter', 'title' => 'Grainy B/W Filter', 'text' => @@ -136,7 +136,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SoftFocusFilter', 'title' => 'Soft Focus Filter', 'text' => @@ -157,7 +157,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToyCameraFilter', 'title' => 'Toy Camera Filter', 'text' => @@ -178,7 +178,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MiniatureFilter', 'title' => 'Miniature Filter', 'text' => @@ -199,7 +199,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MiniatureFilterOrientation', 'title' => 'Miniature Filter Orientation', 'text' => @@ -221,7 +221,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MiniatureFilterPosition', 'title' => 'Miniature Filter Position', 'exiftoolDOMNode' => 'Canon:MiniatureFilterPosition', @@ -235,7 +235,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MiniatureFilterParameter', 'title' => 'Miniature Filter Parameter', 'exiftoolDOMNode' => 'Canon:MiniatureFilterParameter', @@ -249,7 +249,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FisheyeFilter', 'title' => 'Fisheye Filter', 'text' => @@ -270,7 +270,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PaintingFilter', 'title' => 'Painting Filter', 'text' => @@ -291,7 +291,7 @@ class FilterInfo extends CollectionBase { array ( 0 => 9, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WatercolorFilter', 'title' => 'Watercolor Filter', 'text' => diff --git a/src/Collection/ExifMakerNotes/Canon/Flags.php b/src/Collection/ExifMakerNotes/Canon/Flags.php index 1784989a5..7c9157dea 100644 --- a/src/Collection/ExifMakerNotes/Canon/Flags.php +++ b/src/Collection/ExifMakerNotes/Canon/Flags.php @@ -15,13 +15,13 @@ class Flags extends CollectionBase { protected static $map = array ( 'name' => 'CanonFlags', 'title' => 'Canon Flags', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd', 'DOMNode' => 'index', 'format' => array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\Flags', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class Flags extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedParamFlag', 'title' => 'Modified Param Flag', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/FocalInfo.php b/src/Collection/ExifMakerNotes/Canon/FocalInfo.php index d26cda426..f6e78303b 100644 --- a/src/Collection/ExifMakerNotes/Canon/FocalInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/FocalInfo.php @@ -15,13 +15,13 @@ class FocalInfo extends CollectionBase { protected static $map = array ( 'name' => 'CanonFocalInfo', 'title' => 'Canon FocalInfo', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd', 'DOMNode' => 'index', 'format' => array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\FocalInfo', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class FocalInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/FocalLength.php b/src/Collection/ExifMakerNotes/Canon/FocalLength.php index c11d36b66..048848f83 100644 --- a/src/Collection/ExifMakerNotes/Canon/FocalLength.php +++ b/src/Collection/ExifMakerNotes/Canon/FocalLength.php @@ -21,7 +21,7 @@ class FocalLength extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\FocalLength', 'itemsByName' => array ( @@ -92,7 +92,7 @@ class FocalLength extends CollectionBase { 2 => 'Zoom', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalType', 'title' => 'Focal Type', 'format' => @@ -107,7 +107,7 @@ class FocalLength extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FLFocalLength', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -122,7 +122,7 @@ class FocalLength extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FocalPlaneSize', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneXSize', 'title' => 'Focal Plane X Size', 'format' => @@ -134,7 +134,7 @@ class FocalLength extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FocalPlaneSize', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneXUnknown', 'title' => 'Focal Plane X Unknown', 'format' => @@ -149,7 +149,7 @@ class FocalLength extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FocalPlaneSize', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneYSize', 'title' => 'Focal Plane Y Size', 'format' => @@ -161,7 +161,7 @@ class FocalLength extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FocalPlaneSize', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneYUnknown', 'title' => 'Focal Plane Y Unknown', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/HDRInfo.php b/src/Collection/ExifMakerNotes/Canon/HDRInfo.php index 35a772db1..4cc5303ef 100644 --- a/src/Collection/ExifMakerNotes/Canon/HDRInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/HDRInfo.php @@ -21,7 +21,7 @@ class HDRInfo extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\HDRInfo', 'itemsByName' => array ( @@ -51,7 +51,7 @@ class HDRInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HDR', 'title' => 'HDR', 'format' => @@ -74,7 +74,7 @@ class HDRInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HDREffect', 'title' => 'HDR Effect', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/LensInfo.php b/src/Collection/ExifMakerNotes/Canon/LensInfo.php index 644fad89c..9e5330f71 100644 --- a/src/Collection/ExifMakerNotes/Canon/LensInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/LensInfo.php @@ -21,7 +21,7 @@ class LensInfo extends CollectionBase { array ( 0 => 7, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\LensInfo', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class LensInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensSerialNumber', 'title' => 'Lens Serial Number', 'components' => 5, diff --git a/src/Collection/ExifMakerNotes/Canon/LightingOpt.php b/src/Collection/ExifMakerNotes/Canon/LightingOpt.php index b815b7128..a859e4543 100644 --- a/src/Collection/ExifMakerNotes/Canon/LightingOpt.php +++ b/src/Collection/ExifMakerNotes/Canon/LightingOpt.php @@ -22,7 +22,7 @@ class LightingOpt extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\LightingOpt', 'itemsByName' => array ( @@ -76,7 +76,7 @@ class LightingOpt extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PeripheralIlluminationCorr', 'title' => 'Peripheral Illumination Corr', 'format' => @@ -98,7 +98,7 @@ class LightingOpt extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizer', 'title' => 'Auto Lighting Optimizer', 'format' => @@ -122,7 +122,7 @@ class LightingOpt extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightTonePriority', 'title' => 'Highlight Tone Priority', 'format' => @@ -144,7 +144,7 @@ class LightingOpt extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LongExposureNoiseReduction', 'title' => 'Long Exposure Noise Reduction', 'format' => @@ -167,7 +167,7 @@ class LightingOpt extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighISONoiseReduction', 'title' => 'High ISO Noise Reduction', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/Main.php b/src/Collection/ExifMakerNotes/Canon/Main.php index 8c6ac3d2c..752afb91c 100644 --- a/src/Collection/ExifMakerNotes/Canon/Main.php +++ b/src/Collection/ExifMakerNotes/Canon/Main.php @@ -15,9 +15,9 @@ class Main extends CollectionBase { protected static $map = array ( 'name' => 'Canon', 'title' => 'Canon Maker Notes', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd', 'DOMNode' => 'makerNote', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\Main', 'itemsByName' => array ( @@ -364,7 +364,7 @@ class Main extends CollectionBase { array ( 0 => 3, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonFlashInfo', 'title' => 'Canon Flash Info', 'exiftoolDOMNode' => 'Canon:CanonFlashInfo', @@ -390,7 +390,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonImageType', 'title' => 'Canon Image Type', 'format' => @@ -404,7 +404,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonFirmwareVersion', 'title' => 'Canon Firmware Version', 'format' => @@ -419,7 +419,7 @@ class Main extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FileNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileNumber', 'title' => 'File Number', 'format' => @@ -433,7 +433,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OwnerName', 'title' => 'Owner Name', 'format' => @@ -449,14 +449,14 @@ class Main extends CollectionBase { array ( 'name' => 'UnknownD30', 'title' => 'UnknownD30', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), ), 12 => array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumber', 'title' => 'Serial Number', 'format' => @@ -467,7 +467,7 @@ class Main extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumber', 'title' => 'Serial Number', 'format' => @@ -478,7 +478,7 @@ class Main extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumber', 'title' => 'Serial Number', 'format' => @@ -500,7 +500,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonFileLength', 'title' => 'Canon File Length', 'format' => @@ -795,69 +795,69 @@ class Main extends CollectionBase { 1074257321 => 'HF G25', 1074257844 => 'XC10', 1074258371 => 'EOS C200', - '2147483649' => 'EOS-1D', - '2147484007' => 'EOS-1DS', - '2147484008' => 'EOS 10D', - '2147484009' => 'EOS-1D Mark III', - '2147484016' => 'EOS Digital Rebel / 300D / Kiss Digital', - '2147484020' => 'EOS-1D Mark II', - '2147484021' => 'EOS 20D', - '2147484022' => 'EOS Digital Rebel XSi / 450D / Kiss X2', - '2147484040' => 'EOS-1Ds Mark II', - '2147484041' => 'EOS Digital Rebel XT / 350D / Kiss Digital N', - '2147484048' => 'EOS 40D', - '2147484179' => 'EOS 5D', - '2147484181' => 'EOS-1Ds Mark III', - '2147484184' => 'EOS 5D Mark II', - '2147484185' => 'WFT-E1', - '2147484210' => 'EOS-1D Mark II N', - '2147484212' => 'EOS 30D', - '2147484214' => 'EOS Digital Rebel XTi / 400D / Kiss Digital X', - '2147484225' => 'WFT-E2', - '2147484230' => 'WFT-E3', - '2147484240' => 'EOS 7D', - '2147484242' => 'EOS Rebel T1i / 500D / Kiss X3', - '2147484244' => 'EOS Rebel XS / 1000D / Kiss F', - '2147484257' => 'EOS 50D', - '2147484265' => 'EOS-1D X', - '2147484272' => 'EOS Rebel T2i / 550D / Kiss X4', - '2147484273' => 'WFT-E4', - '2147484275' => 'WFT-E5', - '2147484289' => 'EOS-1D Mark IV', - '2147484293' => 'EOS 5D Mark III', - '2147484294' => 'EOS Rebel T3i / 600D / Kiss X5', - '2147484295' => 'EOS 60D', - '2147484296' => 'EOS Rebel T3 / 1100D / Kiss X50', - '2147484297' => 'EOS 7D Mark II', - '2147484311' => 'WFT-E2 II', - '2147484312' => 'WFT-E4 II', - '2147484417' => 'EOS Rebel T4i / 650D / Kiss X6i', - '2147484418' => 'EOS 6D', - '2147484452' => 'EOS-1D C', - '2147484453' => 'EOS 70D', - '2147484454' => 'EOS Rebel T5i / 700D / Kiss X7i', - '2147484455' => 'EOS Rebel T5 / 1200D / Kiss X70 / Hi', - '2147484456' => 'EOS-1D X MARK II', - '2147484465' => 'EOS M', - '2147484486' => 'EOS Rebel SL1 / 100D / Kiss X7', - '2147484487' => 'EOS Rebel T6s / 760D / 8000D', - '2147484489' => 'EOS 5D Mark IV', - '2147484496' => 'EOS 80D', - '2147484501' => 'EOS M2', - '2147484546' => 'EOS 5DS', - '2147484563' => 'EOS Rebel T6i / 750D / Kiss X8i', - '2147484673' => 'EOS 5DS R', - '2147484676' => 'EOS Rebel T6 / 1300D / Kiss X80', - '2147484677' => 'EOS Rebel T7i / 800D / Kiss X9i', - '2147484678' => 'EOS 6D Mark II', - '2147484680' => 'EOS 77D / 9000D', - '2147484695' => 'EOS Rebel SL2 / 200D / Kiss X9', - '2147484706' => 'EOS Rebel T100 / 4000D / 3000D', - '2147484708' => 'EOR R', - '2147484722' => 'EOS Rebel T7 / 2000D / 1500D / Kiss X90', + 2147483649 => 'EOS-1D', + 2147484007 => 'EOS-1DS', + 2147484008 => 'EOS 10D', + 2147484009 => 'EOS-1D Mark III', + 2147484016 => 'EOS Digital Rebel / 300D / Kiss Digital', + 2147484020 => 'EOS-1D Mark II', + 2147484021 => 'EOS 20D', + 2147484022 => 'EOS Digital Rebel XSi / 450D / Kiss X2', + 2147484040 => 'EOS-1Ds Mark II', + 2147484041 => 'EOS Digital Rebel XT / 350D / Kiss Digital N', + 2147484048 => 'EOS 40D', + 2147484179 => 'EOS 5D', + 2147484181 => 'EOS-1Ds Mark III', + 2147484184 => 'EOS 5D Mark II', + 2147484185 => 'WFT-E1', + 2147484210 => 'EOS-1D Mark II N', + 2147484212 => 'EOS 30D', + 2147484214 => 'EOS Digital Rebel XTi / 400D / Kiss Digital X', + 2147484225 => 'WFT-E2', + 2147484230 => 'WFT-E3', + 2147484240 => 'EOS 7D', + 2147484242 => 'EOS Rebel T1i / 500D / Kiss X3', + 2147484244 => 'EOS Rebel XS / 1000D / Kiss F', + 2147484257 => 'EOS 50D', + 2147484265 => 'EOS-1D X', + 2147484272 => 'EOS Rebel T2i / 550D / Kiss X4', + 2147484273 => 'WFT-E4', + 2147484275 => 'WFT-E5', + 2147484289 => 'EOS-1D Mark IV', + 2147484293 => 'EOS 5D Mark III', + 2147484294 => 'EOS Rebel T3i / 600D / Kiss X5', + 2147484295 => 'EOS 60D', + 2147484296 => 'EOS Rebel T3 / 1100D / Kiss X50', + 2147484297 => 'EOS 7D Mark II', + 2147484311 => 'WFT-E2 II', + 2147484312 => 'WFT-E4 II', + 2147484417 => 'EOS Rebel T4i / 650D / Kiss X6i', + 2147484418 => 'EOS 6D', + 2147484452 => 'EOS-1D C', + 2147484453 => 'EOS 70D', + 2147484454 => 'EOS Rebel T5i / 700D / Kiss X7i', + 2147484455 => 'EOS Rebel T5 / 1200D / Kiss X70 / Hi', + 2147484456 => 'EOS-1D X MARK II', + 2147484465 => 'EOS M', + 2147484486 => 'EOS Rebel SL1 / 100D / Kiss X7', + 2147484487 => 'EOS Rebel T6s / 760D / 8000D', + 2147484489 => 'EOS 5D Mark IV', + 2147484496 => 'EOS 80D', + 2147484501 => 'EOS M2', + 2147484546 => 'EOS 5DS', + 2147484563 => 'EOS Rebel T6i / 750D / Kiss X8i', + 2147484673 => 'EOS 5DS R', + 2147484676 => 'EOS Rebel T6 / 1300D / Kiss X80', + 2147484677 => 'EOS Rebel T7i / 800D / Kiss X9i', + 2147484678 => 'EOS 6D Mark II', + 2147484680 => 'EOS 77D / 9000D', + 2147484695 => 'EOS Rebel SL2 / 200D / Kiss X9', + 2147484706 => 'EOS Rebel T100 / 4000D / 3000D', + 2147484708 => 'EOR R', + 2147484722 => 'EOS Rebel T7 / 2000D / 1500D / Kiss X90', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonModelID', 'title' => 'Canon Model ID', 'format' => @@ -887,7 +887,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailImageValidArea', 'title' => 'Thumbnail Image Valid Area', 'components' => 4, @@ -902,7 +902,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumberFormat', 'title' => 'Serial Number Format', 'format' => @@ -913,8 +913,8 @@ class Main extends CollectionBase { array ( 'mapping' => array ( - '2415919104' => 'Format 1', - '2684354560' => 'Format 2', + 2415919104 => 'Format 1', + 2684354560 => 'Format 2', ), ), 'exiftoolDOMNode' => 'Canon:SerialNumberFormat', @@ -924,7 +924,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SuperMacro', 'title' => 'Super Macro', 'format' => @@ -947,7 +947,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DateStampMode', 'title' => 'Date Stamp Mode', 'format' => @@ -978,7 +978,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FirmwareRevision', 'title' => 'Firmware Revision', 'format' => @@ -992,7 +992,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Categories', 'title' => 'Categories', 'components' => 2, @@ -1055,7 +1055,7 @@ class Main extends CollectionBase { array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ImageUniqueID', 'outputFormat' => 2, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageUniqueID', 'title' => 'Image Unique ID', 'format' => @@ -1071,7 +1071,7 @@ class Main extends CollectionBase { array ( '__todo' => 'assign collection', 'name' => 'CanonWBInfo', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), ), 47 => @@ -1094,7 +1094,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BatteryType', 'title' => 'Battery Type', 'format' => @@ -1116,7 +1116,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawDataOffset', 'title' => 'Raw Data Offset', 'format' => @@ -1130,7 +1130,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalDecisionDataOffset', 'title' => 'Original Decision Data Offset', 'format' => @@ -1179,7 +1179,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointsInFocus1D', 'title' => 'AF Points In Focus 1D', 'format' => @@ -1193,7 +1193,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensModel', 'title' => 'Lens Model', 'format' => @@ -1207,7 +1207,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InternalSerialNumber', 'title' => 'Internal Serial Number', 'format' => @@ -1221,7 +1221,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DustRemovalData', 'title' => 'Dust Removal Data', 'format' => @@ -1267,7 +1267,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveTable', 'title' => 'Tone Curve Table', 'format' => @@ -1281,7 +1281,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessTable', 'title' => 'Sharpness Table', 'format' => @@ -1295,7 +1295,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessFreqTable', 'title' => 'Sharpness Freq Table', 'format' => @@ -1309,7 +1309,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalanceTable', 'title' => 'White Balance Table', 'format' => @@ -1339,7 +1339,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -1369,7 +1369,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveMatching', 'title' => 'Tone Curve Matching', 'format' => @@ -1383,7 +1383,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalanceMatching', 'title' => 'White Balance Matching', 'format' => @@ -1398,7 +1398,7 @@ class Main extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorSpace', 'title' => 'Color Space', 'format' => @@ -1428,7 +1428,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VRDOffset', 'title' => 'VRD Offset', 'format' => @@ -1458,7 +1458,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CRWParam', 'title' => 'CRW Param', 'format' => @@ -1480,7 +1480,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Flavor', 'title' => 'Flavor', 'format' => @@ -1494,7 +1494,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyleUserDef', 'title' => 'Picture Style User Def', 'components' => 3, @@ -1539,7 +1539,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStylePC', 'title' => 'Picture Style PC', 'components' => 3, @@ -1584,7 +1584,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomPictureStyleFileName', 'title' => 'Custom Picture Style File Name', 'format' => @@ -1609,7 +1609,7 @@ class Main extends CollectionBase { 'name' => 'CanonVignettingCorr', '__todo' => true, '__collection' => 'ExifMakerNotes\\Canon\\VignettingCorrResolver', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), ), 16406 => @@ -1636,7 +1636,7 @@ class Main extends CollectionBase { 'title' => 'Canon LensInfo', 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\LensInfo', '__collection' => 'ExifMakerNotes\\Canon\\LensInfo', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), ), 16416 => @@ -1670,7 +1670,7 @@ class Main extends CollectionBase { 'name' => 'CanonRawBurstModeRoll', '__todo' => true, '__collection' => 'ExifMakerNotes\\Canon\\RawBurstModeRoll', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), ), ), diff --git a/src/Collection/ExifMakerNotes/Canon/MeasuredColor.php b/src/Collection/ExifMakerNotes/Canon/MeasuredColor.php index 58621b90c..a974667bf 100644 --- a/src/Collection/ExifMakerNotes/Canon/MeasuredColor.php +++ b/src/Collection/ExifMakerNotes/Canon/MeasuredColor.php @@ -22,7 +22,7 @@ class MeasuredColor extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\MeasuredColor', 'itemsByName' => array ( @@ -53,7 +53,7 @@ class MeasuredColor extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeasuredRGGB', 'title' => 'Measured RGGB', 'components' => 4, diff --git a/src/Collection/ExifMakerNotes/Canon/ModifiedInfo.php b/src/Collection/ExifMakerNotes/Canon/ModifiedInfo.php index 821711362..4baee1c91 100644 --- a/src/Collection/ExifMakerNotes/Canon/ModifiedInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/ModifiedInfo.php @@ -21,7 +21,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ModifiedInfo', 'itemsByName' => array ( @@ -123,7 +123,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedToneCurve', 'title' => 'Modified Tone Curve', 'format' => @@ -146,7 +146,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedSharpness', 'title' => 'Modified Sharpness', 'format' => @@ -160,7 +160,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedSharpnessFreq', 'title' => 'Modified Sharpness Freq', 'format' => @@ -186,7 +186,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedSensorRedLevel', 'title' => 'Modified Sensor Red Level', 'format' => @@ -200,7 +200,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedSensorBlueLevel', 'title' => 'Modified Sensor Blue Level', 'format' => @@ -214,7 +214,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedWhiteBalanceRed', 'title' => 'Modified White Balance Red', 'format' => @@ -228,7 +228,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedWhiteBalanceBlue', 'title' => 'Modified White Balance Blue', 'format' => @@ -242,7 +242,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedWhiteBalance', 'title' => 'Modified White Balance', 'format' => @@ -284,7 +284,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedColorTemp', 'title' => 'Modified Color Temp', 'format' => @@ -298,7 +298,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedPictureStyle', 'title' => 'Modified Picture Style', 'format' => @@ -342,7 +342,7 @@ class ModifiedInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifiedDigitalGain', 'title' => 'Modified Digital Gain', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/MovieInfo.php b/src/Collection/ExifMakerNotes/Canon/MovieInfo.php index b05c3c439..b2c0859ab 100644 --- a/src/Collection/ExifMakerNotes/Canon/MovieInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/MovieInfo.php @@ -22,7 +22,7 @@ class MovieInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\MovieInfo', 'itemsByName' => array ( @@ -79,7 +79,7 @@ class MovieInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FrameRate', 'title' => 'Frame Rate', 'format' => @@ -93,7 +93,7 @@ class MovieInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FrameCount', 'title' => 'Frame Count', 'format' => @@ -107,7 +107,7 @@ class MovieInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FrameCount', 'title' => 'Frame Count', 'format' => @@ -121,7 +121,7 @@ class MovieInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FrameRate', 'title' => 'Frame Rate', 'format' => @@ -135,7 +135,7 @@ class MovieInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Duration', 'title' => 'Duration', 'format' => @@ -149,7 +149,7 @@ class MovieInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AudioBitrate', 'title' => 'Audio Bitrate', 'format' => @@ -163,7 +163,7 @@ class MovieInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AudioSampleRate', 'title' => 'Audio Sample Rate', 'format' => @@ -177,7 +177,7 @@ class MovieInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AudioChannels', 'title' => 'Audio Channels', 'format' => @@ -191,7 +191,7 @@ class MovieInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VideoCodec', 'title' => 'Video Codec', 'components' => 4, diff --git a/src/Collection/ExifMakerNotes/Canon/MultiExp.php b/src/Collection/ExifMakerNotes/Canon/MultiExp.php index f4f94ee37..df0ebebcd 100644 --- a/src/Collection/ExifMakerNotes/Canon/MultiExp.php +++ b/src/Collection/ExifMakerNotes/Canon/MultiExp.php @@ -21,7 +21,7 @@ class MultiExp extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\MultiExp', 'itemsByName' => array ( @@ -59,7 +59,7 @@ class MultiExp extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MultiExposure', 'title' => 'Multi Exposure', 'format' => @@ -82,7 +82,7 @@ class MultiExp extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MultiExposureControl', 'title' => 'Multi Exposure Control', 'format' => @@ -106,7 +106,7 @@ class MultiExp extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MultiExposureShots', 'title' => 'Multi Exposure Shots', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/MyColors.php b/src/Collection/ExifMakerNotes/Canon/MyColors.php index 956eba88c..99740e84f 100644 --- a/src/Collection/ExifMakerNotes/Canon/MyColors.php +++ b/src/Collection/ExifMakerNotes/Canon/MyColors.php @@ -21,7 +21,7 @@ class MyColors extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\MyColors', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class MyColors extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MyColorMode', 'title' => 'My Color Mode', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/PSInfo.php b/src/Collection/ExifMakerNotes/Canon/PSInfo.php index c0cb8a53f..59e8e2214 100644 --- a/src/Collection/ExifMakerNotes/Canon/PSInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/PSInfo.php @@ -21,7 +21,7 @@ class PSInfo extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\PSInfo', 'itemsByName' => array ( @@ -491,7 +491,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastStandard', 'title' => 'Contrast Standard', 'format' => @@ -512,7 +512,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessStandard', 'title' => 'Sharpness Standard', 'format' => @@ -533,7 +533,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationStandard', 'title' => 'Saturation Standard', 'format' => @@ -554,7 +554,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneStandard', 'title' => 'Color Tone Standard', 'format' => @@ -575,7 +575,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectStandard', 'title' => 'Filter Effect Standard', 'format' => @@ -596,7 +596,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectStandard', 'title' => 'Toning Effect Standard', 'format' => @@ -617,7 +617,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastPortrait', 'title' => 'Contrast Portrait', 'format' => @@ -638,7 +638,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessPortrait', 'title' => 'Sharpness Portrait', 'format' => @@ -659,7 +659,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationPortrait', 'title' => 'Saturation Portrait', 'format' => @@ -680,7 +680,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTonePortrait', 'title' => 'Color Tone Portrait', 'format' => @@ -701,7 +701,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectPortrait', 'title' => 'Filter Effect Portrait', 'format' => @@ -722,7 +722,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectPortrait', 'title' => 'Toning Effect Portrait', 'format' => @@ -743,7 +743,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastLandscape', 'title' => 'Contrast Landscape', 'format' => @@ -764,7 +764,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessLandscape', 'title' => 'Sharpness Landscape', 'format' => @@ -785,7 +785,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationLandscape', 'title' => 'Saturation Landscape', 'format' => @@ -806,7 +806,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneLandscape', 'title' => 'Color Tone Landscape', 'format' => @@ -827,7 +827,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectLandscape', 'title' => 'Filter Effect Landscape', 'format' => @@ -848,7 +848,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectLandscape', 'title' => 'Toning Effect Landscape', 'format' => @@ -869,7 +869,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastNeutral', 'title' => 'Contrast Neutral', 'format' => @@ -890,7 +890,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessNeutral', 'title' => 'Sharpness Neutral', 'format' => @@ -911,7 +911,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationNeutral', 'title' => 'Saturation Neutral', 'format' => @@ -932,7 +932,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneNeutral', 'title' => 'Color Tone Neutral', 'format' => @@ -953,7 +953,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectNeutral', 'title' => 'Filter Effect Neutral', 'format' => @@ -974,7 +974,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectNeutral', 'title' => 'Toning Effect Neutral', 'format' => @@ -995,7 +995,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastFaithful', 'title' => 'Contrast Faithful', 'format' => @@ -1016,7 +1016,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessFaithful', 'title' => 'Sharpness Faithful', 'format' => @@ -1037,7 +1037,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationFaithful', 'title' => 'Saturation Faithful', 'format' => @@ -1058,7 +1058,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneFaithful', 'title' => 'Color Tone Faithful', 'format' => @@ -1079,7 +1079,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectFaithful', 'title' => 'Filter Effect Faithful', 'format' => @@ -1100,7 +1100,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectFaithful', 'title' => 'Toning Effect Faithful', 'format' => @@ -1121,7 +1121,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastMonochrome', 'title' => 'Contrast Monochrome', 'format' => @@ -1142,7 +1142,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessMonochrome', 'title' => 'Sharpness Monochrome', 'format' => @@ -1163,7 +1163,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationMonochrome', 'title' => 'Saturation Monochrome', 'format' => @@ -1184,7 +1184,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneMonochrome', 'title' => 'Color Tone Monochrome', 'format' => @@ -1205,7 +1205,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectMonochrome', 'title' => 'Filter Effect Monochrome', 'format' => @@ -1231,7 +1231,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectMonochrome', 'title' => 'Toning Effect Monochrome', 'format' => @@ -1257,7 +1257,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastUserDef1', 'title' => 'Contrast User Def 1', 'format' => @@ -1278,7 +1278,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessUserDef1', 'title' => 'Sharpness User Def 1', 'format' => @@ -1299,7 +1299,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationUserDef1', 'title' => 'Saturation User Def 1', 'format' => @@ -1320,7 +1320,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneUserDef1', 'title' => 'Color Tone User Def 1', 'format' => @@ -1341,7 +1341,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectUserDef1', 'title' => 'Filter Effect User Def 1', 'format' => @@ -1367,7 +1367,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectUserDef1', 'title' => 'Toning Effect User Def 1', 'format' => @@ -1393,7 +1393,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastUserDef2', 'title' => 'Contrast User Def 2', 'format' => @@ -1414,7 +1414,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessUserDef2', 'title' => 'Sharpness User Def 2', 'format' => @@ -1435,7 +1435,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationUserDef2', 'title' => 'Saturation User Def 2', 'format' => @@ -1456,7 +1456,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneUserDef2', 'title' => 'Color Tone User Def 2', 'format' => @@ -1477,7 +1477,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectUserDef2', 'title' => 'Filter Effect User Def 2', 'format' => @@ -1503,7 +1503,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectUserDef2', 'title' => 'Toning Effect User Def 2', 'format' => @@ -1529,7 +1529,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastUserDef3', 'title' => 'Contrast User Def 3', 'format' => @@ -1550,7 +1550,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessUserDef3', 'title' => 'Sharpness User Def 3', 'format' => @@ -1571,7 +1571,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationUserDef3', 'title' => 'Saturation User Def 3', 'format' => @@ -1592,7 +1592,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneUserDef3', 'title' => 'Color Tone User Def 3', 'format' => @@ -1613,7 +1613,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectUserDef3', 'title' => 'Filter Effect User Def 3', 'format' => @@ -1639,7 +1639,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectUserDef3', 'title' => 'Toning Effect User Def 3', 'format' => @@ -1665,7 +1665,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserDef1PictureStyle', 'title' => 'User Def 1 Picture Style', 'format' => @@ -1695,7 +1695,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserDef2PictureStyle', 'title' => 'User Def 2 Picture Style', 'format' => @@ -1725,7 +1725,7 @@ class PSInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserDef3PictureStyle', 'title' => 'User Def 3 Picture Style', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/PSInfo2.php b/src/Collection/ExifMakerNotes/Canon/PSInfo2.php index c3dc77ad4..57cf13bee 100644 --- a/src/Collection/ExifMakerNotes/Canon/PSInfo2.php +++ b/src/Collection/ExifMakerNotes/Canon/PSInfo2.php @@ -21,7 +21,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\PSInfo2', 'itemsByName' => array ( @@ -539,7 +539,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastStandard', 'title' => 'Contrast Standard', 'format' => @@ -560,7 +560,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessStandard', 'title' => 'Sharpness Standard', 'format' => @@ -581,7 +581,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationStandard', 'title' => 'Saturation Standard', 'format' => @@ -602,7 +602,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneStandard', 'title' => 'Color Tone Standard', 'format' => @@ -623,7 +623,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectStandard', 'title' => 'Filter Effect Standard', 'format' => @@ -644,7 +644,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectStandard', 'title' => 'Toning Effect Standard', 'format' => @@ -665,7 +665,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastPortrait', 'title' => 'Contrast Portrait', 'format' => @@ -686,7 +686,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessPortrait', 'title' => 'Sharpness Portrait', 'format' => @@ -707,7 +707,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationPortrait', 'title' => 'Saturation Portrait', 'format' => @@ -728,7 +728,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTonePortrait', 'title' => 'Color Tone Portrait', 'format' => @@ -749,7 +749,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectPortrait', 'title' => 'Filter Effect Portrait', 'format' => @@ -770,7 +770,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectPortrait', 'title' => 'Toning Effect Portrait', 'format' => @@ -791,7 +791,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastLandscape', 'title' => 'Contrast Landscape', 'format' => @@ -812,7 +812,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessLandscape', 'title' => 'Sharpness Landscape', 'format' => @@ -833,7 +833,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationLandscape', 'title' => 'Saturation Landscape', 'format' => @@ -854,7 +854,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneLandscape', 'title' => 'Color Tone Landscape', 'format' => @@ -875,7 +875,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectLandscape', 'title' => 'Filter Effect Landscape', 'format' => @@ -896,7 +896,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectLandscape', 'title' => 'Toning Effect Landscape', 'format' => @@ -917,7 +917,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastNeutral', 'title' => 'Contrast Neutral', 'format' => @@ -938,7 +938,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessNeutral', 'title' => 'Sharpness Neutral', 'format' => @@ -959,7 +959,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationNeutral', 'title' => 'Saturation Neutral', 'format' => @@ -980,7 +980,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneNeutral', 'title' => 'Color Tone Neutral', 'format' => @@ -1001,7 +1001,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectNeutral', 'title' => 'Filter Effect Neutral', 'format' => @@ -1022,7 +1022,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectNeutral', 'title' => 'Toning Effect Neutral', 'format' => @@ -1043,7 +1043,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastFaithful', 'title' => 'Contrast Faithful', 'format' => @@ -1064,7 +1064,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessFaithful', 'title' => 'Sharpness Faithful', 'format' => @@ -1085,7 +1085,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationFaithful', 'title' => 'Saturation Faithful', 'format' => @@ -1106,7 +1106,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneFaithful', 'title' => 'Color Tone Faithful', 'format' => @@ -1127,7 +1127,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectFaithful', 'title' => 'Filter Effect Faithful', 'format' => @@ -1148,7 +1148,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectFaithful', 'title' => 'Toning Effect Faithful', 'format' => @@ -1169,7 +1169,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastMonochrome', 'title' => 'Contrast Monochrome', 'format' => @@ -1190,7 +1190,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessMonochrome', 'title' => 'Sharpness Monochrome', 'format' => @@ -1211,7 +1211,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationMonochrome', 'title' => 'Saturation Monochrome', 'format' => @@ -1232,7 +1232,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneMonochrome', 'title' => 'Color Tone Monochrome', 'format' => @@ -1253,7 +1253,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectMonochrome', 'title' => 'Filter Effect Monochrome', 'format' => @@ -1279,7 +1279,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectMonochrome', 'title' => 'Toning Effect Monochrome', 'format' => @@ -1305,7 +1305,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastAuto', 'title' => 'Contrast Auto', 'format' => @@ -1326,7 +1326,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessAuto', 'title' => 'Sharpness Auto', 'format' => @@ -1347,7 +1347,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationAuto', 'title' => 'Saturation Auto', 'format' => @@ -1368,7 +1368,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneAuto', 'title' => 'Color Tone Auto', 'format' => @@ -1389,7 +1389,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectAuto', 'title' => 'Filter Effect Auto', 'format' => @@ -1415,7 +1415,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectAuto', 'title' => 'Toning Effect Auto', 'format' => @@ -1441,7 +1441,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastUserDef1', 'title' => 'Contrast User Def 1', 'format' => @@ -1462,7 +1462,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessUserDef1', 'title' => 'Sharpness User Def 1', 'format' => @@ -1483,7 +1483,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationUserDef1', 'title' => 'Saturation User Def 1', 'format' => @@ -1504,7 +1504,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneUserDef1', 'title' => 'Color Tone User Def 1', 'format' => @@ -1525,7 +1525,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectUserDef1', 'title' => 'Filter Effect User Def 1', 'format' => @@ -1551,7 +1551,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectUserDef1', 'title' => 'Toning Effect User Def 1', 'format' => @@ -1577,7 +1577,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastUserDef2', 'title' => 'Contrast User Def 2', 'format' => @@ -1598,7 +1598,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessUserDef2', 'title' => 'Sharpness User Def 2', 'format' => @@ -1619,7 +1619,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationUserDef2', 'title' => 'Saturation User Def 2', 'format' => @@ -1640,7 +1640,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneUserDef2', 'title' => 'Color Tone User Def 2', 'format' => @@ -1661,7 +1661,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectUserDef2', 'title' => 'Filter Effect User Def 2', 'format' => @@ -1687,7 +1687,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectUserDef2', 'title' => 'Toning Effect User Def 2', 'format' => @@ -1713,7 +1713,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastUserDef3', 'title' => 'Contrast User Def 3', 'format' => @@ -1734,7 +1734,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessUserDef3', 'title' => 'Sharpness User Def 3', 'format' => @@ -1755,7 +1755,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationUserDef3', 'title' => 'Saturation User Def 3', 'format' => @@ -1776,7 +1776,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneUserDef3', 'title' => 'Color Tone User Def 3', 'format' => @@ -1797,7 +1797,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FilterEffectUserDef3', 'title' => 'Filter Effect User Def 3', 'format' => @@ -1823,7 +1823,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToningEffectUserDef3', 'title' => 'Toning Effect User Def 3', 'format' => @@ -1849,7 +1849,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserDef1PictureStyle', 'title' => 'User Def 1 Picture Style', 'format' => @@ -1879,7 +1879,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserDef2PictureStyle', 'title' => 'User Def 2 Picture Style', 'format' => @@ -1909,7 +1909,7 @@ class PSInfo2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserDef3PictureStyle', 'title' => 'User Def 3 Picture Style', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/Panorama.php b/src/Collection/ExifMakerNotes/Canon/Panorama.php index d379c557e..790d29d73 100644 --- a/src/Collection/ExifMakerNotes/Canon/Panorama.php +++ b/src/Collection/ExifMakerNotes/Canon/Panorama.php @@ -22,7 +22,7 @@ class Panorama extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\Panorama', 'itemsByName' => array ( @@ -57,7 +57,7 @@ class Panorama extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PanoramaFrameNumber', 'title' => 'Panorama Frame Number', 'format' => @@ -71,7 +71,7 @@ class Panorama extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PanoramaDirection', 'title' => 'Panorama Direction', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/PreviewImageInfo.php b/src/Collection/ExifMakerNotes/Canon/PreviewImageInfo.php index e040ab574..39a5b646d 100644 --- a/src/Collection/ExifMakerNotes/Canon/PreviewImageInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/PreviewImageInfo.php @@ -21,7 +21,7 @@ class PreviewImageInfo extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\PreviewImageInfo', 'itemsByName' => array ( @@ -75,7 +75,7 @@ class PreviewImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewQuality', 'title' => 'Preview Quality', 'format' => @@ -104,7 +104,7 @@ class PreviewImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageLength', 'title' => 'Preview Image Length', 'format' => @@ -118,7 +118,7 @@ class PreviewImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageWidth', 'title' => 'Preview Image Width', 'format' => @@ -132,7 +132,7 @@ class PreviewImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageHeight', 'title' => 'Preview Image Height', 'format' => @@ -146,7 +146,7 @@ class PreviewImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageStart', 'title' => 'Preview Image Start', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/Processing.php b/src/Collection/ExifMakerNotes/Canon/Processing.php index cbc11d37e..2a15b5890 100644 --- a/src/Collection/ExifMakerNotes/Canon/Processing.php +++ b/src/Collection/ExifMakerNotes/Canon/Processing.php @@ -22,7 +22,7 @@ class Processing extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\Processing', 'itemsByName' => array ( @@ -101,7 +101,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurve', 'title' => 'Tone Curve', 'format' => @@ -124,7 +124,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -138,7 +138,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessFrequency', 'title' => 'Sharpness Frequency', 'format' => @@ -164,7 +164,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensorRedLevel', 'title' => 'Sensor Red Level', 'format' => @@ -178,7 +178,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensorBlueLevel', 'title' => 'Sensor Blue Level', 'format' => @@ -192,7 +192,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalanceRed', 'title' => 'White Balance Red', 'format' => @@ -206,7 +206,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalanceBlue', 'title' => 'White Balance Blue', 'format' => @@ -221,7 +221,7 @@ class Processing extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ProcessingWhiteBalance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -263,7 +263,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -277,7 +277,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -321,7 +321,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DigitalGain', 'title' => 'Digital Gain', 'format' => @@ -335,7 +335,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBShiftAB', 'title' => 'WB Shift AB', 'format' => @@ -349,7 +349,7 @@ class Processing extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBShiftGM', 'title' => 'WB Shift GM', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/SensorInfo.php b/src/Collection/ExifMakerNotes/Canon/SensorInfo.php index fcd7e3152..7eb64def0 100644 --- a/src/Collection/ExifMakerNotes/Canon/SensorInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/SensorInfo.php @@ -22,7 +22,7 @@ class SensorInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\SensorInfo', 'itemsByName' => array ( @@ -89,7 +89,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensorWidth', 'title' => 'Sensor Width', 'format' => @@ -103,7 +103,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensorHeight', 'title' => 'Sensor Height', 'format' => @@ -117,7 +117,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensorLeftBorder', 'title' => 'Sensor Left Border', 'format' => @@ -131,7 +131,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensorTopBorder', 'title' => 'Sensor Top Border', 'format' => @@ -145,7 +145,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensorRightBorder', 'title' => 'Sensor Right Border', 'format' => @@ -159,7 +159,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensorBottomBorder', 'title' => 'Sensor Bottom Border', 'format' => @@ -173,7 +173,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlackMaskLeftBorder', 'title' => 'Black Mask Left Border', 'format' => @@ -187,7 +187,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlackMaskTopBorder', 'title' => 'Black Mask Top Border', 'format' => @@ -201,7 +201,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlackMaskRightBorder', 'title' => 'Black Mask Right Border', 'format' => @@ -215,7 +215,7 @@ class SensorInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlackMaskBottomBorder', 'title' => 'Black Mask Bottom Border', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/SerialInfo.php b/src/Collection/ExifMakerNotes/Canon/SerialInfo.php index d60423ca7..1c1182f7b 100644 --- a/src/Collection/ExifMakerNotes/Canon/SerialInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/SerialInfo.php @@ -21,7 +21,7 @@ class SerialInfo extends CollectionBase { array ( 0 => 1, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\SerialInfo', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class SerialInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InternalSerialNumber', 'title' => 'Internal Serial Number', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/ShotInfo.php b/src/Collection/ExifMakerNotes/Canon/ShotInfo.php index 8317e80ec..a24575d3c 100644 --- a/src/Collection/ExifMakerNotes/Canon/ShotInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/ShotInfo.php @@ -22,7 +22,7 @@ class ShotInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\ShotInfo', 'itemsByName' => array ( @@ -261,7 +261,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\AutoIso', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoISO', 'title' => 'Auto ISO', 'format' => @@ -276,7 +276,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\BaseIso', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaseISO', 'title' => 'Base ISO', 'format' => @@ -291,7 +291,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\MeasuredEV', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeasuredEV', 'title' => 'Measured EV', 'format' => @@ -306,7 +306,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ApertureValue', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TargetAperture', 'title' => 'Target Aperture', 'format' => @@ -321,7 +321,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\TargetExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TargetExposureTime', 'title' => 'Target Exposure Time', 'format' => @@ -336,7 +336,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ExposureCompensation', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureCompensation', 'title' => 'Exposure Compensation', 'format' => @@ -350,7 +350,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -392,7 +392,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SlowShutter', 'title' => 'Slow Shutter', 'format' => @@ -417,7 +417,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SequenceNumber', 'title' => 'Shot Number In Continuous Burst', 'format' => @@ -432,7 +432,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ShotInfo\\OpticalZoomCode', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OpticalZoomCode', 'title' => 'Optical Zoom Code', 'format' => @@ -447,7 +447,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraTemperature', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraTemperature', 'title' => 'Camera Temperature', 'format' => @@ -461,7 +461,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashGuideNumber', 'title' => 'Flash Guide Number', 'format' => @@ -476,7 +476,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ShotInfo\\AFPointsInFocus', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointsInFocus', 'title' => 'AF Points In Focus', 'format' => @@ -504,7 +504,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashExposureComp', 'title' => 'Flash Exposure Compensation', 'format' => @@ -518,7 +518,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoExposureBracketing', 'title' => 'Auto Exposure Bracketing', 'format' => @@ -543,7 +543,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBBracketValue', 'title' => 'AEB Bracket Value', 'format' => @@ -557,7 +557,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ControlMode', 'title' => 'Control Mode', 'format' => @@ -581,7 +581,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ShotInfo\\FocusDistanceUpper', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceUpper', 'title' => 'Focus Distance Upper', 'format' => @@ -596,7 +596,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ShotInfo\\FocusDistanceLower', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceLower', 'title' => 'Focus Distance Lower', 'format' => @@ -611,7 +611,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ShotInfo\\FNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -626,7 +626,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -638,7 +638,7 @@ class ShotInfo extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\ExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -653,7 +653,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\MeasuredEV2', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeasuredEV2', 'title' => 'Measured EV 2', 'format' => @@ -668,7 +668,7 @@ class ShotInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\BulbDuration', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BulbDuration', 'title' => 'Bulb Duration', 'format' => @@ -682,7 +682,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraType', 'title' => 'Camera Type', 'format' => @@ -707,7 +707,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoRotate', 'title' => 'Auto Rotate', 'format' => @@ -732,7 +732,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NDFilter', 'title' => 'ND Filter', 'format' => @@ -755,7 +755,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SelfTimer2', 'title' => 'Self Timer 2', 'format' => @@ -769,7 +769,7 @@ class ShotInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashOutput', 'title' => 'Flash Output', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/Skip.php b/src/Collection/ExifMakerNotes/Canon/Skip.php index 2d9fe41f5..0a6bf9718 100644 --- a/src/Collection/ExifMakerNotes/Canon/Skip.php +++ b/src/Collection/ExifMakerNotes/Canon/Skip.php @@ -18,7 +18,7 @@ class Skip extends CollectionBase { 'title' => 'Canon Skip', 'class' => 'FileEye\\MediaProbe\\Block\\Index', 'DOMNode' => 'index', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\Skip', 'itemsByName' => array ( @@ -40,7 +40,7 @@ class Skip extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Unknown_CNDB', 'title' => 'Unknown CNDB', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/TimeInfo.php b/src/Collection/ExifMakerNotes/Canon/TimeInfo.php index 2c5d61b56..86c8c8cdf 100644 --- a/src/Collection/ExifMakerNotes/Canon/TimeInfo.php +++ b/src/Collection/ExifMakerNotes/Canon/TimeInfo.php @@ -22,7 +22,7 @@ class TimeInfo extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\TimeInfo', 'itemsByName' => array ( @@ -61,7 +61,7 @@ class TimeInfo extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\TimeInfo\\TimeZone', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeZone', 'title' => 'Time Zone', 'format' => @@ -75,7 +75,7 @@ class TimeInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeZoneCity', 'title' => 'Time Zone City', 'format' => @@ -130,7 +130,7 @@ class TimeInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DaylightSavings', 'title' => 'Daylight Savings', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/Uuid.php b/src/Collection/ExifMakerNotes/Canon/Uuid.php index 1efecd77a..0a0b518d3 100644 --- a/src/Collection/ExifMakerNotes/Canon/Uuid.php +++ b/src/Collection/ExifMakerNotes/Canon/Uuid.php @@ -18,7 +18,7 @@ class Uuid extends CollectionBase { 'title' => 'Canon Uuid', 'class' => 'FileEye\\MediaProbe\\Block\\Index', 'DOMNode' => 'index', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\Uuid', 'itemsByName' => array ( @@ -48,7 +48,7 @@ class Uuid extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CompressorVersion', 'title' => 'Compressor Version', 'format' => @@ -62,7 +62,7 @@ class Uuid extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailImage', 'title' => 'Thumbnail Image', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/VignettingCorr.php b/src/Collection/ExifMakerNotes/Canon/VignettingCorr.php index 9a201f1aa..52ddbaf35 100644 --- a/src/Collection/ExifMakerNotes/Canon/VignettingCorr.php +++ b/src/Collection/ExifMakerNotes/Canon/VignettingCorr.php @@ -21,7 +21,7 @@ class VignettingCorr extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\VignettingCorr', 'itemsByName' => array ( @@ -85,7 +85,7 @@ class VignettingCorr extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VignettingCorrVersion', 'title' => 'Vignetting Corr Version', 'format' => @@ -99,7 +99,7 @@ class VignettingCorr extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PeripheralLighting', 'title' => 'Peripheral Lighting', 'format' => @@ -121,7 +121,7 @@ class VignettingCorr extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationCorr', 'title' => 'Chromatic Aberration Corr', 'format' => @@ -143,7 +143,7 @@ class VignettingCorr extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationCorr', 'title' => 'Chromatic Aberration Corr', 'format' => @@ -165,7 +165,7 @@ class VignettingCorr extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PeripheralLightingValue', 'title' => 'Peripheral Lighting Value', 'format' => @@ -179,7 +179,7 @@ class VignettingCorr extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalImageWidth', 'title' => 'Original Image Width', 'format' => @@ -193,7 +193,7 @@ class VignettingCorr extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalImageHeight', 'title' => 'Original Image Height', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/VignettingCorr2.php b/src/Collection/ExifMakerNotes/Canon/VignettingCorr2.php index 803068efe..4613a3b02 100644 --- a/src/Collection/ExifMakerNotes/Canon/VignettingCorr2.php +++ b/src/Collection/ExifMakerNotes/Canon/VignettingCorr2.php @@ -22,7 +22,7 @@ class VignettingCorr2 extends CollectionBase { array ( 0 => 4, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\VignettingCorr2', 'itemsByName' => array ( @@ -53,7 +53,7 @@ class VignettingCorr2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PeripheralLightingSetting', 'title' => 'Peripheral Lighting Setting', 'format' => @@ -75,7 +75,7 @@ class VignettingCorr2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationSetting', 'title' => 'Chromatic Aberration Setting', 'format' => diff --git a/src/Collection/ExifMakerNotes/Canon/VignettingCorrUnknown.php b/src/Collection/ExifMakerNotes/Canon/VignettingCorrUnknown.php index 021d43b35..63b665958 100644 --- a/src/Collection/ExifMakerNotes/Canon/VignettingCorrUnknown.php +++ b/src/Collection/ExifMakerNotes/Canon/VignettingCorrUnknown.php @@ -21,7 +21,7 @@ class VignettingCorrUnknown extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\Canon\\VignettingCorrUnknown', 'itemsByName' => array ( @@ -36,7 +36,7 @@ class VignettingCorrUnknown extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VignettingCorrVersion', 'title' => 'Vignetting Corr Version', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/Functions10D.php b/src/Collection/ExifMakerNotes/CanonCustom/Functions10D.php index 7f8527736..48cba8e38 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/Functions10D.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/Functions10D.php @@ -21,7 +21,7 @@ class Functions10D extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\Functions10D', 'itemsByName' => array ( @@ -171,7 +171,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonWhenShooting', 'title' => 'Set Button When Shooting', 'format' => @@ -196,7 +196,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterReleaseNoCFCard', 'title' => 'Shutter Release W/O CF Card', 'format' => @@ -218,7 +218,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -240,7 +240,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shutter-AELock', 'title' => 'Shutter-AE Lock', 'format' => @@ -264,7 +264,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssist', 'title' => 'AF Assist/Flash Firing', 'format' => @@ -288,7 +288,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -310,7 +310,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointRegistration', 'title' => 'AF Point Registration', 'format' => @@ -338,7 +338,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawAndJpgRecording', 'title' => 'Raw And Jpg Recording', 'format' => @@ -364,7 +364,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBSequenceAutoCancel', 'title' => 'AEB Sequence/Auto Cancel', 'format' => @@ -388,7 +388,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SuperimposedDisplay', 'title' => 'Superimposed Display', 'format' => @@ -410,7 +410,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MenuButtonDisplayPosition', 'title' => 'Menu Button Display Position', 'format' => @@ -433,7 +433,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MirrorLockup', 'title' => 'Mirror Lockup', 'format' => @@ -455,7 +455,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AssistButtonFunction', 'title' => 'Assist Button Function', 'format' => @@ -480,7 +480,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FillFlashAutoReduction', 'title' => 'Fill Flash Auto Reduction', 'format' => @@ -502,7 +502,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCurtainSync', 'title' => 'Shutter Curtain Sync', 'format' => @@ -524,7 +524,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SafetyShiftInAvOrTv', 'title' => 'Safety Shift In Av Or Tv', 'format' => @@ -546,7 +546,7 @@ class Functions10D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensAFStopButton', 'title' => 'Lens AF Stop Button', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/Functions1D.php b/src/Collection/ExifMakerNotes/CanonCustom/Functions1D.php index 4ea647795..f04e9c971 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/Functions1D.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/Functions1D.php @@ -21,7 +21,7 @@ class Functions1D extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\Functions1D', 'itemsByName' => array ( @@ -211,7 +211,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusingScreen', 'title' => 'Focusing Screen', 'format' => @@ -233,7 +233,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FinderDisplayDuringExposure', 'title' => 'Finder Display During Exposure', 'format' => @@ -255,7 +255,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterReleaseNoCFCard', 'title' => 'Shutter Release W/O CF Card', 'format' => @@ -277,7 +277,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOSpeedExpansion', 'title' => 'ISO Speed Expansion', 'format' => @@ -299,7 +299,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterAELButton', 'title' => 'Shutter Button/AEL Button', 'format' => @@ -323,7 +323,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ManualTv', 'title' => 'Manual Tv/Av For M', 'format' => @@ -347,7 +347,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -370,7 +370,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'USMLensElectronicMF', 'title' => 'USM Lens Electronic MF', 'format' => @@ -393,7 +393,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LCDPanels', 'title' => 'Top/Back LCD Panels', 'format' => @@ -417,7 +417,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBSequenceAutoCancel', 'title' => 'AEB Sequence/Auto Cancel', 'format' => @@ -441,7 +441,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointIllumination', 'title' => 'AF Point Illumination', 'format' => @@ -465,7 +465,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointSelection', 'title' => 'AF Point Selection', 'format' => @@ -489,7 +489,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MirrorLockup', 'title' => 'Mirror Lockup', 'format' => @@ -511,7 +511,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointSpotMetering', 'title' => 'No. AF Points/Spot Metering', 'format' => @@ -535,7 +535,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FillFlashAutoReduction', 'title' => 'Fill Flash Auto Reduction', 'format' => @@ -557,7 +557,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCurtainSync', 'title' => 'Shutter Curtain Sync', 'format' => @@ -579,7 +579,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SafetyShiftInAvOrTv', 'title' => 'Safety Shift In Av Or Tv', 'format' => @@ -601,7 +601,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointActivationArea', 'title' => 'AF Point Activation Area', 'format' => @@ -624,7 +624,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SwitchToRegisteredAFPoint', 'title' => 'Switch To Registered AF Point', 'format' => @@ -647,7 +647,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensAFStopButton', 'title' => 'Lens AF Stop Button', 'format' => @@ -673,7 +673,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AIServoTrackingSensitivity', 'title' => 'AI Servo Tracking Sensitivity', 'format' => @@ -698,7 +698,7 @@ class Functions1D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AIServoContinuousShooting', 'title' => 'AI Servo Continuous Shooting', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/Functions2.php b/src/Collection/ExifMakerNotes/CanonCustom/Functions2.php index 342da27f4..1a76a2413 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/Functions2.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/Functions2.php @@ -17,7 +17,7 @@ class Functions2 extends CollectionBase { 'title' => 'CanonCustom Functions2 - a set of custom function tags which are (reasonably) consistent across models', 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Vendor\\Canon\\CustomFunctions2', 'DOMNode' => 'index', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\Functions2', 'itemsByName' => array ( @@ -844,7 +844,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ExposureLevelIncrements', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -865,7 +865,7 @@ class Functions2 extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ExposureLevelIncrements', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -887,7 +887,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOSpeedIncrements', 'title' => 'ISO Speed Increments', 'format' => @@ -910,7 +910,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CustomIsoSpeedRange', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOSpeedRange', 'title' => 'ISO Speed Range', 'components' => 3, @@ -931,7 +931,7 @@ class Functions2 extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CustomIsoSpeedRange', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOExpansion', 'title' => 'ISO Expansion', 'format' => @@ -953,7 +953,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBAutoCancel', 'title' => 'AEB Auto Cancel', 'format' => @@ -975,7 +975,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBSequence', 'title' => 'AEB Sequence', 'format' => @@ -999,7 +999,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\AEBShotCount', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBShotCount', 'title' => 'AEB Shot Count', 'format' => @@ -1021,7 +1021,7 @@ class Functions2 extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\AEBShotCount', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBShotCount', 'title' => 'AEB Shot Count', 'components' => 2, @@ -1046,7 +1046,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpotMeterLinkToAFPoint', 'title' => 'Spot Meter Link To AF Point', 'format' => @@ -1068,7 +1068,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SafetyShift', 'title' => 'Safety Shift', 'format' => @@ -1092,7 +1092,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\UsableShootingModes', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UsableShootingModes', 'title' => 'Usable Shooting Modes', 'components' => 2, @@ -1116,7 +1116,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\UsableShootingModes', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UsableMeteringModes', 'title' => 'Usable Metering Modes', 'components' => 2, @@ -1139,7 +1139,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureModeInManual', 'title' => 'Exposure Mode In Manual', 'format' => @@ -1165,7 +1165,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ShutterSpeedRange', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterSpeedRange', 'title' => 'Shutter Speed Range', 'components' => 3, @@ -1186,7 +1186,7 @@ class Functions2 extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ShutterSpeedRange', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterSpeedRange', 'title' => 'Shutter Speed Range', 'components' => 4, @@ -1202,7 +1202,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ApertureRange', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ApertureRange', 'title' => 'Aperture Range', 'components' => 3, @@ -1223,7 +1223,7 @@ class Functions2 extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ApertureRange', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ApertureRange', 'title' => 'Aperture Range', 'components' => 4, @@ -1239,7 +1239,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ApplyShootingMeteringMode', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ApplyShootingMeteringMode', 'title' => 'Apply Shooting Metering Mode', 'components' => 8, @@ -1262,7 +1262,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -1281,7 +1281,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -1301,7 +1301,7 @@ class Functions2 extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -1320,7 +1320,7 @@ class Functions2 extends CollectionBase { ), 3 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -1339,7 +1339,7 @@ class Functions2 extends CollectionBase { ), 4 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -1359,7 +1359,7 @@ class Functions2 extends CollectionBase { ), 5 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -1382,7 +1382,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEMicroadjustment', 'title' => 'AE Microadjustment', 'components' => 3, @@ -1405,7 +1405,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FEMicroadjustment', 'title' => 'FE Microadjustment', 'components' => 3, @@ -1428,7 +1428,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SameExposureForNewAperture', 'title' => 'Same Exposure For New Aperture', 'format' => @@ -1448,7 +1448,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SameExposureForNewAperture', 'title' => 'Same Exposure For New Aperture', 'format' => @@ -1472,7 +1472,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureCompAutoCancel', 'title' => 'Exposure Comp Auto Cancel', 'format' => @@ -1494,7 +1494,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AELockMeterModeAfterFocus', 'title' => 'AE Lock Meter Mode After Focus', 'format' => @@ -1518,7 +1518,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LongExposureNoiseReduction', 'title' => 'Long Exposure Noise Reduction', 'format' => @@ -1542,7 +1542,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\HighISONoiseReduction', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighISONoiseReduction', 'title' => 'High ISO Noise Reduction', 'format' => @@ -1564,7 +1564,7 @@ class Functions2 extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\HighISONoiseReduction', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighISONoiseReduction', 'title' => 'High ISO Noise Reduction', 'format' => @@ -1586,7 +1586,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightTonePriority', 'title' => 'Highlight Tone Priority', 'format' => @@ -1608,7 +1608,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizer', 'title' => 'Auto Lighting Optimizer', 'format' => @@ -1629,7 +1629,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizer', 'title' => 'Auto Lighting Optimizer', 'format' => @@ -1651,7 +1651,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ETTLII', 'title' => 'E-TTL II', 'format' => @@ -1673,7 +1673,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCurtainSync', 'title' => 'Shutter Curtain Sync', 'format' => @@ -1695,7 +1695,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashFiring', 'title' => 'Flash Firing', 'format' => @@ -1717,7 +1717,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ViewInfoDuringExposure', 'title' => 'View Info During Exposure', 'format' => @@ -1739,7 +1739,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LCDIlluminationDuringBulb', 'title' => 'LCD Illumination During Bulb', 'format' => @@ -1761,7 +1761,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InfoButtonWhenShooting', 'title' => 'Info Button When Shooting', 'format' => @@ -1780,7 +1780,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InfoButtonWhenShooting', 'title' => 'Info Button When Shooting', 'format' => @@ -1803,7 +1803,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ViewfinderWarnings', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ViewfinderWarnings', 'title' => 'Viewfinder Warnings', 'format' => @@ -1828,7 +1828,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LVShootingAreaDisplay', 'title' => 'LV Shooting Area Display', 'format' => @@ -1850,7 +1850,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LVShootingAreaDisplay', 'title' => 'LV Shooting Area Display', 'format' => @@ -1872,7 +1872,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'USMLensElectronicMF', 'title' => 'USM Lens Electronic MF', 'format' => @@ -1895,7 +1895,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AIServoTrackingSensitivity', 'title' => 'AI Servo Tracking Sensitivity', 'format' => @@ -1920,7 +1920,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AIServoImagePriority', 'title' => 'AI Servo Image Priority', 'format' => @@ -1944,7 +1944,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AIServoTrackingMethod', 'title' => 'AI Servo Tracking Method', 'format' => @@ -1966,7 +1966,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensDriveNoAF', 'title' => 'Lens Drive No AF', 'format' => @@ -1988,7 +1988,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensAFStopButton', 'title' => 'Lens AF Stop Button', 'format' => @@ -2017,7 +2017,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\AFMicroadjustment', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFMicroadjustment', 'title' => 'AF Microadjustment', 'components' => 5, @@ -2041,7 +2041,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointAreaExpansion', 'title' => 'AF Point Area Expansion', 'format' => @@ -2060,7 +2060,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointAreaExpansion', 'title' => 'AF Point Area Expansion', 'format' => @@ -2080,7 +2080,7 @@ class Functions2 extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointAreaExpansion', 'title' => 'AF Point Area Expansion', 'format' => @@ -2105,7 +2105,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\SelectableAFPoint', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SelectableAFPoint', 'title' => 'Selectable AF Point', 'format' => @@ -2128,7 +2128,7 @@ class Functions2 extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\SelectableAFPoint', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SelectableAFPoint', 'title' => 'Selectable AF Point', 'format' => @@ -2154,7 +2154,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SwitchToRegisteredAFPoint', 'title' => 'Switch To Registered AF Point', 'format' => @@ -2174,7 +2174,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SwitchToRegisteredAFPoint', 'title' => 'Switch To Registered AF Point', 'format' => @@ -2196,7 +2196,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointAutoSelection', 'title' => 'AF Point Auto Selection', 'format' => @@ -2220,7 +2220,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\AFPointDisplayDuringFocus', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointDisplayDuringFocus', 'title' => 'AF Point Display During Focus', 'format' => @@ -2241,7 +2241,7 @@ class Functions2 extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\AFPointDisplayDuringFocus', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointDisplayDuringFocus', 'title' => 'AF Point Display During Focus', 'format' => @@ -2266,7 +2266,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointBrightness', 'title' => 'AF Point Brightness', 'format' => @@ -2288,7 +2288,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssistBeam', 'title' => 'AF Assist Beam', 'format' => @@ -2308,7 +2308,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssistBeam', 'title' => 'AF Assist Beam', 'format' => @@ -2332,7 +2332,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointSelectionMethod', 'title' => 'AF Point Selection Method', 'format' => @@ -2352,7 +2352,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointSelectionMethod', 'title' => 'AF Point Selection Method', 'format' => @@ -2374,7 +2374,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VFDisplayIllumination', 'title' => 'VF Display Illumination', 'format' => @@ -2394,7 +2394,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SuperimposedDisplay', 'title' => 'Superimposed Display', 'format' => @@ -2416,7 +2416,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFDuringLiveView', 'title' => 'AF During Live View', 'format' => @@ -2435,7 +2435,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFDuringLiveView', 'title' => 'AF During Live View', 'format' => @@ -2459,7 +2459,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\SelectAFAreaSelectMode', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SelectAFAreaSelectMode', 'title' => 'Select AF Area Select Mode', 'format' => @@ -2483,7 +2483,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ManualAFPointSelectPattern', 'title' => 'Manual AF Point Select Pattern', 'format' => @@ -2505,7 +2505,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DisplayAllAFPoints', 'title' => 'Display All AF Points', 'format' => @@ -2527,7 +2527,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusDisplayAIServoAndMF', 'title' => 'Focus Display AI Servo And MF', 'format' => @@ -2549,7 +2549,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OrientationLinkedAFPoint', 'title' => 'Orientation Linked AF Point', 'format' => @@ -2571,7 +2571,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MultiControllerWhileMetering', 'title' => 'Multi Controller While Metering', 'format' => @@ -2593,7 +2593,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AccelerationTracking', 'title' => 'Acceleration Tracking', 'format' => @@ -2607,7 +2607,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AIServoFirstImagePriority', 'title' => 'AI Servo First Image Priority', 'format' => @@ -2630,7 +2630,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AIServoSecondImagePriority', 'title' => 'AI Servo Second Image Priority', 'format' => @@ -2653,7 +2653,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAreaSelectMethod', 'title' => 'AF Area Select Method', 'format' => @@ -2675,7 +2675,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoAFPointColorTracking', 'title' => 'Auto AF Point Color Tracking', 'format' => @@ -2697,7 +2697,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VFDisplayIllumination', 'title' => 'VF Display Illumination', 'format' => @@ -2720,7 +2720,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InitialAFPointAIServoAF', 'title' => 'Initial AF Point AI Servo AF', 'format' => @@ -2743,7 +2743,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MirrorLockup', 'title' => 'Mirror Lockup', 'format' => @@ -2767,7 +2767,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ContinuousShootingSpeed', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContinuousShootingSpeed', 'title' => 'Continuous Shooting Speed', 'components' => 3, @@ -2791,7 +2791,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\ContinuousShotLimit', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContinuousShotLimit', 'title' => 'Continuous Shot Limit', 'components' => 2, @@ -2814,7 +2814,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RestrictDriveModes', 'title' => 'Restrict Drive Modes', 'components' => 2, @@ -2837,7 +2837,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shutter-AELock', 'title' => 'Shutter-AE Lock', 'format' => @@ -2858,7 +2858,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAndMeteringButtons', 'title' => 'AF And Metering Buttons', 'format' => @@ -2880,7 +2880,7 @@ class Functions2 extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterButtonAFOnButton', 'title' => 'Shutter Button AF On Button', 'format' => @@ -2905,7 +2905,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFOnAELockButtonSwitch', 'title' => 'AF On AE Lock Button Switch', 'format' => @@ -2927,7 +2927,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'QuickControlDialInMeter', 'title' => 'Quick Control Dial In Meter', 'format' => @@ -2952,7 +2952,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonWhenShooting', 'title' => 'Set Button When Shooting', 'format' => @@ -2976,7 +2976,7 @@ class Functions2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonWhenShooting', 'title' => 'Set Button When Shooting', 'format' => @@ -2999,7 +2999,7 @@ class Functions2 extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonWhenShooting', 'title' => 'Set Button When Shooting', 'format' => @@ -3022,7 +3022,7 @@ class Functions2 extends CollectionBase { ), 3 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonWhenShooting', 'title' => 'Set Button When Shooting', 'format' => @@ -3045,7 +3045,7 @@ class Functions2 extends CollectionBase { ), 4 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonWhenShooting', 'title' => 'Set Button When Shooting', 'format' => @@ -3067,7 +3067,7 @@ class Functions2 extends CollectionBase { ), 5 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonWhenShooting', 'title' => 'Set Button When Shooting', 'format' => @@ -3090,7 +3090,7 @@ class Functions2 extends CollectionBase { ), 6 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonWhenShooting', 'title' => 'Set Button When Shooting', 'format' => @@ -3118,7 +3118,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ManualTv', 'title' => 'Manual Tv/Av For M', 'format' => @@ -3140,7 +3140,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DialDirectionTvAv', 'title' => 'Dial Direction Tv Av', 'format' => @@ -3162,7 +3162,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AvSettingWithoutLens', 'title' => 'Av Setting Without Lens', 'format' => @@ -3184,7 +3184,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBMediaImageSizeSetting', 'title' => 'WB Media Image Size Setting', 'format' => @@ -3207,7 +3207,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LockMicrophoneButton', 'title' => 'Lock Microphone Button', 'format' => @@ -3231,7 +3231,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ButtonFunctionControlOff', 'title' => 'Button Function Control Off', 'format' => @@ -3253,7 +3253,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AssignFuncButton', 'title' => 'Assign Func Button', 'format' => @@ -3278,7 +3278,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomControls', 'title' => 'Custom Controls', 'format' => @@ -3292,7 +3292,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StartMovieShooting', 'title' => 'Start Movie Shooting', 'format' => @@ -3314,7 +3314,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashButtonFunction', 'title' => 'Flash Button Function', 'format' => @@ -3337,7 +3337,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\MultiFunctionLock', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MultiFunctionLock', 'title' => 'Multi Function Lock', 'format' => @@ -3361,7 +3361,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TrashButtonFunction', 'title' => 'Trash Button Function', 'format' => @@ -3383,7 +3383,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterReleaseWithoutLens', 'title' => 'Shutter Release Without Lens', 'format' => @@ -3405,7 +3405,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ControlRingRotation', 'title' => 'Control Ring Rotation', 'format' => @@ -3427,7 +3427,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusRingRotation', 'title' => 'Focus Ring Rotation', 'format' => @@ -3449,7 +3449,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RFLensMFFocusRingSensitivity', 'title' => 'RF Lens MF Focus Ring Sensitivity', 'format' => @@ -3471,7 +3471,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomizeDials', 'title' => 'Customize Dials', 'format' => @@ -3486,7 +3486,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\FocusingScreen', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusingScreen', 'title' => 'Focusing Screen', 'format' => @@ -3507,7 +3507,7 @@ class Functions2 extends CollectionBase { 1 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\FocusingScreen', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusingScreen', 'title' => 'Focusing Screen', 'format' => @@ -3528,7 +3528,7 @@ class Functions2 extends CollectionBase { 2 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\FocusingScreen', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusingScreen', 'title' => 'Focusing Screen', 'format' => @@ -3549,7 +3549,7 @@ class Functions2 extends CollectionBase { 3 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\FocusingScreen', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusingScreen', 'title' => 'Focusing Screen', 'format' => @@ -3569,7 +3569,7 @@ class Functions2 extends CollectionBase { 4 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\FocusingScreen', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusingScreen', 'title' => 'Focusing Screen', 'format' => @@ -3589,7 +3589,7 @@ class Functions2 extends CollectionBase { 5 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\FocusingScreen', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusingScreen', 'title' => 'Focusing Screen', 'format' => @@ -3614,7 +3614,7 @@ class Functions2 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\Functions2\\TimerLength', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimerLength', 'title' => 'Timer Length', 'components' => 4, @@ -3637,7 +3637,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShortReleaseTimeLag', 'title' => 'Short Release Time Lag', 'format' => @@ -3659,7 +3659,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AddAspectRatioInfo', 'title' => 'Add Aspect Ratio Info', 'format' => @@ -3686,7 +3686,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AddOriginalDecisionData', 'title' => 'Add Original Decision Data', 'format' => @@ -3708,7 +3708,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LiveViewExposureSimulation', 'title' => 'Live View Exposure Simulation', 'format' => @@ -3730,7 +3730,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LCDDisplayAtPowerOn', 'title' => 'LCD Display At Power On', 'format' => @@ -3752,7 +3752,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MemoAudioQuality', 'title' => 'Memo Audio Quality', 'format' => @@ -3774,7 +3774,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultEraseOption', 'title' => 'Default Erase Option', 'format' => @@ -3796,7 +3796,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RetractLensOnPowerOff', 'title' => 'Retract Lens On Power Off', 'format' => @@ -3818,7 +3818,7 @@ class Functions2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AddIPTCInformation', 'title' => 'Add IPTC Information', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/Functions20D.php b/src/Collection/ExifMakerNotes/CanonCustom/Functions20D.php index 9850ec5ff..b3a1fa42e 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/Functions20D.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/Functions20D.php @@ -21,7 +21,7 @@ class Functions20D extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\Functions20D', 'itemsByName' => array ( @@ -179,7 +179,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetFunctionWhenShooting', 'title' => 'Set Function When Shooting', 'format' => @@ -204,7 +204,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LongExposureNoiseReduction', 'title' => 'Long Exposure Noise Reduction', 'format' => @@ -226,7 +226,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -248,7 +248,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shutter-AELock', 'title' => 'Shutter-AE Lock', 'format' => @@ -272,7 +272,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssistBeam', 'title' => 'AF Assist Beam', 'format' => @@ -295,7 +295,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -317,7 +317,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashFiring', 'title' => 'Flash Firing', 'format' => @@ -339,7 +339,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOExpansion', 'title' => 'ISO Expansion', 'format' => @@ -361,7 +361,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBSequenceAutoCancel', 'title' => 'AEB Sequence/Auto Cancel', 'format' => @@ -385,7 +385,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SuperimposedDisplay', 'title' => 'Superimposed Display', 'format' => @@ -407,7 +407,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MenuButtonDisplayPosition', 'title' => 'Menu Button Display Position', 'format' => @@ -430,7 +430,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MirrorLockup', 'title' => 'Mirror Lockup', 'format' => @@ -452,7 +452,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointSelectionMethod', 'title' => 'AF Point Selection Method', 'format' => @@ -475,7 +475,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ETTLII', 'title' => 'E-TTL II', 'format' => @@ -497,7 +497,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCurtainSync', 'title' => 'Shutter Curtain Sync', 'format' => @@ -519,7 +519,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SafetyShiftInAvOrTv', 'title' => 'Safety Shift In Av Or Tv', 'format' => @@ -541,7 +541,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensAFStopButton', 'title' => 'Lens AF Stop Button', 'format' => @@ -567,7 +567,7 @@ class Functions20D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AddOriginalDecisionData', 'title' => 'Add Original Decision Data', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/Functions30D.php b/src/Collection/ExifMakerNotes/CanonCustom/Functions30D.php index 0c6d34a5e..1a0624fb4 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/Functions30D.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/Functions30D.php @@ -21,7 +21,7 @@ class Functions30D extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\Functions30D', 'itemsByName' => array ( @@ -187,7 +187,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetFunctionWhenShooting', 'title' => 'Set Function When Shooting', 'format' => @@ -212,7 +212,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LongExposureNoiseReduction', 'title' => 'Long Exposure Noise Reduction', 'format' => @@ -235,7 +235,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -257,7 +257,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shutter-AELock', 'title' => 'Shutter-AE Lock', 'format' => @@ -281,7 +281,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssistBeam', 'title' => 'AF Assist Beam', 'format' => @@ -304,7 +304,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -326,7 +326,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashFiring', 'title' => 'Flash Firing', 'format' => @@ -348,7 +348,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOExpansion', 'title' => 'ISO Expansion', 'format' => @@ -370,7 +370,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBSequenceAutoCancel', 'title' => 'AEB Sequence/Auto Cancel', 'format' => @@ -394,7 +394,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SuperimposedDisplay', 'title' => 'Superimposed Display', 'format' => @@ -416,7 +416,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MenuButtonDisplayPosition', 'title' => 'Menu Button Display Position', 'format' => @@ -439,7 +439,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MirrorLockup', 'title' => 'Mirror Lockup', 'format' => @@ -461,7 +461,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointSelectionMethod', 'title' => 'AF Point Selection Method', 'format' => @@ -484,7 +484,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ETTLII', 'title' => 'E-TTL II', 'format' => @@ -506,7 +506,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCurtainSync', 'title' => 'Shutter Curtain Sync', 'format' => @@ -528,7 +528,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SafetyShiftInAvOrTv', 'title' => 'Safety Shift In Av Or Tv', 'format' => @@ -550,7 +550,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MagnifiedView', 'title' => 'Magnified View', 'format' => @@ -572,7 +572,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensAFStopButton', 'title' => 'Lens AF Stop Button', 'format' => @@ -598,7 +598,7 @@ class Functions30D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AddOriginalDecisionData', 'title' => 'Add Original Decision Data', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/Functions350D.php b/src/Collection/ExifMakerNotes/CanonCustom/Functions350D.php index 3529c17d4..a8478f30e 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/Functions350D.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/Functions350D.php @@ -21,7 +21,7 @@ class Functions350D extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\Functions350D', 'itemsByName' => array ( @@ -107,7 +107,7 @@ class Functions350D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonCrossKeysFunc', 'title' => 'Set Button Cross Keys Func', 'format' => @@ -132,7 +132,7 @@ class Functions350D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LongExposureNoiseReduction', 'title' => 'Long Exposure Noise Reduction', 'format' => @@ -154,7 +154,7 @@ class Functions350D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -176,7 +176,7 @@ class Functions350D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shutter-AELock', 'title' => 'Shutter-AE Lock', 'format' => @@ -200,7 +200,7 @@ class Functions350D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssistBeam', 'title' => 'AF Assist Beam', 'format' => @@ -223,7 +223,7 @@ class Functions350D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -245,7 +245,7 @@ class Functions350D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MirrorLockup', 'title' => 'Mirror Lockup', 'format' => @@ -267,7 +267,7 @@ class Functions350D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ETTLII', 'title' => 'E-TTL II', 'format' => @@ -289,7 +289,7 @@ class Functions350D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCurtainSync', 'title' => 'Shutter Curtain Sync', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/Functions400D.php b/src/Collection/ExifMakerNotes/CanonCustom/Functions400D.php index 3ac824808..da8da5f5b 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/Functions400D.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/Functions400D.php @@ -21,7 +21,7 @@ class Functions400D extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\Functions400D', 'itemsByName' => array ( @@ -123,7 +123,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonCrossKeysFunc', 'title' => 'Set Button Cross Keys Func', 'format' => @@ -148,7 +148,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LongExposureNoiseReduction', 'title' => 'Long Exposure Noise Reduction', 'format' => @@ -171,7 +171,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -193,7 +193,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shutter-AELock', 'title' => 'Shutter-AE Lock', 'format' => @@ -217,7 +217,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssistBeam', 'title' => 'AF Assist Beam', 'format' => @@ -240,7 +240,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -262,7 +262,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MirrorLockup', 'title' => 'Mirror Lockup', 'format' => @@ -284,7 +284,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ETTLII', 'title' => 'E-TTL II', 'format' => @@ -306,7 +306,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCurtainSync', 'title' => 'Shutter Curtain Sync', 'format' => @@ -328,7 +328,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MagnifiedView', 'title' => 'Magnified View', 'format' => @@ -350,7 +350,7 @@ class Functions400D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LCDDisplayAtPowerOn', 'title' => 'LCD Display At Power On', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/Functions5D.php b/src/Collection/ExifMakerNotes/CanonCustom/Functions5D.php index a42c17e29..99a4e8298 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/Functions5D.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/Functions5D.php @@ -21,7 +21,7 @@ class Functions5D extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\Functions5D', 'itemsByName' => array ( @@ -203,7 +203,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocusingScreen', 'title' => 'Focusing Screen', 'format' => @@ -226,7 +226,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetFunctionWhenShooting', 'title' => 'Set Function When Shooting', 'format' => @@ -251,7 +251,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LongExposureNoiseReduction', 'title' => 'Long Exposure Noise Reduction', 'format' => @@ -274,7 +274,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -296,7 +296,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shutter-AELock', 'title' => 'Shutter-AE Lock', 'format' => @@ -320,7 +320,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssistBeam', 'title' => 'AF Assist Beam', 'format' => @@ -342,7 +342,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -364,7 +364,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashFiring', 'title' => 'Flash Firing', 'format' => @@ -386,7 +386,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOExpansion', 'title' => 'ISO Expansion', 'format' => @@ -408,7 +408,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBSequenceAutoCancel', 'title' => 'AEB Sequence/Auto Cancel', 'format' => @@ -432,7 +432,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SuperimposedDisplay', 'title' => 'Superimposed Display', 'format' => @@ -454,7 +454,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MenuButtonDisplayPosition', 'title' => 'Menu Button Display Position', 'format' => @@ -477,7 +477,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MirrorLockup', 'title' => 'Mirror Lockup', 'format' => @@ -499,7 +499,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointSelectionMethod', 'title' => 'AF Point Selection Method', 'format' => @@ -522,7 +522,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ETTLII', 'title' => 'E-TTL II', 'format' => @@ -544,7 +544,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCurtainSync', 'title' => 'Shutter Curtain Sync', 'format' => @@ -566,7 +566,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SafetyShiftInAvOrTv', 'title' => 'Safety Shift In Av Or Tv', 'format' => @@ -588,7 +588,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFPointActivationArea', 'title' => 'AF Point Activation Area', 'format' => @@ -610,7 +610,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LCDDisplayReturnToShoot', 'title' => 'LCD Display Return To Shoot', 'format' => @@ -632,7 +632,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensAFStopButton', 'title' => 'Lens AF Stop Button', 'format' => @@ -658,7 +658,7 @@ class Functions5D extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AddOriginalDecisionData', 'title' => 'Add Original Decision Data', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/FunctionsD30.php b/src/Collection/ExifMakerNotes/CanonCustom/FunctionsD30.php index 0904b56c0..e14ab51bd 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/FunctionsD30.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/FunctionsD30.php @@ -21,7 +21,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\FunctionsD30', 'itemsByName' => array ( @@ -155,7 +155,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LongExposureNoiseReduction', 'title' => 'Long Exposure Noise Reduction', 'format' => @@ -177,7 +177,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shutter-AELock', 'title' => 'Shutter-AE Lock', 'format' => @@ -201,7 +201,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MirrorLockup', 'title' => 'Mirror Lockup', 'format' => @@ -223,7 +223,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureLevelIncrements', 'title' => 'Exposure Level Increments', 'format' => @@ -245,7 +245,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AFAssist', 'title' => 'AF Assist', 'format' => @@ -269,7 +269,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashSyncSpeedAv', 'title' => 'Flash Sync Speed Av', 'format' => @@ -291,7 +291,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AEBSequenceAutoCancel', 'title' => 'AEB Sequence/Auto Cancel', 'format' => @@ -315,7 +315,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterCurtainSync', 'title' => 'Shutter Curtain Sync', 'format' => @@ -337,7 +337,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensAFStopButton', 'title' => 'Lens AF Stop Button', 'format' => @@ -360,7 +360,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FillFlashAutoReduction', 'title' => 'Fill Flash Auto Reduction', 'format' => @@ -382,7 +382,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MenuButtonReturn', 'title' => 'Menu Button Return', 'format' => @@ -405,7 +405,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SetButtonWhenShooting', 'title' => 'Set Button When Shooting', 'format' => @@ -429,7 +429,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensorCleaning', 'title' => 'Sensor Cleaning', 'format' => @@ -451,7 +451,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SuperimposedDisplay', 'title' => 'Superimposed Display', 'format' => @@ -473,7 +473,7 @@ class FunctionsD30 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterReleaseNoCFCard', 'title' => 'Shutter Release W/O CF Card', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/PersonalFuncValues.php b/src/Collection/ExifMakerNotes/CanonCustom/PersonalFuncValues.php index 4fb47bd82..03753f52d 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/PersonalFuncValues.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/PersonalFuncValues.php @@ -21,7 +21,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\PersonalFuncValues', 'itemsByName' => array ( @@ -227,7 +227,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF1Value', 'title' => 'PF1 Value', 'format' => @@ -241,7 +241,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF2Value', 'title' => 'PF2 Value', 'format' => @@ -255,7 +255,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF3Value', 'title' => 'PF3 Value', 'format' => @@ -269,7 +269,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF4ExposureTimeMin', 'title' => 'PF4 Exposure Time Min', 'format' => @@ -283,7 +283,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF4ExposureTimeMax', 'title' => 'PF4 Exposure Time Max', 'format' => @@ -297,7 +297,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF5ApertureMin', 'title' => 'PF5 Aperture Min', 'format' => @@ -311,7 +311,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF5ApertureMax', 'title' => 'PF5 Aperture Max', 'format' => @@ -325,7 +325,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF8BracketShots', 'title' => 'PF8 Bracket Shots', 'format' => @@ -339,7 +339,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF19ShootingSpeedLow', 'title' => 'PF19 Shooting Speed Low', 'format' => @@ -353,7 +353,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF19ShootingSpeedHigh', 'title' => 'PF19 Shooting Speed High', 'format' => @@ -367,7 +367,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF20MaxContinousShots', 'title' => 'PF20 Max Continous Shots', 'format' => @@ -381,7 +381,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF23ShutterButtonTime', 'title' => 'PF23 Shutter Button Time', 'format' => @@ -395,7 +395,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF23FELockTime', 'title' => 'PF23 FE Lock Time', 'format' => @@ -409,7 +409,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF23PostReleaseTime', 'title' => 'PF23 Post Release Time', 'format' => @@ -423,7 +423,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25AEMode', 'title' => 'PF25 AE Mode', 'format' => @@ -437,7 +437,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25MeteringMode', 'title' => 'PF25 Metering Mode', 'format' => @@ -451,7 +451,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25DriveMode', 'title' => 'PF25 Drive Mode', 'format' => @@ -465,7 +465,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25AFMode', 'title' => 'PF25 AF Mode', 'format' => @@ -479,7 +479,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25AFPointSel', 'title' => 'PF25 AF Point Sel', 'format' => @@ -493,7 +493,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25ImageSize', 'title' => 'PF25 Image Size', 'format' => @@ -507,7 +507,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25WBMode', 'title' => 'PF25 WB Mode', 'format' => @@ -521,7 +521,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25Parameters', 'title' => 'PF25 Parameters', 'format' => @@ -535,7 +535,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25ColorMatrix', 'title' => 'PF25 Color Matrix', 'format' => @@ -549,7 +549,7 @@ class PersonalFuncValues extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF27Value', 'title' => 'PF27 Value', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonCustom/PersonalFuncs.php b/src/Collection/ExifMakerNotes/CanonCustom/PersonalFuncs.php index 99ce3f7ac..f0c980da3 100644 --- a/src/Collection/ExifMakerNotes/CanonCustom/PersonalFuncs.php +++ b/src/Collection/ExifMakerNotes/CanonCustom/PersonalFuncs.php @@ -21,7 +21,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonCustom\\PersonalFuncs', 'itemsByName' => array ( @@ -267,7 +267,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF0CustomFuncRegistration', 'title' => 'PF0 Custom Func Registration', 'format' => @@ -281,7 +281,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF1DisableShootingModes', 'title' => 'PF1 Disable Shooting Modes', 'format' => @@ -295,7 +295,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF2DisableMeteringModes', 'title' => 'PF2 Disable Metering Modes', 'format' => @@ -309,7 +309,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF3ManualExposureMetering', 'title' => 'PF3 Manual Exposure Metering', 'format' => @@ -323,7 +323,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF4ExposureTimeLimits', 'title' => 'PF4 Exposure Time Limits', 'format' => @@ -337,7 +337,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF5ApertureLimits', 'title' => 'PF5 Aperture Limits', 'format' => @@ -351,7 +351,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF6PresetShootingModes', 'title' => 'PF6 Preset Shooting Modes', 'format' => @@ -365,7 +365,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF7BracketContinuousShoot', 'title' => 'PF7 Bracket Continuous Shoot', 'format' => @@ -379,7 +379,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF8SetBracketShots', 'title' => 'PF8 Set Bracket Shots', 'format' => @@ -393,7 +393,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF9ChangeBracketSequence', 'title' => 'PF9 Change Bracket Sequence', 'format' => @@ -407,7 +407,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF10RetainProgramShift', 'title' => 'PF10 Retain Program Shift', 'format' => @@ -421,7 +421,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF13DrivePriority', 'title' => 'PF13 Drive Priority', 'format' => @@ -435,7 +435,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF14DisableFocusSearch', 'title' => 'PF14 Disable Focus Search', 'format' => @@ -449,7 +449,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF15DisableAFAssistBeam', 'title' => 'PF15 Disable AF Assist Beam', 'format' => @@ -463,7 +463,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF16AutoFocusPointShoot', 'title' => 'PF16 Auto Focus Point Shoot', 'format' => @@ -477,7 +477,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF17DisableAFPointSel', 'title' => 'PF17 Disable AF Point Sel', 'format' => @@ -491,7 +491,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF18EnableAutoAFPointSel', 'title' => 'PF18 Enable Auto AF Point Sel', 'format' => @@ -505,7 +505,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF19ContinuousShootSpeed', 'title' => 'PF19 Continuous Shoot Speed', 'format' => @@ -519,7 +519,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF20LimitContinousShots', 'title' => 'PF20 Limit Continous Shots', 'format' => @@ -533,7 +533,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF21EnableQuietOperation', 'title' => 'PF21 Enable Quiet Operation', 'format' => @@ -547,7 +547,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF23SetTimerLengths', 'title' => 'PF23 Set Timer Lengths', 'format' => @@ -561,7 +561,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF24LightLCDDuringBulb', 'title' => 'PF24 Light LCD During Bulb', 'format' => @@ -575,7 +575,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF25DefaultClearSettings', 'title' => 'PF25 Default Clear Settings', 'format' => @@ -589,7 +589,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF26ShortenReleaseLag', 'title' => 'PF26 Shorten Release Lag', 'format' => @@ -603,7 +603,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF27ReverseDialRotation', 'title' => 'PF27 Reverse Dial Rotation', 'format' => @@ -617,7 +617,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF28NoQuickDialExpComp', 'title' => 'PF28 No Quick Dial Exp Comp', 'format' => @@ -631,7 +631,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF29QuickDialSwitchOff', 'title' => 'PF29 Quick Dial Switch Off', 'format' => @@ -645,7 +645,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF30EnlargementMode', 'title' => 'PF30 Enlargement Mode', 'format' => @@ -659,7 +659,7 @@ class PersonalFuncs extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PF31OriginalDecisionData', 'title' => 'PF31 Original Decision Data', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/DecoderTable.php b/src/Collection/ExifMakerNotes/CanonRaw/DecoderTable.php index 16f38491d..8436ab011 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/DecoderTable.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/DecoderTable.php @@ -21,7 +21,7 @@ class DecoderTable extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\DecoderTable', 'itemsByName' => array ( @@ -59,7 +59,7 @@ class DecoderTable extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DecoderTableNumber', 'title' => 'Decoder Table Number', 'format' => @@ -73,7 +73,7 @@ class DecoderTable extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CompressedDataOffset', 'title' => 'Compressed Data Offset', 'format' => @@ -87,7 +87,7 @@ class DecoderTable extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CompressedDataLength', 'title' => 'Compressed Data Length', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/ExposureInfo.php b/src/Collection/ExifMakerNotes/CanonRaw/ExposureInfo.php index 579e192c4..2fe64b3c2 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/ExposureInfo.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/ExposureInfo.php @@ -21,7 +21,7 @@ class ExposureInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\ExposureInfo', 'itemsByName' => array ( @@ -59,7 +59,7 @@ class ExposureInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureCompensation', 'title' => 'Exposure Compensation', 'format' => @@ -73,7 +73,7 @@ class ExposureInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterSpeedValue', 'title' => 'Shutter Speed Value', 'format' => @@ -87,7 +87,7 @@ class ExposureInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ApertureValue', 'title' => 'Aperture Value', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/FlashInfo.php b/src/Collection/ExifMakerNotes/CanonRaw/FlashInfo.php index dc3c55246..0b439633a 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/FlashInfo.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/FlashInfo.php @@ -21,7 +21,7 @@ class FlashInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\FlashInfo', 'itemsByName' => array ( @@ -51,7 +51,7 @@ class FlashInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashGuideNumber', 'title' => 'Flash Guide Number', 'format' => @@ -65,7 +65,7 @@ class FlashInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashThreshold', 'title' => 'Flash Threshold', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/ImageFormat.php b/src/Collection/ExifMakerNotes/CanonRaw/ImageFormat.php index ebbb9d9dc..2d1ec1fae 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/ImageFormat.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/ImageFormat.php @@ -21,7 +21,7 @@ class ImageFormat extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\ImageFormat', 'itemsByName' => array ( @@ -51,7 +51,7 @@ class ImageFormat extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileFormat', 'title' => 'File Format', 'format' => @@ -75,7 +75,7 @@ class ImageFormat extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TargetCompressionRatio', 'title' => 'Target Compression Ratio', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/ImageInfo.php b/src/Collection/ExifMakerNotes/CanonRaw/ImageInfo.php index d7e033151..dab621e5a 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/ImageInfo.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/ImageInfo.php @@ -21,7 +21,7 @@ class ImageInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\ImageInfo', 'itemsByName' => array ( @@ -91,7 +91,7 @@ class ImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageWidth', 'title' => 'Image Width', 'format' => @@ -105,7 +105,7 @@ class ImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHeight', 'title' => 'Image Height', 'format' => @@ -119,7 +119,7 @@ class ImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PixelAspectRatio', 'title' => 'Pixel Aspect Ratio', 'format' => @@ -133,7 +133,7 @@ class ImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Rotation', 'title' => 'Rotation', 'format' => @@ -147,7 +147,7 @@ class ImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ComponentBitDepth', 'title' => 'Component Bit Depth', 'format' => @@ -161,7 +161,7 @@ class ImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorBitDepth', 'title' => 'Color Bit Depth', 'format' => @@ -175,7 +175,7 @@ class ImageInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorBW', 'title' => 'Color BW', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/Main.php b/src/Collection/ExifMakerNotes/CanonRaw/Main.php index 555f006af..15bfd5f89 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/Main.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/Main.php @@ -21,7 +21,7 @@ class Main extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\Main', 'itemsByName' => array ( @@ -299,7 +299,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NullRecord', 'title' => 'Null Record', 'format' => @@ -313,7 +313,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FreeBytes', 'title' => 'Free Bytes', 'format' => @@ -327,7 +327,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonColorInfo1', 'title' => 'Canon Color Info 1', 'format' => @@ -341,7 +341,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonFileDescription', 'title' => 'Canon File Description', 'components' => 32, @@ -353,7 +353,7 @@ class Main extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserComment', 'title' => 'User Comment', 'components' => 256, @@ -368,7 +368,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonFirmwareVersion', 'title' => 'Canon Firmware Version', 'components' => 32, @@ -383,7 +383,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ComponentVersion', 'title' => 'Component Version', 'format' => @@ -397,7 +397,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ROMOperationMode', 'title' => 'ROM Operation Mode', 'components' => 8, @@ -412,7 +412,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OwnerName', 'title' => 'Owner Name', 'components' => 32, @@ -427,7 +427,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonImageType', 'title' => 'Canon Image Type', 'components' => 32, @@ -442,7 +442,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalFileName', 'title' => 'Original File Name', 'components' => 32, @@ -457,7 +457,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailFileName', 'title' => 'Thumbnail File Name', 'components' => 32, @@ -472,7 +472,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TargetImageType', 'title' => 'Target Image Type', 'format' => @@ -494,7 +494,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterReleaseMethod', 'title' => 'Shutter Release Method', 'format' => @@ -516,7 +516,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterReleaseTiming', 'title' => 'Shutter Release Timing', 'format' => @@ -538,7 +538,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReleaseSetting', 'title' => 'Release Setting', 'format' => @@ -552,7 +552,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaseISO', 'title' => 'Base ISO', 'format' => @@ -566,7 +566,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonFlashInfo', 'title' => 'Canon Flash Info', 'components' => 4, @@ -581,7 +581,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonColorInfo2', 'title' => 'Canon Color Info 2', 'format' => @@ -595,7 +595,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTemperature', 'title' => 'Color Temperature', 'format' => @@ -609,7 +609,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorSpace', 'title' => 'Color Space', 'format' => @@ -632,7 +632,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RecordID', 'title' => 'Record ID', 'format' => @@ -646,7 +646,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SelfTimerTime', 'title' => 'Self Timer Time', 'format' => @@ -660,7 +660,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TargetDistanceSetting', 'title' => 'Target Distance Setting', 'format' => @@ -674,7 +674,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumber', 'title' => 'Serial Number', 'format' => @@ -685,7 +685,7 @@ class Main extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumber', 'title' => 'Serial Number', 'format' => @@ -696,7 +696,7 @@ class Main extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownNumber', 'title' => 'Unknown Number', 'format' => @@ -710,7 +710,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeasuredEV', 'title' => 'Measured EV', 'format' => @@ -725,7 +725,7 @@ class Main extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\FileNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileNumber', 'title' => 'File Number', 'format' => @@ -1011,69 +1011,69 @@ class Main extends CollectionBase { 1074257321 => 'HF G25', 1074257844 => 'XC10', 1074258371 => 'EOS C200', - '2147483649' => 'EOS-1D', - '2147484007' => 'EOS-1DS', - '2147484008' => 'EOS 10D', - '2147484009' => 'EOS-1D Mark III', - '2147484016' => 'EOS Digital Rebel / 300D / Kiss Digital', - '2147484020' => 'EOS-1D Mark II', - '2147484021' => 'EOS 20D', - '2147484022' => 'EOS Digital Rebel XSi / 450D / Kiss X2', - '2147484040' => 'EOS-1Ds Mark II', - '2147484041' => 'EOS Digital Rebel XT / 350D / Kiss Digital N', - '2147484048' => 'EOS 40D', - '2147484179' => 'EOS 5D', - '2147484181' => 'EOS-1Ds Mark III', - '2147484184' => 'EOS 5D Mark II', - '2147484185' => 'WFT-E1', - '2147484210' => 'EOS-1D Mark II N', - '2147484212' => 'EOS 30D', - '2147484214' => 'EOS Digital Rebel XTi / 400D / Kiss Digital X', - '2147484225' => 'WFT-E2', - '2147484230' => 'WFT-E3', - '2147484240' => 'EOS 7D', - '2147484242' => 'EOS Rebel T1i / 500D / Kiss X3', - '2147484244' => 'EOS Rebel XS / 1000D / Kiss F', - '2147484257' => 'EOS 50D', - '2147484265' => 'EOS-1D X', - '2147484272' => 'EOS Rebel T2i / 550D / Kiss X4', - '2147484273' => 'WFT-E4', - '2147484275' => 'WFT-E5', - '2147484289' => 'EOS-1D Mark IV', - '2147484293' => 'EOS 5D Mark III', - '2147484294' => 'EOS Rebel T3i / 600D / Kiss X5', - '2147484295' => 'EOS 60D', - '2147484296' => 'EOS Rebel T3 / 1100D / Kiss X50', - '2147484297' => 'EOS 7D Mark II', - '2147484311' => 'WFT-E2 II', - '2147484312' => 'WFT-E4 II', - '2147484417' => 'EOS Rebel T4i / 650D / Kiss X6i', - '2147484418' => 'EOS 6D', - '2147484452' => 'EOS-1D C', - '2147484453' => 'EOS 70D', - '2147484454' => 'EOS Rebel T5i / 700D / Kiss X7i', - '2147484455' => 'EOS Rebel T5 / 1200D / Kiss X70 / Hi', - '2147484456' => 'EOS-1D X MARK II', - '2147484465' => 'EOS M', - '2147484486' => 'EOS Rebel SL1 / 100D / Kiss X7', - '2147484487' => 'EOS Rebel T6s / 760D / 8000D', - '2147484489' => 'EOS 5D Mark IV', - '2147484496' => 'EOS 80D', - '2147484501' => 'EOS M2', - '2147484546' => 'EOS 5DS', - '2147484563' => 'EOS Rebel T6i / 750D / Kiss X8i', - '2147484673' => 'EOS 5DS R', - '2147484676' => 'EOS Rebel T6 / 1300D / Kiss X80', - '2147484677' => 'EOS Rebel T7i / 800D / Kiss X9i', - '2147484678' => 'EOS 6D Mark II', - '2147484680' => 'EOS 77D / 9000D', - '2147484695' => 'EOS Rebel SL2 / 200D / Kiss X9', - '2147484706' => 'EOS Rebel T100 / 4000D / 3000D', - '2147484708' => 'EOR R', - '2147484722' => 'EOS Rebel T7 / 2000D / 1500D / Kiss X90', + 2147483649 => 'EOS-1D', + 2147484007 => 'EOS-1DS', + 2147484008 => 'EOS 10D', + 2147484009 => 'EOS-1D Mark III', + 2147484016 => 'EOS Digital Rebel / 300D / Kiss Digital', + 2147484020 => 'EOS-1D Mark II', + 2147484021 => 'EOS 20D', + 2147484022 => 'EOS Digital Rebel XSi / 450D / Kiss X2', + 2147484040 => 'EOS-1Ds Mark II', + 2147484041 => 'EOS Digital Rebel XT / 350D / Kiss Digital N', + 2147484048 => 'EOS 40D', + 2147484179 => 'EOS 5D', + 2147484181 => 'EOS-1Ds Mark III', + 2147484184 => 'EOS 5D Mark II', + 2147484185 => 'WFT-E1', + 2147484210 => 'EOS-1D Mark II N', + 2147484212 => 'EOS 30D', + 2147484214 => 'EOS Digital Rebel XTi / 400D / Kiss Digital X', + 2147484225 => 'WFT-E2', + 2147484230 => 'WFT-E3', + 2147484240 => 'EOS 7D', + 2147484242 => 'EOS Rebel T1i / 500D / Kiss X3', + 2147484244 => 'EOS Rebel XS / 1000D / Kiss F', + 2147484257 => 'EOS 50D', + 2147484265 => 'EOS-1D X', + 2147484272 => 'EOS Rebel T2i / 550D / Kiss X4', + 2147484273 => 'WFT-E4', + 2147484275 => 'WFT-E5', + 2147484289 => 'EOS-1D Mark IV', + 2147484293 => 'EOS 5D Mark III', + 2147484294 => 'EOS Rebel T3i / 600D / Kiss X5', + 2147484295 => 'EOS 60D', + 2147484296 => 'EOS Rebel T3 / 1100D / Kiss X50', + 2147484297 => 'EOS 7D Mark II', + 2147484311 => 'WFT-E2 II', + 2147484312 => 'WFT-E4 II', + 2147484417 => 'EOS Rebel T4i / 650D / Kiss X6i', + 2147484418 => 'EOS 6D', + 2147484452 => 'EOS-1D C', + 2147484453 => 'EOS 70D', + 2147484454 => 'EOS Rebel T5i / 700D / Kiss X7i', + 2147484455 => 'EOS Rebel T5 / 1200D / Kiss X70 / Hi', + 2147484456 => 'EOS-1D X MARK II', + 2147484465 => 'EOS M', + 2147484486 => 'EOS Rebel SL1 / 100D / Kiss X7', + 2147484487 => 'EOS Rebel T6s / 760D / 8000D', + 2147484489 => 'EOS 5D Mark IV', + 2147484496 => 'EOS 80D', + 2147484501 => 'EOS M2', + 2147484546 => 'EOS 5DS', + 2147484563 => 'EOS Rebel T6i / 750D / Kiss X8i', + 2147484673 => 'EOS 5DS R', + 2147484676 => 'EOS Rebel T6 / 1300D / Kiss X80', + 2147484677 => 'EOS Rebel T7i / 800D / Kiss X9i', + 2147484678 => 'EOS 6D Mark II', + 2147484680 => 'EOS 77D / 9000D', + 2147484695 => 'EOS Rebel SL2 / 200D / Kiss X9', + 2147484706 => 'EOS Rebel T100 / 4000D / 3000D', + 2147484708 => 'EOR R', + 2147484722 => 'EOS Rebel T7 / 2000D / 1500D / Kiss X90', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CanonModelID', 'title' => 'Canon Model ID', 'format' => @@ -1087,7 +1087,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumberFormat', 'title' => 'Serial Number Format', 'format' => @@ -1098,8 +1098,8 @@ class Main extends CollectionBase { array ( 'mapping' => array ( - '2415919104' => 'Format 1', - '2684354560' => 'Format 2', + 2415919104 => 'Format 1', + 2684354560 => 'Format 2', ), ), 'exiftoolDOMNode' => 'CanonRaw:SerialNumberFormat', @@ -1109,7 +1109,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawData', 'title' => 'Raw Data', 'format' => @@ -1123,7 +1123,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JpgFromRaw', 'title' => 'Jpg From Raw', 'format' => @@ -1137,7 +1137,7 @@ class Main extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailImage', 'title' => 'Thumbnail Image', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/MakeModel.php b/src/Collection/ExifMakerNotes/CanonRaw/MakeModel.php index 1751b8670..cdf767e35 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/MakeModel.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/MakeModel.php @@ -21,7 +21,7 @@ class MakeModel extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\MakeModel', 'itemsByName' => array ( @@ -51,7 +51,7 @@ class MakeModel extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Make', 'title' => 'Make', 'components' => 6, @@ -66,7 +66,7 @@ class MakeModel extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Model', 'title' => 'Camera Model Name', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/RawJpgInfo.php b/src/Collection/ExifMakerNotes/CanonRaw/RawJpgInfo.php index 7d61ed61c..47c14f80f 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/RawJpgInfo.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/RawJpgInfo.php @@ -21,7 +21,7 @@ class RawJpgInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\RawJpgInfo', 'itemsByName' => array ( @@ -67,7 +67,7 @@ class RawJpgInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawJpgQuality', 'title' => 'Raw Jpg Quality', 'format' => @@ -91,7 +91,7 @@ class RawJpgInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawJpgSize', 'title' => 'Raw Jpg Size', 'format' => @@ -114,7 +114,7 @@ class RawJpgInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawJpgWidth', 'title' => 'Raw Jpg Width', 'format' => @@ -128,7 +128,7 @@ class RawJpgInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawJpgHeight', 'title' => 'Raw Jpg Height', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/TimeStamp.php b/src/Collection/ExifMakerNotes/CanonRaw/TimeStamp.php index c541f0e17..eefb66dfc 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/TimeStamp.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/TimeStamp.php @@ -21,7 +21,7 @@ class TimeStamp extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\TimeStamp', 'itemsByName' => array ( @@ -59,7 +59,7 @@ class TimeStamp extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DateTimeOriginal', 'title' => 'Date/Time Original', 'format' => @@ -73,7 +73,7 @@ class TimeStamp extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeZoneCode', 'title' => 'Time Zone Code', 'format' => @@ -87,7 +87,7 @@ class TimeStamp extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeZoneInfo', 'title' => 'Time Zone Info', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonRaw/WhiteSample.php b/src/Collection/ExifMakerNotes/CanonRaw/WhiteSample.php index 0fd07a3c6..42cfc0938 100644 --- a/src/Collection/ExifMakerNotes/CanonRaw/WhiteSample.php +++ b/src/Collection/ExifMakerNotes/CanonRaw/WhiteSample.php @@ -21,7 +21,7 @@ class WhiteSample extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonRaw\\WhiteSample', 'itemsByName' => array ( @@ -75,7 +75,7 @@ class WhiteSample extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteSampleWidth', 'title' => 'White Sample Width', 'format' => @@ -89,7 +89,7 @@ class WhiteSample extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteSampleHeight', 'title' => 'White Sample Height', 'format' => @@ -103,7 +103,7 @@ class WhiteSample extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteSampleLeftBorder', 'title' => 'White Sample Left Border', 'format' => @@ -117,7 +117,7 @@ class WhiteSample extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteSampleTopBorder', 'title' => 'White Sample Top Border', 'format' => @@ -131,7 +131,7 @@ class WhiteSample extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteSampleBits', 'title' => 'White Sample Bits', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/CropInfo.php b/src/Collection/ExifMakerNotes/CanonVRD/CropInfo.php index 34242e165..2a3440d75 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/CropInfo.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/CropInfo.php @@ -21,7 +21,7 @@ class CropInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\CropInfo', 'itemsByName' => array ( @@ -115,7 +115,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropActive', 'title' => 'Crop Active', 'format' => @@ -137,7 +137,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropRotatedOriginalWidth', 'title' => 'Crop Rotated Original Width', 'format' => @@ -151,7 +151,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropRotatedOriginalHeight', 'title' => 'Crop Rotated Original Height', 'format' => @@ -165,7 +165,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropX', 'title' => 'Crop X', 'format' => @@ -179,7 +179,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropY', 'title' => 'Crop Y', 'format' => @@ -193,7 +193,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropWidth', 'title' => 'Crop Width', 'format' => @@ -207,7 +207,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropHeight', 'title' => 'Crop Height', 'format' => @@ -221,7 +221,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropRotation', 'title' => 'Crop Rotation', 'format' => @@ -235,7 +235,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropOriginalWidth', 'title' => 'Crop Original Width', 'format' => @@ -249,7 +249,7 @@ class CropInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropOriginalHeight', 'title' => 'Crop Original Height', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/DLOInfo.php b/src/Collection/ExifMakerNotes/CanonVRD/DLOInfo.php index 03f635d64..63bc3f316 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/DLOInfo.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/DLOInfo.php @@ -21,7 +21,7 @@ class DLOInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\DLOInfo', 'itemsByName' => array ( @@ -59,7 +59,7 @@ class DLOInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DLOSettingApplied', 'title' => 'DLO Setting Applied', 'format' => @@ -73,7 +73,7 @@ class DLOInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DLOVersion', 'title' => 'DLO Version', 'components' => 10, @@ -88,7 +88,7 @@ class DLOInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DLOData', 'title' => 'DLO Data', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/DR4.php b/src/Collection/ExifMakerNotes/CanonVRD/DR4.php index 7cb063fb9..8917b0311 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/DR4.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/DR4.php @@ -21,7 +21,7 @@ class DR4 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\DR4', 'itemsByName' => array ( @@ -539,7 +539,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessAdjOn', 'title' => 'Sharpness Adj On', 'format' => @@ -561,7 +561,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveOriginal', 'title' => 'Tone Curve Original', 'format' => @@ -583,7 +583,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizerOn', 'title' => 'Auto Lighting Optimizer On', 'format' => @@ -605,7 +605,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMoireReductionOn', 'title' => 'Color Moire Reduction On', 'format' => @@ -627,7 +627,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PeripheralIlluminationOn', 'title' => 'Peripheral Illumination On', 'format' => @@ -649,7 +649,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationOn', 'title' => 'Chromatic Aberration On', 'format' => @@ -671,7 +671,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DistortionCorrectionOn', 'title' => 'Distortion Correction On', 'format' => @@ -693,7 +693,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DLOOn', 'title' => 'DLO On', 'format' => @@ -715,7 +715,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Rotation', 'title' => 'Rotation', 'format' => @@ -729,7 +729,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AngleAdj', 'title' => 'Angle Adj', 'format' => @@ -743,7 +743,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomPictureStyle', 'title' => 'Custom Picture Style', 'format' => @@ -757,7 +757,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CheckMark', 'title' => 'Check Mark', 'format' => @@ -783,7 +783,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WorkColorSpace', 'title' => 'Work Color Space', 'format' => @@ -808,7 +808,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawBrightnessAdj', 'title' => 'Raw Brightness Adj', 'format' => @@ -822,7 +822,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalanceAdj', 'title' => 'White Balance Adj', 'format' => @@ -852,7 +852,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBAdjColorTemp', 'title' => 'WB Adj Color Temp', 'format' => @@ -866,7 +866,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBAdjMagentaGreen', 'title' => 'WB Adj Magenta Green', 'format' => @@ -880,7 +880,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBAdjBlueAmber', 'title' => 'WB Adj Blue Amber', 'format' => @@ -894,7 +894,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBAdjRGGBLevels', 'title' => 'WB Adj RGGB Levels', 'format' => @@ -908,7 +908,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaLinear', 'title' => 'Gamma Linear', 'format' => @@ -930,7 +930,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -960,7 +960,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastAdj', 'title' => 'Contrast Adj', 'format' => @@ -974,7 +974,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneAdj', 'title' => 'Color Tone Adj', 'format' => @@ -988,7 +988,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorSaturationAdj', 'title' => 'Color Saturation Adj', 'format' => @@ -1002,7 +1002,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeToningEffect', 'title' => 'Monochrome Toning Effect', 'format' => @@ -1027,7 +1027,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeFilterEffect', 'title' => 'Monochrome Filter Effect', 'format' => @@ -1052,7 +1052,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnsharpMaskStrength', 'title' => 'Unsharp Mask Strength', 'format' => @@ -1066,7 +1066,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnsharpMaskFineness', 'title' => 'Unsharp Mask Fineness', 'format' => @@ -1080,7 +1080,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnsharpMaskThreshold', 'title' => 'Unsharp Mask Threshold', 'format' => @@ -1094,7 +1094,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShadowAdj', 'title' => 'Shadow Adj', 'format' => @@ -1108,7 +1108,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HighlightAdj', 'title' => 'Highlight Adj', 'format' => @@ -1122,7 +1122,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessAdj', 'title' => 'Sharpness Adj', 'format' => @@ -1144,7 +1144,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessStrength', 'title' => 'Sharpness Strength', 'format' => @@ -1158,7 +1158,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveBrightness', 'title' => 'Tone Curve Brightness', 'format' => @@ -1172,7 +1172,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveContrast', 'title' => 'Tone Curve Contrast', 'format' => @@ -1186,7 +1186,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizer', 'title' => 'Auto Lighting Optimizer', 'format' => @@ -1209,7 +1209,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LuminanceNoiseReduction', 'title' => 'Luminance Noise Reduction', 'format' => @@ -1223,7 +1223,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChrominanceNoiseReduction', 'title' => 'Chrominance Noise Reduction', 'format' => @@ -1237,7 +1237,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMoireReduction', 'title' => 'Color Moire Reduction', 'format' => @@ -1251,7 +1251,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShootingDistance', 'title' => 'Shooting Distance', 'format' => @@ -1265,7 +1265,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PeripheralIllumination', 'title' => 'Peripheral Illumination', 'format' => @@ -1279,7 +1279,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberration', 'title' => 'Chromatic Aberration', 'format' => @@ -1293,7 +1293,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorBlurOn', 'title' => 'Color Blur On', 'format' => @@ -1315,7 +1315,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DistortionCorrection', 'title' => 'Distortion Correction', 'format' => @@ -1329,7 +1329,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DLOSetting', 'title' => 'DLO Setting', 'format' => @@ -1343,7 +1343,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationRed', 'title' => 'Chromatic Aberration Red', 'format' => @@ -1357,7 +1357,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationBlue', 'title' => 'Chromatic Aberration Blue', 'format' => @@ -1371,7 +1371,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DistortionEffect', 'title' => 'Distortion Effect', 'format' => @@ -1396,7 +1396,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DiffractionCorrectionOn', 'title' => 'Diffraction Correction On', 'format' => @@ -1418,7 +1418,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorHue', 'title' => 'Color Hue', 'format' => @@ -1432,7 +1432,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationAdj', 'title' => 'Saturation Adj', 'format' => @@ -1446,7 +1446,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RedHSL', 'title' => 'Red HSL', 'format' => @@ -1460,7 +1460,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OrangeHSL', 'title' => 'Orange HSL', 'format' => @@ -1474,7 +1474,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YellowHSL', 'title' => 'Yellow HSL', 'format' => @@ -1488,7 +1488,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GreenHSL', 'title' => 'Green HSL', 'format' => @@ -1502,7 +1502,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AquaHSL', 'title' => 'Aqua HSL', 'format' => @@ -1516,7 +1516,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlueHSL', 'title' => 'Blue HSL', 'format' => @@ -1530,7 +1530,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PurpleHSL', 'title' => 'Purple HSL', 'format' => @@ -1544,7 +1544,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MagentaHSL', 'title' => 'Magenta HSL', 'format' => @@ -1558,7 +1558,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropAspectRatio', 'title' => 'Crop Aspect Ratio', 'format' => @@ -1589,7 +1589,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropAspectRatioCustom', 'title' => 'Crop Aspect Ratio Custom', 'format' => @@ -1603,7 +1603,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomPictureStyleData', 'title' => 'Custom Picture Style Data', 'format' => @@ -1617,7 +1617,7 @@ class DR4 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensFocalLength', 'title' => 'Lens Focal Length', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/DR4Header.php b/src/Collection/ExifMakerNotes/CanonVRD/DR4Header.php index be4a1b6a0..274dfc621 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/DR4Header.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/DR4Header.php @@ -21,7 +21,7 @@ class DR4Header extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\DR4Header', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class DR4Header extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DR4CameraModel', 'title' => 'DR4 Camera Model', 'format' => @@ -321,66 +321,66 @@ class DR4Header extends CollectionBase { 1074257321 => 'HF G25', 1074257844 => 'XC10', 1074258371 => 'EOS C200', - '2147483649' => 'EOS-1D', - '2147484007' => 'EOS-1DS', - '2147484008' => 'EOS 10D', - '2147484009' => 'EOS-1D Mark III', - '2147484016' => 'EOS Digital Rebel / 300D / Kiss Digital', - '2147484020' => 'EOS-1D Mark II', - '2147484021' => 'EOS 20D', - '2147484022' => 'EOS Digital Rebel XSi / 450D / Kiss X2', - '2147484040' => 'EOS-1Ds Mark II', - '2147484041' => 'EOS Digital Rebel XT / 350D / Kiss Digital N', - '2147484048' => 'EOS 40D', - '2147484179' => 'EOS 5D', - '2147484181' => 'EOS-1Ds Mark III', - '2147484184' => 'EOS 5D Mark II', - '2147484185' => 'WFT-E1', - '2147484210' => 'EOS-1D Mark II N', - '2147484212' => 'EOS 30D', - '2147484214' => 'EOS Digital Rebel XTi / 400D / Kiss Digital X', - '2147484225' => 'WFT-E2', - '2147484230' => 'WFT-E3', - '2147484240' => 'EOS 7D', - '2147484242' => 'EOS Rebel T1i / 500D / Kiss X3', - '2147484244' => 'EOS Rebel XS / 1000D / Kiss F', - '2147484257' => 'EOS 50D', - '2147484265' => 'EOS-1D X', - '2147484272' => 'EOS Rebel T2i / 550D / Kiss X4', - '2147484273' => 'WFT-E4', - '2147484275' => 'WFT-E5', - '2147484289' => 'EOS-1D Mark IV', - '2147484293' => 'EOS 5D Mark III', - '2147484294' => 'EOS Rebel T3i / 600D / Kiss X5', - '2147484295' => 'EOS 60D', - '2147484296' => 'EOS Rebel T3 / 1100D / Kiss X50', - '2147484297' => 'EOS 7D Mark II', - '2147484311' => 'WFT-E2 II', - '2147484312' => 'WFT-E4 II', - '2147484417' => 'EOS Rebel T4i / 650D / Kiss X6i', - '2147484418' => 'EOS 6D', - '2147484452' => 'EOS-1D C', - '2147484453' => 'EOS 70D', - '2147484454' => 'EOS Rebel T5i / 700D / Kiss X7i', - '2147484455' => 'EOS Rebel T5 / 1200D / Kiss X70 / Hi', - '2147484456' => 'EOS-1D X MARK II', - '2147484465' => 'EOS M', - '2147484486' => 'EOS Rebel SL1 / 100D / Kiss X7', - '2147484487' => 'EOS Rebel T6s / 760D / 8000D', - '2147484489' => 'EOS 5D Mark IV', - '2147484496' => 'EOS 80D', - '2147484501' => 'EOS M2', - '2147484546' => 'EOS 5DS', - '2147484563' => 'EOS Rebel T6i / 750D / Kiss X8i', - '2147484673' => 'EOS 5DS R', - '2147484676' => 'EOS Rebel T6 / 1300D / Kiss X80', - '2147484677' => 'EOS Rebel T7i / 800D / Kiss X9i', - '2147484678' => 'EOS 6D Mark II', - '2147484680' => 'EOS 77D / 9000D', - '2147484695' => 'EOS Rebel SL2 / 200D / Kiss X9', - '2147484706' => 'EOS Rebel T100 / 4000D / 3000D', - '2147484708' => 'EOR R', - '2147484722' => 'EOS Rebel T7 / 2000D / 1500D / Kiss X90', + 2147483649 => 'EOS-1D', + 2147484007 => 'EOS-1DS', + 2147484008 => 'EOS 10D', + 2147484009 => 'EOS-1D Mark III', + 2147484016 => 'EOS Digital Rebel / 300D / Kiss Digital', + 2147484020 => 'EOS-1D Mark II', + 2147484021 => 'EOS 20D', + 2147484022 => 'EOS Digital Rebel XSi / 450D / Kiss X2', + 2147484040 => 'EOS-1Ds Mark II', + 2147484041 => 'EOS Digital Rebel XT / 350D / Kiss Digital N', + 2147484048 => 'EOS 40D', + 2147484179 => 'EOS 5D', + 2147484181 => 'EOS-1Ds Mark III', + 2147484184 => 'EOS 5D Mark II', + 2147484185 => 'WFT-E1', + 2147484210 => 'EOS-1D Mark II N', + 2147484212 => 'EOS 30D', + 2147484214 => 'EOS Digital Rebel XTi / 400D / Kiss Digital X', + 2147484225 => 'WFT-E2', + 2147484230 => 'WFT-E3', + 2147484240 => 'EOS 7D', + 2147484242 => 'EOS Rebel T1i / 500D / Kiss X3', + 2147484244 => 'EOS Rebel XS / 1000D / Kiss F', + 2147484257 => 'EOS 50D', + 2147484265 => 'EOS-1D X', + 2147484272 => 'EOS Rebel T2i / 550D / Kiss X4', + 2147484273 => 'WFT-E4', + 2147484275 => 'WFT-E5', + 2147484289 => 'EOS-1D Mark IV', + 2147484293 => 'EOS 5D Mark III', + 2147484294 => 'EOS Rebel T3i / 600D / Kiss X5', + 2147484295 => 'EOS 60D', + 2147484296 => 'EOS Rebel T3 / 1100D / Kiss X50', + 2147484297 => 'EOS 7D Mark II', + 2147484311 => 'WFT-E2 II', + 2147484312 => 'WFT-E4 II', + 2147484417 => 'EOS Rebel T4i / 650D / Kiss X6i', + 2147484418 => 'EOS 6D', + 2147484452 => 'EOS-1D C', + 2147484453 => 'EOS 70D', + 2147484454 => 'EOS Rebel T5i / 700D / Kiss X7i', + 2147484455 => 'EOS Rebel T5 / 1200D / Kiss X70 / Hi', + 2147484456 => 'EOS-1D X MARK II', + 2147484465 => 'EOS M', + 2147484486 => 'EOS Rebel SL1 / 100D / Kiss X7', + 2147484487 => 'EOS Rebel T6s / 760D / 8000D', + 2147484489 => 'EOS 5D Mark IV', + 2147484496 => 'EOS 80D', + 2147484501 => 'EOS M2', + 2147484546 => 'EOS 5DS', + 2147484563 => 'EOS Rebel T6i / 750D / Kiss X8i', + 2147484673 => 'EOS 5DS R', + 2147484676 => 'EOS Rebel T6 / 1300D / Kiss X80', + 2147484677 => 'EOS Rebel T7i / 800D / Kiss X9i', + 2147484678 => 'EOS 6D Mark II', + 2147484680 => 'EOS 77D / 9000D', + 2147484695 => 'EOS Rebel SL2 / 200D / Kiss X9', + 2147484706 => 'EOS Rebel T100 / 4000D / 3000D', + 2147484708 => 'EOR R', + 2147484722 => 'EOS Rebel T7 / 2000D / 1500D / Kiss X90', ), ), 'exiftoolDOMNode' => 'CanonVRD:DR4CameraModel', diff --git a/src/Collection/ExifMakerNotes/CanonVRD/DustInfo.php b/src/Collection/ExifMakerNotes/CanonVRD/DustInfo.php index 4eb866ede..4a1412255 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/DustInfo.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/DustInfo.php @@ -21,7 +21,7 @@ class DustInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\DustInfo', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class DustInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DustDeleteApplied', 'title' => 'Dust Delete Applied', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/GammaInfo.php b/src/Collection/ExifMakerNotes/CanonVRD/GammaInfo.php index eb5aca955..0802ce559 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/GammaInfo.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/GammaInfo.php @@ -21,7 +21,7 @@ class GammaInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\GammaInfo', 'itemsByName' => array ( @@ -139,7 +139,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaContrast', 'title' => 'Gamma Contrast', 'format' => @@ -153,7 +153,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaColorTone', 'title' => 'Gamma Color Tone', 'format' => @@ -167,7 +167,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaSaturation', 'title' => 'Gamma Saturation', 'format' => @@ -181,7 +181,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaUnsharpMaskStrength', 'title' => 'Gamma Unsharp Mask Strength', 'format' => @@ -195,7 +195,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaUnsharpMaskFineness', 'title' => 'Gamma Unsharp Mask Fineness', 'format' => @@ -209,7 +209,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaUnsharpMaskThreshold', 'title' => 'Gamma Unsharp Mask Threshold', 'format' => @@ -223,7 +223,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaSharpnessStrength', 'title' => 'Gamma Sharpness Strength', 'format' => @@ -237,7 +237,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaShadow', 'title' => 'Gamma Shadow', 'format' => @@ -251,7 +251,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaHighlight', 'title' => 'Gamma Highlight', 'format' => @@ -265,7 +265,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaBlackPoint', 'title' => 'Gamma Black Point', 'format' => @@ -279,7 +279,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaWhitePoint', 'title' => 'Gamma White Point', 'format' => @@ -293,7 +293,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaMidPoint', 'title' => 'Gamma Mid Point', 'format' => @@ -307,7 +307,7 @@ class GammaInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GammaCurveOutputRange', 'title' => 'Gamma Curve Output Range', 'components' => 2, diff --git a/src/Collection/ExifMakerNotes/CanonVRD/IHL.php b/src/Collection/ExifMakerNotes/CanonVRD/IHL.php index 4008852c2..f864112d7 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/IHL.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/IHL.php @@ -21,7 +21,7 @@ class IHL extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\IHL', 'itemsByName' => array ( @@ -75,7 +75,7 @@ class IHL extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IHL_EXIF', 'title' => 'IHL EXIF', 'format' => @@ -89,7 +89,7 @@ class IHL extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailImage', 'title' => 'Thumbnail Image', 'format' => @@ -103,7 +103,7 @@ class IHL extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImage', 'title' => 'Preview Image', 'format' => @@ -117,7 +117,7 @@ class IHL extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawCodecVersion', 'title' => 'Raw Codec Version', 'format' => @@ -131,7 +131,7 @@ class IHL extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CRCDevelParams', 'title' => 'CRC Devel Params', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/Main.php b/src/Collection/ExifMakerNotes/CanonVRD/Main.php index 9decd5ee2..f517a23ea 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/Main.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/Main.php @@ -21,29 +21,29 @@ class Main extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\Main', 'itemsByName' => array ( 'XMP' => array ( - 0 => '4294902006', + 0 => 4294902006, ), ), 'itemsByExiftoolDOMNode' => array ( 'CanonVRD:XMP' => array ( - 0 => '4294902006', + 0 => 4294902006, ), ), 'items' => array ( - '4294902006' => + 4294902006 => array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XMP', 'title' => 'XMP', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/StampInfo.php b/src/Collection/ExifMakerNotes/CanonVRD/StampInfo.php index f34849eac..ca8dde014 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/StampInfo.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/StampInfo.php @@ -21,7 +21,7 @@ class StampInfo extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\StampInfo', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class StampInfo extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StampToolCount', 'title' => 'Stamp Tool Count', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/StampTool.php b/src/Collection/ExifMakerNotes/CanonVRD/StampTool.php index 5a90f39e4..b2b01295d 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/StampTool.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/StampTool.php @@ -21,7 +21,7 @@ class StampTool extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\StampTool', 'itemsByName' => array ( @@ -43,7 +43,7 @@ class StampTool extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StampToolCount', 'title' => 'Stamp Tool Count', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/ToneCurve.php b/src/Collection/ExifMakerNotes/CanonVRD/ToneCurve.php index 3151c1e71..096b35527 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/ToneCurve.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/ToneCurve.php @@ -21,7 +21,7 @@ class ToneCurve extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\ToneCurve', 'itemsByName' => array ( @@ -115,7 +115,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveColorSpace', 'title' => 'Tone Curve Color Space', 'format' => @@ -137,7 +137,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveShape', 'title' => 'Tone Curve Shape', 'format' => @@ -159,7 +159,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveInputRange', 'title' => 'Tone Curve Input Range', 'components' => 2, @@ -174,7 +174,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveOutputRange', 'title' => 'Tone Curve Output Range', 'components' => 2, @@ -189,7 +189,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RGBCurvePoints', 'title' => 'RGB Curve Points', 'components' => 21, @@ -204,7 +204,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveX', 'title' => 'Tone Curve X', 'format' => @@ -218,7 +218,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveY', 'title' => 'Tone Curve Y', 'format' => @@ -232,7 +232,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RedCurvePoints', 'title' => 'Red Curve Points', 'components' => 21, @@ -247,7 +247,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GreenCurvePoints', 'title' => 'Green Curve Points', 'components' => 21, @@ -262,7 +262,7 @@ class ToneCurve extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlueCurvePoints', 'title' => 'Blue Curve Points', 'components' => 21, diff --git a/src/Collection/ExifMakerNotes/CanonVRD/Ver1.php b/src/Collection/ExifMakerNotes/CanonVRD/Ver1.php index 9974e02df..ea0c44b2b 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/Ver1.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/Ver1.php @@ -21,7 +21,7 @@ class Ver1 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\Ver1', 'itemsByName' => array ( @@ -379,7 +379,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VRDVersion', 'title' => 'VRD Version', 'format' => @@ -393,7 +393,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBAdjRGGBLevels', 'title' => 'WB Adj RGGB Levels', 'components' => 4, @@ -408,7 +408,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalanceAdj', 'title' => 'White Balance Adj', 'format' => @@ -438,7 +438,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBAdjColorTemp', 'title' => 'WB Adj Color Temp', 'format' => @@ -452,7 +452,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBFineTuneActive', 'title' => 'WB Fine Tune Active', 'format' => @@ -474,7 +474,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBFineTuneSaturation', 'title' => 'WB Fine Tune Saturation', 'format' => @@ -488,7 +488,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WBFineTuneTone', 'title' => 'WB Fine Tune Tone', 'format' => @@ -502,7 +502,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawColorAdj', 'title' => 'Raw Color Adj', 'format' => @@ -525,7 +525,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawCustomSaturation', 'title' => 'Raw Custom Saturation', 'format' => @@ -539,7 +539,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawCustomTone', 'title' => 'Raw Custom Tone', 'format' => @@ -553,7 +553,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawBrightnessAdj', 'title' => 'Raw Brightness Adj', 'format' => @@ -567,7 +567,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveProperty', 'title' => 'Tone Curve Property', 'format' => @@ -594,7 +594,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DynamicRangeMin', 'title' => 'Dynamic Range Min', 'format' => @@ -608,7 +608,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DynamicRangeMax', 'title' => 'Dynamic Range Max', 'format' => @@ -622,7 +622,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveActive', 'title' => 'Tone Curve Active', 'format' => @@ -644,7 +644,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveMode', 'title' => 'Tone Curve Mode', 'format' => @@ -666,7 +666,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BrightnessAdj', 'title' => 'Brightness Adj', 'format' => @@ -680,7 +680,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ContrastAdj', 'title' => 'Contrast Adj', 'format' => @@ -694,7 +694,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SaturationAdj', 'title' => 'Saturation Adj', 'format' => @@ -708,7 +708,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorToneAdj', 'title' => 'Color Tone Adj', 'format' => @@ -722,7 +722,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LuminanceCurvePoints', 'title' => 'Luminance Curve Points', 'components' => 21, @@ -737,7 +737,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LuminanceCurveLimits', 'title' => 'Luminance Curve Limits', 'components' => 4, @@ -752,7 +752,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ToneCurveInterpolation', 'title' => 'Tone Curve Interpolation', 'format' => @@ -774,7 +774,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RedCurvePoints', 'title' => 'Red Curve Points', 'components' => 21, @@ -789,7 +789,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RedCurveLimits', 'title' => 'Red Curve Limits', 'components' => 4, @@ -804,7 +804,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GreenCurvePoints', 'title' => 'Green Curve Points', 'components' => 21, @@ -819,7 +819,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GreenCurveLimits', 'title' => 'Green Curve Limits', 'components' => 4, @@ -834,7 +834,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlueCurvePoints', 'title' => 'Blue Curve Points', 'components' => 21, @@ -849,7 +849,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlueCurveLimits', 'title' => 'Blue Curve Limits', 'components' => 4, @@ -864,7 +864,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RGBCurvePoints', 'title' => 'RGB Curve Points', 'components' => 21, @@ -879,7 +879,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RGBCurveLimits', 'title' => 'RGB Curve Limits', 'components' => 4, @@ -894,7 +894,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropActive', 'title' => 'Crop Active', 'format' => @@ -916,7 +916,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropLeft', 'title' => 'Crop Left', 'format' => @@ -930,7 +930,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropTop', 'title' => 'Crop Top', 'format' => @@ -944,7 +944,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropWidth', 'title' => 'Crop Width', 'format' => @@ -958,7 +958,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropHeight', 'title' => 'Crop Height', 'format' => @@ -972,7 +972,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharpnessAdj', 'title' => 'Sharpness Adj', 'format' => @@ -986,7 +986,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropAspectRatio', 'title' => 'Crop Aspect Ratio', 'format' => @@ -1020,7 +1020,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ConstrainedCropWidth', 'title' => 'Constrained Crop Width', 'format' => @@ -1034,7 +1034,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ConstrainedCropHeight', 'title' => 'Constrained Crop Height', 'format' => @@ -1048,7 +1048,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CheckMark', 'title' => 'Check Mark', 'format' => @@ -1072,7 +1072,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Rotation', 'title' => 'Rotation', 'format' => @@ -1096,7 +1096,7 @@ class Ver1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WorkColorSpace', 'title' => 'Work Color Space', 'format' => diff --git a/src/Collection/ExifMakerNotes/CanonVRD/Ver2.php b/src/Collection/ExifMakerNotes/CanonVRD/Ver2.php index f86ca5e4a..83143f083 100644 --- a/src/Collection/ExifMakerNotes/CanonVRD/Ver2.php +++ b/src/Collection/ExifMakerNotes/CanonVRD/Ver2.php @@ -21,7 +21,7 @@ class Ver2 extends CollectionBase { array ( 0 => 3, ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'ExifMakerNotes\\CanonVRD\\Ver2', 'itemsByName' => array ( @@ -1227,7 +1227,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PictureStyle', 'title' => 'Picture Style', 'format' => @@ -1255,7 +1255,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IsCustomPictureStyle', 'title' => 'Is Custom Picture Style', 'format' => @@ -1277,7 +1277,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardRawColorTone', 'title' => 'Standard Raw Color Tone', 'format' => @@ -1291,7 +1291,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardRawSaturation', 'title' => 'Standard Raw Saturation', 'format' => @@ -1305,7 +1305,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardRawContrast', 'title' => 'Standard Raw Contrast', 'format' => @@ -1319,7 +1319,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardRawLinear', 'title' => 'Standard Raw Linear', 'format' => @@ -1341,7 +1341,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardRawSharpness', 'title' => 'Standard Raw Sharpness', 'format' => @@ -1355,7 +1355,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardRawHighlightPoint', 'title' => 'Standard Raw Highlight Point', 'format' => @@ -1369,7 +1369,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardRawShadowPoint', 'title' => 'Standard Raw Shadow Point', 'format' => @@ -1383,7 +1383,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardOutputHighlightPoint', 'title' => 'Standard Output Highlight Point', 'format' => @@ -1397,7 +1397,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardOutputShadowPoint', 'title' => 'Standard Output Shadow Point', 'format' => @@ -1411,7 +1411,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitRawColorTone', 'title' => 'Portrait Raw Color Tone', 'format' => @@ -1425,7 +1425,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitRawSaturation', 'title' => 'Portrait Raw Saturation', 'format' => @@ -1439,7 +1439,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitRawContrast', 'title' => 'Portrait Raw Contrast', 'format' => @@ -1453,7 +1453,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitRawLinear', 'title' => 'Portrait Raw Linear', 'format' => @@ -1475,7 +1475,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitRawSharpness', 'title' => 'Portrait Raw Sharpness', 'format' => @@ -1489,7 +1489,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitRawHighlightPoint', 'title' => 'Portrait Raw Highlight Point', 'format' => @@ -1503,7 +1503,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitRawShadowPoint', 'title' => 'Portrait Raw Shadow Point', 'format' => @@ -1517,7 +1517,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitOutputHighlightPoint', 'title' => 'Portrait Output Highlight Point', 'format' => @@ -1531,7 +1531,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitOutputShadowPoint', 'title' => 'Portrait Output Shadow Point', 'format' => @@ -1545,7 +1545,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeRawColorTone', 'title' => 'Landscape Raw Color Tone', 'format' => @@ -1559,7 +1559,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeRawSaturation', 'title' => 'Landscape Raw Saturation', 'format' => @@ -1573,7 +1573,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeRawContrast', 'title' => 'Landscape Raw Contrast', 'format' => @@ -1587,7 +1587,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeRawLinear', 'title' => 'Landscape Raw Linear', 'format' => @@ -1609,7 +1609,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeRawSharpness', 'title' => 'Landscape Raw Sharpness', 'format' => @@ -1623,7 +1623,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeRawHighlightPoint', 'title' => 'Landscape Raw Highlight Point', 'format' => @@ -1637,7 +1637,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeRawShadowPoint', 'title' => 'Landscape Raw Shadow Point', 'format' => @@ -1651,7 +1651,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeOutputHighlightPoint', 'title' => 'Landscape Output Highlight Point', 'format' => @@ -1665,7 +1665,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeOutputShadowPoint', 'title' => 'Landscape Output Shadow Point', 'format' => @@ -1679,7 +1679,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralRawColorTone', 'title' => 'Neutral Raw Color Tone', 'format' => @@ -1693,7 +1693,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralRawSaturation', 'title' => 'Neutral Raw Saturation', 'format' => @@ -1707,7 +1707,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralRawContrast', 'title' => 'Neutral Raw Contrast', 'format' => @@ -1721,7 +1721,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralRawLinear', 'title' => 'Neutral Raw Linear', 'format' => @@ -1743,7 +1743,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralRawSharpness', 'title' => 'Neutral Raw Sharpness', 'format' => @@ -1757,7 +1757,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralRawHighlightPoint', 'title' => 'Neutral Raw Highlight Point', 'format' => @@ -1771,7 +1771,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralRawShadowPoint', 'title' => 'Neutral Raw Shadow Point', 'format' => @@ -1785,7 +1785,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralOutputHighlightPoint', 'title' => 'Neutral Output Highlight Point', 'format' => @@ -1799,7 +1799,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralOutputShadowPoint', 'title' => 'Neutral Output Shadow Point', 'format' => @@ -1813,7 +1813,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulRawColorTone', 'title' => 'Faithful Raw Color Tone', 'format' => @@ -1827,7 +1827,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulRawSaturation', 'title' => 'Faithful Raw Saturation', 'format' => @@ -1841,7 +1841,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulRawContrast', 'title' => 'Faithful Raw Contrast', 'format' => @@ -1855,7 +1855,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulRawLinear', 'title' => 'Faithful Raw Linear', 'format' => @@ -1877,7 +1877,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulRawSharpness', 'title' => 'Faithful Raw Sharpness', 'format' => @@ -1891,7 +1891,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulRawHighlightPoint', 'title' => 'Faithful Raw Highlight Point', 'format' => @@ -1905,7 +1905,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulRawShadowPoint', 'title' => 'Faithful Raw Shadow Point', 'format' => @@ -1919,7 +1919,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulOutputHighlightPoint', 'title' => 'Faithful Output Highlight Point', 'format' => @@ -1933,7 +1933,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulOutputShadowPoint', 'title' => 'Faithful Output Shadow Point', 'format' => @@ -1947,7 +1947,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeFilterEffect', 'title' => 'Monochrome Filter Effect', 'format' => @@ -1972,7 +1972,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeToningEffect', 'title' => 'Monochrome Toning Effect', 'format' => @@ -1997,7 +1997,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeContrast', 'title' => 'Monochrome Contrast', 'format' => @@ -2011,7 +2011,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeLinear', 'title' => 'Monochrome Linear', 'format' => @@ -2033,7 +2033,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeSharpness', 'title' => 'Monochrome Sharpness', 'format' => @@ -2047,7 +2047,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeRawHighlightPoint', 'title' => 'Monochrome Raw Highlight Point', 'format' => @@ -2061,7 +2061,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeRawShadowPoint', 'title' => 'Monochrome Raw Shadow Point', 'format' => @@ -2075,7 +2075,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeOutputHighlightPoint', 'title' => 'Monochrome Output Highlight Point', 'format' => @@ -2089,7 +2089,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeOutputShadowPoint', 'title' => 'Monochrome Output Shadow Point', 'format' => @@ -2103,7 +2103,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownContrast', 'title' => 'Unknown Contrast', 'format' => @@ -2117,7 +2117,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownLinear', 'title' => 'Unknown Linear', 'format' => @@ -2139,7 +2139,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownSharpness', 'title' => 'Unknown Sharpness', 'format' => @@ -2153,7 +2153,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownRawHighlightPoint', 'title' => 'Unknown Raw Highlight Point', 'format' => @@ -2167,7 +2167,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownRawShadowPoint', 'title' => 'Unknown Raw Shadow Point', 'format' => @@ -2181,7 +2181,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownOutputHighlightPoint', 'title' => 'Unknown Output Highlight Point', 'format' => @@ -2195,7 +2195,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownOutputShadowPoint', 'title' => 'Unknown Output Shadow Point', 'format' => @@ -2209,7 +2209,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomColorTone', 'title' => 'Custom Color Tone', 'format' => @@ -2223,7 +2223,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomSaturation', 'title' => 'Custom Saturation', 'format' => @@ -2237,7 +2237,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomContrast', 'title' => 'Custom Contrast', 'format' => @@ -2251,7 +2251,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomLinear', 'title' => 'Custom Linear', 'format' => @@ -2273,7 +2273,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomSharpness', 'title' => 'Custom Sharpness', 'format' => @@ -2287,7 +2287,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomRawHighlightPoint', 'title' => 'Custom Raw Highlight Point', 'format' => @@ -2301,7 +2301,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomRawShadowPoint', 'title' => 'Custom Raw Shadow Point', 'format' => @@ -2315,7 +2315,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomOutputHighlightPoint', 'title' => 'Custom Output Highlight Point', 'format' => @@ -2329,7 +2329,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomOutputShadowPoint', 'title' => 'Custom Output Shadow Point', 'format' => @@ -2343,7 +2343,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomPictureStyleData', 'title' => 'Custom Picture Style Data', 'format' => @@ -2357,7 +2357,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChrominanceNoiseReduction', 'title' => 'Chrominance Noise Reduction', 'format' => @@ -2377,7 +2377,7 @@ class Ver2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChrominanceNoiseReduction', 'title' => 'Chrominance Noise Reduction', 'format' => @@ -2418,7 +2418,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LuminanceNoiseReduction', 'title' => 'Luminance Noise Reduction', 'format' => @@ -2438,7 +2438,7 @@ class Ver2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LuminanceNoiseReduction', 'title' => 'Luminance Noise Reduction', 'format' => @@ -2479,7 +2479,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChrominanceNR_TIFF_JPEG', 'title' => 'Chrominance NR TIFF JPEG', 'format' => @@ -2499,7 +2499,7 @@ class Ver2 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChrominanceNR_TIFF_JPEG', 'title' => 'Chrominance NR TIFF JPEG', 'format' => @@ -2540,7 +2540,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationOn', 'title' => 'Chromatic Aberration On', 'format' => @@ -2562,7 +2562,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DistortionCorrectionOn', 'title' => 'Distortion Correction On', 'format' => @@ -2584,7 +2584,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PeripheralIlluminationOn', 'title' => 'Peripheral Illumination On', 'format' => @@ -2606,7 +2606,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorBlur', 'title' => 'Color Blur', 'format' => @@ -2628,7 +2628,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberration', 'title' => 'Chromatic Aberration', 'format' => @@ -2642,7 +2642,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DistortionCorrection', 'title' => 'Distortion Correction', 'format' => @@ -2656,7 +2656,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PeripheralIllumination', 'title' => 'Peripheral Illumination', 'format' => @@ -2670,7 +2670,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AberrationCorrectionDistance', 'title' => 'Aberration Correction Distance', 'format' => @@ -2684,7 +2684,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationRed', 'title' => 'Chromatic Aberration Red', 'format' => @@ -2698,7 +2698,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationBlue', 'title' => 'Chromatic Aberration Blue', 'format' => @@ -2712,7 +2712,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LuminanceNR_TIFF_JPEG', 'title' => 'Luminance NR TIFF JPEG', 'format' => @@ -2726,7 +2726,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizerOn', 'title' => 'Auto Lighting Optimizer On', 'format' => @@ -2748,7 +2748,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AutoLightingOptimizer', 'title' => 'Auto Lighting Optimizer', 'format' => @@ -2772,7 +2772,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardRawHighlight', 'title' => 'Standard Raw Highlight', 'format' => @@ -2786,7 +2786,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitRawHighlight', 'title' => 'Portrait Raw Highlight', 'format' => @@ -2800,7 +2800,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeRawHighlight', 'title' => 'Landscape Raw Highlight', 'format' => @@ -2814,7 +2814,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralRawHighlight', 'title' => 'Neutral Raw Highlight', 'format' => @@ -2828,7 +2828,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulRawHighlight', 'title' => 'Faithful Raw Highlight', 'format' => @@ -2842,7 +2842,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeRawHighlight', 'title' => 'Monochrome Raw Highlight', 'format' => @@ -2856,7 +2856,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownRawHighlight', 'title' => 'Unknown Raw Highlight', 'format' => @@ -2870,7 +2870,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomRawHighlight', 'title' => 'Custom Raw Highlight', 'format' => @@ -2884,7 +2884,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardRawShadow', 'title' => 'Standard Raw Shadow', 'format' => @@ -2898,7 +2898,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitRawShadow', 'title' => 'Portrait Raw Shadow', 'format' => @@ -2912,7 +2912,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeRawShadow', 'title' => 'Landscape Raw Shadow', 'format' => @@ -2926,7 +2926,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralRawShadow', 'title' => 'Neutral Raw Shadow', 'format' => @@ -2940,7 +2940,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulRawShadow', 'title' => 'Faithful Raw Shadow', 'format' => @@ -2954,7 +2954,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeRawShadow', 'title' => 'Monochrome Raw Shadow', 'format' => @@ -2968,7 +2968,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnknownRawShadow', 'title' => 'Unknown Raw Shadow', 'format' => @@ -2982,7 +2982,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomRawShadow', 'title' => 'Custom Raw Shadow', 'format' => @@ -2996,7 +2996,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AngleAdj', 'title' => 'Angle Adj', 'format' => @@ -3010,7 +3010,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CheckMark2', 'title' => 'Check Mark 2', 'format' => @@ -3036,7 +3036,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UnsharpMask', 'title' => 'Unsharp Mask', 'format' => @@ -3058,7 +3058,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardUnsharpMaskStrength', 'title' => 'Standard Unsharp Mask Strength', 'format' => @@ -3072,7 +3072,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardUnsharpMaskFineness', 'title' => 'Standard Unsharp Mask Fineness', 'format' => @@ -3086,7 +3086,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardUnsharpMaskThreshold', 'title' => 'Standard Unsharp Mask Threshold', 'format' => @@ -3100,7 +3100,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitUnsharpMaskStrength', 'title' => 'Portrait Unsharp Mask Strength', 'format' => @@ -3114,7 +3114,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitUnsharpMaskFineness', 'title' => 'Portrait Unsharp Mask Fineness', 'format' => @@ -3128,7 +3128,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PortraitUnsharpMaskThreshold', 'title' => 'Portrait Unsharp Mask Threshold', 'format' => @@ -3142,7 +3142,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeUnsharpMaskStrength', 'title' => 'Landscape Unsharp Mask Strength', 'format' => @@ -3156,7 +3156,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeUnsharpMaskFineness', 'title' => 'Landscape Unsharp Mask Fineness', 'format' => @@ -3170,7 +3170,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LandscapeUnsharpMaskThreshold', 'title' => 'Landscape Unsharp Mask Threshold', 'format' => @@ -3184,7 +3184,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutraUnsharpMaskStrength', 'title' => 'Neutra Unsharp Mask Strength', 'format' => @@ -3198,7 +3198,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralUnsharpMaskFineness', 'title' => 'Neutral Unsharp Mask Fineness', 'format' => @@ -3212,7 +3212,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NeutralUnsharpMaskThreshold', 'title' => 'Neutral Unsharp Mask Threshold', 'format' => @@ -3226,7 +3226,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulUnsharpMaskStrength', 'title' => 'Faithful Unsharp Mask Strength', 'format' => @@ -3240,7 +3240,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulUnsharpMaskFineness', 'title' => 'Faithful Unsharp Mask Fineness', 'format' => @@ -3254,7 +3254,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaithfulUnsharpMaskThreshold', 'title' => 'Faithful Unsharp Mask Threshold', 'format' => @@ -3268,7 +3268,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeUnsharpMaskStrength', 'title' => 'Monochrome Unsharp Mask Strength', 'format' => @@ -3282,7 +3282,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeUnsharpMaskFineness', 'title' => 'Monochrome Unsharp Mask Fineness', 'format' => @@ -3296,7 +3296,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MonochromeUnsharpMaskThreshold', 'title' => 'Monochrome Unsharp Mask Threshold', 'format' => @@ -3310,7 +3310,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomUnsharpMaskStrength', 'title' => 'Custom Unsharp Mask Strength', 'format' => @@ -3324,7 +3324,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomUnsharpMaskFineness', 'title' => 'Custom Unsharp Mask Fineness', 'format' => @@ -3338,7 +3338,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomUnsharpMaskThreshold', 'title' => 'Custom Unsharp Mask Threshold', 'format' => @@ -3352,7 +3352,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomDefaultUnsharpStrength', 'title' => 'Custom Default Unsharp Strength', 'format' => @@ -3366,7 +3366,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomDefaultUnsharpFineness', 'title' => 'Custom Default Unsharp Fineness', 'format' => @@ -3380,7 +3380,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomDefaultUnsharpThreshold', 'title' => 'Custom Default Unsharp Threshold', 'format' => @@ -3394,7 +3394,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropCircleActive', 'title' => 'Crop Circle Active', 'format' => @@ -3416,7 +3416,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropCircleX', 'title' => 'Crop Circle X', 'format' => @@ -3430,7 +3430,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropCircleY', 'title' => 'Crop Circle Y', 'format' => @@ -3444,7 +3444,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CropCircleRadius', 'title' => 'Crop Circle Radius', 'format' => @@ -3458,7 +3458,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DLOOn', 'title' => 'DLO On', 'format' => @@ -3480,7 +3480,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DLOSetting', 'title' => 'DLO Setting', 'format' => @@ -3494,7 +3494,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DLOShootingDistance', 'title' => 'DLO Shooting Distance', 'format' => @@ -3508,7 +3508,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DLODataLength', 'title' => 'DLO Data Length', 'format' => @@ -3522,7 +3522,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraRawColorTone', 'title' => 'Camera Raw Color Tone', 'format' => @@ -3536,7 +3536,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraRawSaturation', 'title' => 'Camera Raw Saturation', 'format' => @@ -3550,7 +3550,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraRawContrast', 'title' => 'Camera Raw Contrast', 'format' => @@ -3564,7 +3564,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraRawLinear', 'title' => 'Camera Raw Linear', 'format' => @@ -3586,7 +3586,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraRawSharpness', 'title' => 'Camera Raw Sharpness', 'format' => @@ -3600,7 +3600,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraRawHighlightPoint', 'title' => 'Camera Raw Highlight Point', 'format' => @@ -3614,7 +3614,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraRawShadowPoint', 'title' => 'Camera Raw Shadow Point', 'format' => @@ -3628,7 +3628,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraRawOutputHighlightPoint', 'title' => 'Camera Raw Output Highlight Point', 'format' => @@ -3642,7 +3642,7 @@ class Ver2 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraRawOutputShadowPoint', 'title' => 'Camera Raw Output Shadow Point', 'format' => diff --git a/src/Collection/Exif/Exif.php b/src/Collection/Jpeg/Exif.php similarity index 79% rename from src/Collection/Exif/Exif.php rename to src/Collection/Jpeg/Exif.php index 75ae86e74..ef7593b9d 100644 --- a/src/Collection/Exif/Exif.php +++ b/src/Collection/Jpeg/Exif.php @@ -6,7 +6,7 @@ */ // phpcs:disable -namespace FileEye\MediaProbe\Collection\Exif; +namespace FileEye\MediaProbe\Collection\Jpeg; use FileEye\MediaProbe\Collection\CollectionBase; @@ -14,9 +14,9 @@ class Exif extends CollectionBase { protected static $map = array ( 'title' => 'JPEG Exif data', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Exif', + 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\Exif', 'DOMNode' => 'exif', - 'id' => 'Exif\\Exif', + 'id' => 'Jpeg\\Exif', 'items' => array ( 'Tiff' => diff --git a/src/Collection/Jpeg/Jpeg.php b/src/Collection/Jpeg/Jpeg.php index 18d7e963f..6f0e89fb4 100644 --- a/src/Collection/Jpeg/Jpeg.php +++ b/src/Collection/Jpeg/Jpeg.php @@ -14,7 +14,9 @@ class Jpeg extends CollectionBase { protected static $map = array ( 'title' => 'JPEG image', - 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg', + 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\Jpeg', + 'parser' => 'FileEye\\MediaProbe\\Parser\\Jpeg\\Jpeg', + 'writer' => 'FileEye\\MediaProbe\\Writer\\Jpeg\\Jpeg', 'DOMNode' => 'jpeg', 'id' => 'Jpeg\\Jpeg', 'itemsByName' => diff --git a/src/Collection/Jpeg/Segment.php b/src/Collection/Jpeg/Segment.php index 565472257..81312ceba 100644 --- a/src/Collection/Jpeg/Segment.php +++ b/src/Collection/Jpeg/Segment.php @@ -14,7 +14,7 @@ class Segment extends CollectionBase { protected static $map = array ( 'title' => 'Generic JPEG data segment', - 'class' => 'FileEye\\MediaProbe\\Block\\JpegSegment', + 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\Segment', 'DOMNode' => 'jpegSegment', 'id' => 'Jpeg\\Segment', ); diff --git a/src/Collection/Jpeg/SegmentApp1.php b/src/Collection/Jpeg/SegmentApp1.php index 3c6315a22..1ecc609b1 100644 --- a/src/Collection/Jpeg/SegmentApp1.php +++ b/src/Collection/Jpeg/SegmentApp1.php @@ -16,7 +16,7 @@ class SegmentApp1 extends CollectionBase { 'name' => 'APP1', 'title' => 'JPEG Application segment 1', 'payload' => 'variable', - 'class' => 'FileEye\\MediaProbe\\Block\\JpegSegmentApp1', + 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\SegmentApp1', 'DOMNode' => 'jpegSegment', 'id' => 'Jpeg\\SegmentApp1', 'items' => @@ -25,7 +25,7 @@ class SegmentApp1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Exif\\Exif', + 'collection' => 'Jpeg\\Exif', ), ), ), diff --git a/src/Collection/Jpeg/SegmentCom.php b/src/Collection/Jpeg/SegmentCom.php index d3422026a..4d2c88d9f 100644 --- a/src/Collection/Jpeg/SegmentCom.php +++ b/src/Collection/Jpeg/SegmentCom.php @@ -16,7 +16,7 @@ class SegmentCom extends CollectionBase { 'name' => 'COM', 'title' => 'JPEG Comment', 'payload' => 'variable', - 'class' => 'FileEye\\MediaProbe\\Block\\JpegSegmentCom', + 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\SegmentCom', 'DOMNode' => 'jpegSegment', 'id' => 'Jpeg\\SegmentCom', ); diff --git a/src/Collection/Jpeg/SegmentSos.php b/src/Collection/Jpeg/SegmentSos.php index d7b419fd6..7fec4249a 100644 --- a/src/Collection/Jpeg/SegmentSos.php +++ b/src/Collection/Jpeg/SegmentSos.php @@ -16,7 +16,7 @@ class SegmentSos extends CollectionBase { 'name' => 'SOS', 'title' => 'JPEG Start of scan', 'payload' => 'scan', - 'class' => 'FileEye\\MediaProbe\\Block\\JpegSegmentSos', + 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\SegmentSos', 'DOMNode' => 'jpegSegment', 'id' => 'Jpeg\\SegmentSos', ); diff --git a/src/Collection/Media.php b/src/Collection/Media.php index f4cb94649..ff6b17878 100644 --- a/src/Collection/Media.php +++ b/src/Collection/Media.php @@ -13,7 +13,6 @@ class Media extends CollectionBase { protected static $map = array ( - 'class' => 'FileEye\\MediaProbe\\Media', 'DOMNode' => 'media', 'id' => 'Media', ); diff --git a/src/Collection/Tiff/Ifd0.php b/src/Collection/Tiff/Ifd0.php index f7b5ff948..e13828be0 100644 --- a/src/Collection/Tiff/Ifd0.php +++ b/src/Collection/Tiff/Ifd0.php @@ -15,9 +15,9 @@ class Ifd0 extends CollectionBase { protected static $map = array ( 'name' => 'IFD0', 'title' => 'IFD0', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd', 'DOMNode' => 'ifd', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'alias' => array ( 0 => '0', @@ -25,8 +25,8 @@ class Ifd0 extends CollectionBase { ), 'postParse' => array ( - 0 => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd::thumbnailToBlock', - 1 => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd::makerNoteToBlock', + 0 => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd::thumbnailToBlock', + 1 => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd::makerNoteToBlock', ), 'id' => 'Tiff\\Ifd0', 'itemsByName' => @@ -1404,7 +1404,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProcessingSoftware', 'title' => 'Processing Software', 'format' => @@ -1419,7 +1419,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubfileType', 'title' => 'Subfile Type', 'format' => @@ -1441,7 +1441,7 @@ class Ifd0 extends CollectionBase { 8 => 'TIFF/IT final page', 16 => 'TIFF-FX mixed raster content', 65537 => 'Alternate reduced-resolution image', - '4294967295' => 'invalid', + 4294967295 => 'invalid', ), ), 'phpExifTag' => 'NewSubFile', @@ -1452,7 +1452,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OldSubfileType', 'title' => 'Old Subfile Type', 'format' => @@ -1482,7 +1482,7 @@ class Ifd0 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageWidth', 'title' => 'Image Width', 'phpExifTag' => 'ImageWidth', @@ -1499,7 +1499,7 @@ class Ifd0 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHeight', 'title' => 'Image Height', 'phpExifTag' => 'ImageLength', @@ -1510,7 +1510,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BitsPerSample', 'title' => 'Bits Per Sample', 'format' => @@ -1582,7 +1582,7 @@ class Ifd0 extends CollectionBase { 65535 => 'Pentax PEF Compressed', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Compression', 'title' => 'Compression', 'format' => @@ -1598,7 +1598,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PhotometricInterpretation', 'title' => 'Photometric Interpretation', 'format' => @@ -1634,7 +1634,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Thresholding', 'title' => 'Thresholding', 'format' => @@ -1657,7 +1657,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CellWidth', 'title' => 'Cell Width', 'format' => @@ -1671,7 +1671,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CellLength', 'title' => 'Cell Length', 'format' => @@ -1685,7 +1685,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FillOrder', 'title' => 'Fill Order', 'format' => @@ -1708,7 +1708,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DocumentName', 'title' => 'Document Name', 'format' => @@ -1723,7 +1723,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageDescription', 'title' => 'Image Description', 'format' => @@ -1738,7 +1738,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Make', 'title' => 'Make', 'format' => @@ -1753,7 +1753,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Model', 'title' => 'Camera Model Name', 'format' => @@ -1773,7 +1773,7 @@ class Ifd0 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageStart', 'title' => 'Preview Image Start', 'phpExifTag' => 'StripOffsets', @@ -1785,7 +1785,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Orientation', 'title' => 'Orientation', 'format' => @@ -1815,7 +1815,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamplesPerPixel', 'title' => 'Samples Per Pixel', 'format' => @@ -1836,7 +1836,7 @@ class Ifd0 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RowsPerStrip', 'title' => 'Rows Per Strip', 'phpExifTag' => 'RowsPerStrip', @@ -1852,7 +1852,7 @@ class Ifd0 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageLength', 'title' => 'Preview Image Length', 'phpExifTag' => 'StripByteCounts', @@ -1863,7 +1863,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinSampleValue', 'title' => 'Min Sample Value', 'format' => @@ -1878,7 +1878,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxSampleValue', 'title' => 'Max Sample Value', 'format' => @@ -1894,7 +1894,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XResolution', 'title' => 'X Resolution', 'format' => @@ -1910,7 +1910,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YResolution', 'title' => 'Y Resolution', 'format' => @@ -1926,7 +1926,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PlanarConfiguration', 'title' => 'Planar Configuration', 'format' => @@ -1949,7 +1949,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PageName', 'title' => 'Page Name', 'format' => @@ -1964,7 +1964,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPosition', 'title' => 'X Position', 'format' => @@ -1979,7 +1979,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YPosition', 'title' => 'Y Position', 'format' => @@ -1994,7 +1994,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GrayResponseUnit', 'title' => 'Gray Response Unit', 'format' => @@ -2021,7 +2021,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ResolutionUnit', 'title' => 'Resolution Unit', 'format' => @@ -2045,7 +2045,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PageNumber', 'title' => 'Page Number', 'components' => 2, @@ -2061,7 +2061,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TransferFunction', 'title' => 'Transfer Function', 'components' => 768, @@ -2077,7 +2077,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Software', 'title' => 'Software', 'format' => @@ -2094,7 +2094,7 @@ class Ifd0 extends CollectionBase { array ( 'components' => 20, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Time', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifyDate', 'title' => 'Modify Date', 'format' => @@ -2109,7 +2109,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Artist', 'title' => 'Artist', 'format' => @@ -2124,7 +2124,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HostComputer', 'title' => 'Host Computer', 'format' => @@ -2140,7 +2140,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Predictor', 'title' => 'Predictor', 'format' => @@ -2163,7 +2163,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhitePoint', 'title' => 'White Point', 'components' => 2, @@ -2179,7 +2179,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PrimaryChromaticities', 'title' => 'Primary Chromaticities', 'components' => 6, @@ -2195,7 +2195,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HalftoneHints', 'title' => 'Halftone Hints', 'components' => 2, @@ -2211,7 +2211,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileWidth', 'title' => 'Tile Width', 'format' => @@ -2226,7 +2226,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileLength', 'title' => 'Tile Length', 'format' => @@ -2241,7 +2241,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'A100DataOffset', 'title' => 'A100 Data Offset', 'format' => @@ -2256,7 +2256,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InkSet', 'title' => 'Ink Set', 'format' => @@ -2279,7 +2279,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TargetPrinter', 'title' => 'Target Printer', 'format' => @@ -2295,7 +2295,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailOffset', 'title' => 'Thumbnail Offset', 'format' => @@ -2308,7 +2308,7 @@ class Ifd0 extends CollectionBase { 1 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageStart', 'title' => 'Preview Image Start', 'format' => @@ -2324,7 +2324,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailLength', 'title' => 'Thumbnail Length', 'format' => @@ -2337,7 +2337,7 @@ class Ifd0 extends CollectionBase { 1 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageLength', 'title' => 'Preview Image Length', 'format' => @@ -2352,7 +2352,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YCbCrCoefficients', 'title' => 'Y Cb Cr Coefficients', 'components' => 3, @@ -2369,7 +2369,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\IfdYCbCrSubSampling', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YCbCrSubSampling', 'title' => 'Y Cb Cr Sub Sampling', 'components' => 2, @@ -2400,7 +2400,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YCbCrPositioning', 'title' => 'Y Cb Cr Positioning', 'format' => @@ -2424,7 +2424,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 6, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReferenceBlackWhite', 'title' => 'Reference Black White', 'format' => @@ -2441,7 +2441,7 @@ class Ifd0 extends CollectionBase { array ( '__todo' => 'add ifd for XMP tags', 'entryClass' => 'FileEye\\MediaProbe\\Entry\\IfdApplicationNotes', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ApplicationNotes', 'title' => 'Application Notes', 'format' => @@ -2457,7 +2457,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Rating', 'title' => 'Rating', 'format' => @@ -2472,7 +2472,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RatingPercent', 'title' => 'Rating Percent', 'format' => @@ -2487,7 +2487,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\IfdCopyright', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Copyright', 'title' => 'Copyright', 'format' => @@ -2502,7 +2502,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IPTC-NAA', 'title' => 'IPTC-NAA', 'format' => @@ -2517,7 +2517,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SEMInfo', 'title' => 'SEM Info', 'format' => @@ -2539,7 +2539,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GeoTiffDirectory', 'title' => 'Geo Tiff Directory', 'format' => @@ -2553,7 +2553,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GeoTiffDoubleParams', 'title' => 'Geo Tiff Double Params', 'format' => @@ -2567,7 +2567,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GeoTiffAsciiParams', 'title' => 'Geo Tiff Ascii Params', 'format' => @@ -2589,7 +2589,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageSourceData', 'title' => 'Image Source Data', 'format' => @@ -2605,7 +2605,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPTitle', 'title' => 'XP Title', 'format' => @@ -2621,7 +2621,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPComment', 'title' => 'XP Comment', 'format' => @@ -2637,7 +2637,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPAuthor', 'title' => 'XP Author', 'format' => @@ -2653,7 +2653,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPKeywords', 'title' => 'XP Keywords', 'format' => @@ -2669,7 +2669,7 @@ class Ifd0 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPSubject', 'title' => 'XP Subject', 'format' => @@ -2684,7 +2684,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PrintIM', 'title' => 'Print Image Matching', 'format' => @@ -2697,7 +2697,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGVersion', 'title' => 'DNG Version', 'components' => 4, @@ -2712,7 +2712,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGBackwardVersion', 'title' => 'DNG Backward Version', 'components' => 4, @@ -2727,7 +2727,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UniqueCameraModel', 'title' => 'Unique Camera Model', 'format' => @@ -2741,7 +2741,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LocalizedCameraModel', 'title' => 'Localized Camera Model', 'format' => @@ -2755,7 +2755,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMatrix1', 'title' => 'Color Matrix 1', 'format' => @@ -2769,7 +2769,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMatrix2', 'title' => 'Color Matrix 2', 'format' => @@ -2783,7 +2783,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraCalibration1', 'title' => 'Camera Calibration 1', 'format' => @@ -2797,7 +2797,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraCalibration2', 'title' => 'Camera Calibration 2', 'format' => @@ -2811,7 +2811,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReductionMatrix1', 'title' => 'Reduction Matrix 1', 'format' => @@ -2825,7 +2825,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReductionMatrix2', 'title' => 'Reduction Matrix 2', 'format' => @@ -2839,7 +2839,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AnalogBalance', 'title' => 'Analog Balance', 'format' => @@ -2853,7 +2853,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotNeutral', 'title' => 'As Shot Neutral', 'format' => @@ -2867,7 +2867,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotWhiteXY', 'title' => 'As Shot White XY', 'components' => 2, @@ -2882,7 +2882,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineExposure', 'title' => 'Baseline Exposure', 'format' => @@ -2896,7 +2896,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineNoise', 'title' => 'Baseline Noise', 'format' => @@ -2910,7 +2910,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineSharpness', 'title' => 'Baseline Sharpness', 'format' => @@ -2924,7 +2924,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearResponseLimit', 'title' => 'Linear Response Limit', 'format' => @@ -2938,7 +2938,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraSerialNumber', 'title' => 'Camera Serial Number', 'format' => @@ -2952,7 +2952,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGLensInfo', 'title' => 'DNG Lens Info', 'components' => 4, @@ -2967,7 +2967,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShadowScale', 'title' => 'Shadow Scale', 'format' => @@ -2981,7 +2981,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGAdobeData', 'title' => 'DNG Adobe Data', 'format' => @@ -2992,7 +2992,7 @@ class Ifd0 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGPrivateData', 'title' => 'DNG Private Data', 'format' => @@ -3006,7 +3006,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MakerNoteSafety', 'title' => 'Maker Note Safety', 'format' => @@ -3028,7 +3028,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CalibrationIlluminant1', 'title' => 'Calibration Illuminant 1', 'format' => @@ -3070,7 +3070,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CalibrationIlluminant2', 'title' => 'Calibration Illuminant 2', 'format' => @@ -3112,7 +3112,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawDataUniqueID', 'title' => 'Raw Data Unique ID', 'components' => 16, @@ -3127,7 +3127,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalRawFileName', 'title' => 'Original Raw File Name', 'format' => @@ -3141,7 +3141,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalRawFileData', 'title' => 'Original Raw File Data', 'format' => @@ -3155,7 +3155,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotICCProfile', 'title' => 'As Shot ICC Profile', 'format' => @@ -3169,7 +3169,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotPreProfileMatrix', 'title' => 'As Shot Pre Profile Matrix', 'format' => @@ -3183,7 +3183,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CurrentICCProfile', 'title' => 'Current ICC Profile', 'format' => @@ -3197,7 +3197,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CurrentPreProfileMatrix', 'title' => 'Current Pre Profile Matrix', 'format' => @@ -3211,7 +3211,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorimetricReference', 'title' => 'Colorimetric Reference', 'format' => @@ -3225,7 +3225,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SRawType', 'title' => 'SRaw Type', 'format' => @@ -3239,7 +3239,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PanasonicTitle', 'title' => 'Panasonic Title', 'format' => @@ -3253,7 +3253,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PanasonicTitle2', 'title' => 'Panasonic Title 2', 'format' => @@ -3267,7 +3267,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraCalibrationSig', 'title' => 'Camera Calibration Sig', 'format' => @@ -3281,7 +3281,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileCalibrationSig', 'title' => 'Profile Calibration Sig', 'format' => @@ -3295,7 +3295,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotProfileName', 'title' => 'As Shot Profile Name', 'format' => @@ -3309,7 +3309,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileName', 'title' => 'Profile Name', 'format' => @@ -3323,7 +3323,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapDims', 'title' => 'Profile Hue Sat Map Dims', 'components' => 3, @@ -3338,7 +3338,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapData1', 'title' => 'Profile Hue Sat Map Data 1', 'format' => @@ -3352,7 +3352,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapData2', 'title' => 'Profile Hue Sat Map Data 2', 'format' => @@ -3366,7 +3366,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileToneCurve', 'title' => 'Profile Tone Curve', 'format' => @@ -3380,7 +3380,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileEmbedPolicy', 'title' => 'Profile Embed Policy', 'format' => @@ -3404,7 +3404,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileCopyright', 'title' => 'Profile Copyright', 'format' => @@ -3418,7 +3418,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ForwardMatrix1', 'title' => 'Forward Matrix 1', 'format' => @@ -3432,7 +3432,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ForwardMatrix2', 'title' => 'Forward Matrix 2', 'format' => @@ -3446,7 +3446,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewApplicationName', 'title' => 'Preview Application Name', 'format' => @@ -3460,7 +3460,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewApplicationVersion', 'title' => 'Preview Application Version', 'format' => @@ -3474,7 +3474,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewSettingsName', 'title' => 'Preview Settings Name', 'format' => @@ -3488,7 +3488,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewSettingsDigest', 'title' => 'Preview Settings Digest', 'format' => @@ -3502,7 +3502,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewColorSpace', 'title' => 'Preview Color Space', 'format' => @@ -3527,7 +3527,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewDateTime', 'title' => 'Preview Date Time', 'format' => @@ -3541,7 +3541,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawImageDigest', 'title' => 'Raw Image Digest', 'components' => 16, @@ -3556,7 +3556,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalRawFileDigest', 'title' => 'Original Raw File Digest', 'components' => 16, @@ -3571,7 +3571,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileLookTableDims', 'title' => 'Profile Look Table Dims', 'components' => 3, @@ -3586,7 +3586,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileLookTableData', 'title' => 'Profile Look Table Data', 'format' => @@ -3600,7 +3600,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeCodes', 'title' => 'Time Codes', 'format' => @@ -3614,7 +3614,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FrameRate', 'title' => 'Frame Rate', 'format' => @@ -3628,7 +3628,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TStop', 'title' => 'T Stop', 'format' => @@ -3642,7 +3642,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReelName', 'title' => 'Reel Name', 'format' => @@ -3656,7 +3656,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalDefaultFinalSize', 'title' => 'Original Default Final Size', 'components' => 2, @@ -3671,7 +3671,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalBestQualitySize', 'title' => 'Original Best Quality Size', 'components' => 2, @@ -3686,7 +3686,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalDefaultCropSize', 'title' => 'Original Default Crop Size', 'components' => 2, @@ -3701,7 +3701,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraLabel', 'title' => 'Camera Label', 'format' => @@ -3715,7 +3715,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapEncoding', 'title' => 'Profile Hue Sat Map Encoding', 'format' => @@ -3737,7 +3737,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileLookTableEncoding', 'title' => 'Profile Look Table Encoding', 'format' => @@ -3759,7 +3759,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineExposureOffset', 'title' => 'Baseline Exposure Offset', 'format' => @@ -3773,7 +3773,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultBlackRender', 'title' => 'Default Black Render', 'format' => @@ -3795,7 +3795,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NewRawImageDigest', 'title' => 'New Raw Image Digest', 'components' => 16, @@ -3810,7 +3810,7 @@ class Ifd0 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawToPreviewGain', 'title' => 'Raw To Preview Gain', 'format' => diff --git a/src/Collection/Tiff/Ifd1.php b/src/Collection/Tiff/Ifd1.php index a3d537354..a5d5d47c2 100644 --- a/src/Collection/Tiff/Ifd1.php +++ b/src/Collection/Tiff/Ifd1.php @@ -15,9 +15,9 @@ class Ifd1 extends CollectionBase { protected static $map = array ( 'name' => 'IFD1', 'title' => 'IFD1', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd', 'DOMNode' => 'ifd', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'alias' => array ( 0 => '1', @@ -25,7 +25,7 @@ class Ifd1 extends CollectionBase { ), 'postParse' => array ( - 0 => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd::thumbnailToBlock', + 0 => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd::thumbnailToBlock', ), 'id' => 'Tiff\\Ifd1', 'itemsByName' => @@ -1403,7 +1403,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProcessingSoftware', 'title' => 'Processing Software', 'format' => @@ -1418,7 +1418,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubfileType', 'title' => 'Subfile Type', 'format' => @@ -1440,7 +1440,7 @@ class Ifd1 extends CollectionBase { 8 => 'TIFF/IT final page', 16 => 'TIFF-FX mixed raster content', 65537 => 'Alternate reduced-resolution image', - '4294967295' => 'invalid', + 4294967295 => 'invalid', ), ), 'phpExifTag' => 'THUMBNAIL::NewSubFile', @@ -1451,7 +1451,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OldSubfileType', 'title' => 'Old Subfile Type', 'format' => @@ -1481,7 +1481,7 @@ class Ifd1 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageWidth', 'title' => 'Image Width', 'phpExifTag' => 'THUMBNAIL::ImageWidth', @@ -1498,7 +1498,7 @@ class Ifd1 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHeight', 'title' => 'Image Height', 'phpExifTag' => 'THUMBNAIL::ImageLength', @@ -1509,7 +1509,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BitsPerSample', 'title' => 'Bits Per Sample', 'format' => @@ -1581,7 +1581,7 @@ class Ifd1 extends CollectionBase { 65535 => 'Pentax PEF Compressed', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Compression', 'title' => 'Compression', 'format' => @@ -1597,7 +1597,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PhotometricInterpretation', 'title' => 'Photometric Interpretation', 'format' => @@ -1633,7 +1633,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Thresholding', 'title' => 'Thresholding', 'format' => @@ -1656,7 +1656,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CellWidth', 'title' => 'Cell Width', 'format' => @@ -1670,7 +1670,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CellLength', 'title' => 'Cell Length', 'format' => @@ -1684,7 +1684,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FillOrder', 'title' => 'Fill Order', 'format' => @@ -1707,7 +1707,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DocumentName', 'title' => 'Document Name', 'format' => @@ -1722,7 +1722,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageDescription', 'title' => 'Image Description', 'format' => @@ -1737,7 +1737,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Make', 'title' => 'Make', 'format' => @@ -1752,7 +1752,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Model', 'title' => 'Camera Model Name', 'format' => @@ -1772,7 +1772,7 @@ class Ifd1 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageStart', 'title' => 'Preview Image Start', 'phpExifTag' => 'THUMBNAIL::StripOffsets', @@ -1784,7 +1784,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Orientation', 'title' => 'Orientation', 'format' => @@ -1814,7 +1814,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamplesPerPixel', 'title' => 'Samples Per Pixel', 'format' => @@ -1835,7 +1835,7 @@ class Ifd1 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RowsPerStrip', 'title' => 'Rows Per Strip', 'phpExifTag' => 'THUMBNAIL::RowsPerStrip', @@ -1851,7 +1851,7 @@ class Ifd1 extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageLength', 'title' => 'Preview Image Length', 'phpExifTag' => 'THUMBNAIL::StripByteCounts', @@ -1862,7 +1862,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinSampleValue', 'title' => 'Min Sample Value', 'format' => @@ -1877,7 +1877,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxSampleValue', 'title' => 'Max Sample Value', 'format' => @@ -1893,7 +1893,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XResolution', 'title' => 'X Resolution', 'format' => @@ -1909,7 +1909,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YResolution', 'title' => 'Y Resolution', 'format' => @@ -1925,7 +1925,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PlanarConfiguration', 'title' => 'Planar Configuration', 'format' => @@ -1948,7 +1948,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PageName', 'title' => 'Page Name', 'format' => @@ -1963,7 +1963,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPosition', 'title' => 'X Position', 'format' => @@ -1978,7 +1978,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YPosition', 'title' => 'Y Position', 'format' => @@ -1993,7 +1993,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GrayResponseUnit', 'title' => 'Gray Response Unit', 'format' => @@ -2020,7 +2020,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ResolutionUnit', 'title' => 'Resolution Unit', 'format' => @@ -2044,7 +2044,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PageNumber', 'title' => 'Page Number', 'components' => 2, @@ -2060,7 +2060,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TransferFunction', 'title' => 'Transfer Function', 'components' => 768, @@ -2076,7 +2076,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Software', 'title' => 'Software', 'format' => @@ -2093,7 +2093,7 @@ class Ifd1 extends CollectionBase { array ( 'components' => 20, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Time', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifyDate', 'title' => 'Modify Date', 'format' => @@ -2108,7 +2108,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Artist', 'title' => 'Artist', 'format' => @@ -2123,7 +2123,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HostComputer', 'title' => 'Host Computer', 'format' => @@ -2139,7 +2139,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Predictor', 'title' => 'Predictor', 'format' => @@ -2162,7 +2162,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhitePoint', 'title' => 'White Point', 'components' => 2, @@ -2178,7 +2178,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PrimaryChromaticities', 'title' => 'Primary Chromaticities', 'components' => 6, @@ -2194,7 +2194,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HalftoneHints', 'title' => 'Halftone Hints', 'components' => 2, @@ -2210,7 +2210,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileWidth', 'title' => 'Tile Width', 'format' => @@ -2225,7 +2225,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileLength', 'title' => 'Tile Length', 'format' => @@ -2240,7 +2240,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'A100DataOffset', 'title' => 'A100 Data Offset', 'format' => @@ -2255,7 +2255,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InkSet', 'title' => 'Ink Set', 'format' => @@ -2278,7 +2278,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TargetPrinter', 'title' => 'Target Printer', 'format' => @@ -2294,7 +2294,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailOffset', 'title' => 'Thumbnail Offset', 'format' => @@ -2307,7 +2307,7 @@ class Ifd1 extends CollectionBase { 1 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailOffset', 'title' => 'Thumbnail Offset', 'format' => @@ -2320,7 +2320,7 @@ class Ifd1 extends CollectionBase { 2 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageStart', 'title' => 'Preview Image Start', 'format' => @@ -2336,7 +2336,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailLength', 'title' => 'Thumbnail Length', 'format' => @@ -2349,7 +2349,7 @@ class Ifd1 extends CollectionBase { 1 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailLength', 'title' => 'Thumbnail Length', 'format' => @@ -2362,7 +2362,7 @@ class Ifd1 extends CollectionBase { 2 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageLength', 'title' => 'Preview Image Length', 'format' => @@ -2377,7 +2377,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YCbCrCoefficients', 'title' => 'Y Cb Cr Coefficients', 'components' => 3, @@ -2394,7 +2394,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\IfdYCbCrSubSampling', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YCbCrSubSampling', 'title' => 'Y Cb Cr Sub Sampling', 'components' => 2, @@ -2425,7 +2425,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YCbCrPositioning', 'title' => 'Y Cb Cr Positioning', 'format' => @@ -2449,7 +2449,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 6, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReferenceBlackWhite', 'title' => 'Reference Black White', 'format' => @@ -2466,7 +2466,7 @@ class Ifd1 extends CollectionBase { array ( '__todo' => 'add ifd for XMP tags', 'entryClass' => 'FileEye\\MediaProbe\\Entry\\IfdApplicationNotes', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ApplicationNotes', 'title' => 'Application Notes', 'format' => @@ -2482,7 +2482,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Rating', 'title' => 'Rating', 'format' => @@ -2497,7 +2497,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RatingPercent', 'title' => 'Rating Percent', 'format' => @@ -2512,7 +2512,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\IfdCopyright', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Copyright', 'title' => 'Copyright', 'format' => @@ -2527,7 +2527,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IPTC-NAA', 'title' => 'IPTC-NAA', 'format' => @@ -2542,7 +2542,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SEMInfo', 'title' => 'SEM Info', 'format' => @@ -2564,7 +2564,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GeoTiffDirectory', 'title' => 'Geo Tiff Directory', 'format' => @@ -2578,7 +2578,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GeoTiffDoubleParams', 'title' => 'Geo Tiff Double Params', 'format' => @@ -2592,7 +2592,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GeoTiffAsciiParams', 'title' => 'Geo Tiff Ascii Params', 'format' => @@ -2614,7 +2614,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageSourceData', 'title' => 'Image Source Data', 'format' => @@ -2630,7 +2630,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPTitle', 'title' => 'XP Title', 'format' => @@ -2646,7 +2646,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPComment', 'title' => 'XP Comment', 'format' => @@ -2662,7 +2662,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPAuthor', 'title' => 'XP Author', 'format' => @@ -2678,7 +2678,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPKeywords', 'title' => 'XP Keywords', 'format' => @@ -2694,7 +2694,7 @@ class Ifd1 extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPSubject', 'title' => 'XP Subject', 'format' => @@ -2709,7 +2709,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PrintIM', 'title' => 'Print Image Matching', 'format' => @@ -2722,7 +2722,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGVersion', 'title' => 'DNG Version', 'components' => 4, @@ -2737,7 +2737,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGBackwardVersion', 'title' => 'DNG Backward Version', 'components' => 4, @@ -2752,7 +2752,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UniqueCameraModel', 'title' => 'Unique Camera Model', 'format' => @@ -2766,7 +2766,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LocalizedCameraModel', 'title' => 'Localized Camera Model', 'format' => @@ -2780,7 +2780,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMatrix1', 'title' => 'Color Matrix 1', 'format' => @@ -2794,7 +2794,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMatrix2', 'title' => 'Color Matrix 2', 'format' => @@ -2808,7 +2808,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraCalibration1', 'title' => 'Camera Calibration 1', 'format' => @@ -2822,7 +2822,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraCalibration2', 'title' => 'Camera Calibration 2', 'format' => @@ -2836,7 +2836,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReductionMatrix1', 'title' => 'Reduction Matrix 1', 'format' => @@ -2850,7 +2850,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReductionMatrix2', 'title' => 'Reduction Matrix 2', 'format' => @@ -2864,7 +2864,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AnalogBalance', 'title' => 'Analog Balance', 'format' => @@ -2878,7 +2878,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotNeutral', 'title' => 'As Shot Neutral', 'format' => @@ -2892,7 +2892,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotWhiteXY', 'title' => 'As Shot White XY', 'components' => 2, @@ -2907,7 +2907,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineExposure', 'title' => 'Baseline Exposure', 'format' => @@ -2921,7 +2921,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineNoise', 'title' => 'Baseline Noise', 'format' => @@ -2935,7 +2935,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineSharpness', 'title' => 'Baseline Sharpness', 'format' => @@ -2949,7 +2949,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearResponseLimit', 'title' => 'Linear Response Limit', 'format' => @@ -2963,7 +2963,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraSerialNumber', 'title' => 'Camera Serial Number', 'format' => @@ -2977,7 +2977,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGLensInfo', 'title' => 'DNG Lens Info', 'components' => 4, @@ -2992,7 +2992,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShadowScale', 'title' => 'Shadow Scale', 'format' => @@ -3006,7 +3006,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGAdobeData', 'title' => 'DNG Adobe Data', 'format' => @@ -3017,7 +3017,7 @@ class Ifd1 extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGPrivateData', 'title' => 'DNG Private Data', 'format' => @@ -3031,7 +3031,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MakerNoteSafety', 'title' => 'Maker Note Safety', 'format' => @@ -3053,7 +3053,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CalibrationIlluminant1', 'title' => 'Calibration Illuminant 1', 'format' => @@ -3095,7 +3095,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CalibrationIlluminant2', 'title' => 'Calibration Illuminant 2', 'format' => @@ -3137,7 +3137,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawDataUniqueID', 'title' => 'Raw Data Unique ID', 'components' => 16, @@ -3152,7 +3152,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalRawFileName', 'title' => 'Original Raw File Name', 'format' => @@ -3166,7 +3166,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalRawFileData', 'title' => 'Original Raw File Data', 'format' => @@ -3180,7 +3180,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotICCProfile', 'title' => 'As Shot ICC Profile', 'format' => @@ -3194,7 +3194,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotPreProfileMatrix', 'title' => 'As Shot Pre Profile Matrix', 'format' => @@ -3208,7 +3208,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CurrentICCProfile', 'title' => 'Current ICC Profile', 'format' => @@ -3222,7 +3222,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CurrentPreProfileMatrix', 'title' => 'Current Pre Profile Matrix', 'format' => @@ -3236,7 +3236,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorimetricReference', 'title' => 'Colorimetric Reference', 'format' => @@ -3250,7 +3250,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SRawType', 'title' => 'SRaw Type', 'format' => @@ -3264,7 +3264,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PanasonicTitle', 'title' => 'Panasonic Title', 'format' => @@ -3278,7 +3278,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PanasonicTitle2', 'title' => 'Panasonic Title 2', 'format' => @@ -3292,7 +3292,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraCalibrationSig', 'title' => 'Camera Calibration Sig', 'format' => @@ -3306,7 +3306,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileCalibrationSig', 'title' => 'Profile Calibration Sig', 'format' => @@ -3320,7 +3320,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotProfileName', 'title' => 'As Shot Profile Name', 'format' => @@ -3334,7 +3334,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileName', 'title' => 'Profile Name', 'format' => @@ -3348,7 +3348,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapDims', 'title' => 'Profile Hue Sat Map Dims', 'components' => 3, @@ -3363,7 +3363,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapData1', 'title' => 'Profile Hue Sat Map Data 1', 'format' => @@ -3377,7 +3377,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapData2', 'title' => 'Profile Hue Sat Map Data 2', 'format' => @@ -3391,7 +3391,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileToneCurve', 'title' => 'Profile Tone Curve', 'format' => @@ -3405,7 +3405,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileEmbedPolicy', 'title' => 'Profile Embed Policy', 'format' => @@ -3429,7 +3429,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileCopyright', 'title' => 'Profile Copyright', 'format' => @@ -3443,7 +3443,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ForwardMatrix1', 'title' => 'Forward Matrix 1', 'format' => @@ -3457,7 +3457,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ForwardMatrix2', 'title' => 'Forward Matrix 2', 'format' => @@ -3471,7 +3471,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewApplicationName', 'title' => 'Preview Application Name', 'format' => @@ -3485,7 +3485,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewApplicationVersion', 'title' => 'Preview Application Version', 'format' => @@ -3499,7 +3499,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewSettingsName', 'title' => 'Preview Settings Name', 'format' => @@ -3513,7 +3513,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewSettingsDigest', 'title' => 'Preview Settings Digest', 'format' => @@ -3527,7 +3527,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewColorSpace', 'title' => 'Preview Color Space', 'format' => @@ -3552,7 +3552,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewDateTime', 'title' => 'Preview Date Time', 'format' => @@ -3566,7 +3566,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawImageDigest', 'title' => 'Raw Image Digest', 'components' => 16, @@ -3581,7 +3581,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalRawFileDigest', 'title' => 'Original Raw File Digest', 'components' => 16, @@ -3596,7 +3596,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileLookTableDims', 'title' => 'Profile Look Table Dims', 'components' => 3, @@ -3611,7 +3611,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileLookTableData', 'title' => 'Profile Look Table Data', 'format' => @@ -3625,7 +3625,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeCodes', 'title' => 'Time Codes', 'format' => @@ -3639,7 +3639,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FrameRate', 'title' => 'Frame Rate', 'format' => @@ -3653,7 +3653,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TStop', 'title' => 'T Stop', 'format' => @@ -3667,7 +3667,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReelName', 'title' => 'Reel Name', 'format' => @@ -3681,7 +3681,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalDefaultFinalSize', 'title' => 'Original Default Final Size', 'components' => 2, @@ -3696,7 +3696,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalBestQualitySize', 'title' => 'Original Best Quality Size', 'components' => 2, @@ -3711,7 +3711,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalDefaultCropSize', 'title' => 'Original Default Crop Size', 'components' => 2, @@ -3726,7 +3726,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraLabel', 'title' => 'Camera Label', 'format' => @@ -3740,7 +3740,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapEncoding', 'title' => 'Profile Hue Sat Map Encoding', 'format' => @@ -3762,7 +3762,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileLookTableEncoding', 'title' => 'Profile Look Table Encoding', 'format' => @@ -3784,7 +3784,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineExposureOffset', 'title' => 'Baseline Exposure Offset', 'format' => @@ -3798,7 +3798,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultBlackRender', 'title' => 'Default Black Render', 'format' => @@ -3820,7 +3820,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NewRawImageDigest', 'title' => 'New Raw Image Digest', 'components' => 16, @@ -3835,7 +3835,7 @@ class Ifd1 extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawToPreviewGain', 'title' => 'Raw To Preview Gain', 'format' => diff --git a/src/Collection/Tiff/IfdAny.php b/src/Collection/Tiff/IfdAny.php index f88d799ee..dca70f79e 100644 --- a/src/Collection/Tiff/IfdAny.php +++ b/src/Collection/Tiff/IfdAny.php @@ -14,8 +14,8 @@ class IfdAny extends CollectionBase { protected static $map = array ( 'title' => 'A catchall generic IFD definition, used as a fallback to describe tags that are not expected in a specific IFD.', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd', - 'defaultItemCollection' => 'Tag', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'Tiff\\IfdAny', 'itemsByName' => array ( @@ -3603,7 +3603,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InteropIndex', 'title' => 'Interoperability Index', 'format' => @@ -3628,7 +3628,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 4, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Version', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InteropVersion', 'title' => 'Interoperability Version', 'format' => @@ -3642,7 +3642,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProcessingSoftware', 'title' => 'Processing Software', 'format' => @@ -3657,7 +3657,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubfileType', 'title' => 'Subfile Type', 'format' => @@ -3679,7 +3679,7 @@ class IfdAny extends CollectionBase { 8 => 'TIFF/IT final page', 16 => 'TIFF-FX mixed raster content', 65537 => 'Alternate reduced-resolution image', - '4294967295' => 'invalid', + 4294967295 => 'invalid', ), ), 'phpExifTag' => 'NewSubFile', @@ -3690,7 +3690,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OldSubfileType', 'title' => 'Old Subfile Type', 'format' => @@ -3714,7 +3714,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageWidth', 'title' => 'Image Width', 'format' => @@ -3729,7 +3729,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHeight', 'title' => 'Image Height', 'format' => @@ -3744,7 +3744,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BitsPerSample', 'title' => 'Bits Per Sample', 'format' => @@ -3815,7 +3815,7 @@ class IfdAny extends CollectionBase { 65535 => 'Pentax PEF Compressed', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Compression', 'title' => 'Compression', 'format' => @@ -3830,7 +3830,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PhotometricInterpretation', 'title' => 'Photometric Interpretation', 'format' => @@ -3866,7 +3866,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Thresholding', 'title' => 'Thresholding', 'format' => @@ -3889,7 +3889,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CellWidth', 'title' => 'Cell Width', 'format' => @@ -3903,7 +3903,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CellLength', 'title' => 'Cell Length', 'format' => @@ -3917,7 +3917,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FillOrder', 'title' => 'Fill Order', 'format' => @@ -3940,7 +3940,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DocumentName', 'title' => 'Document Name', 'format' => @@ -3955,7 +3955,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageDescription', 'title' => 'Image Description', 'format' => @@ -3970,7 +3970,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Make', 'title' => 'Make', 'format' => @@ -3985,7 +3985,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Model', 'title' => 'Camera Model Name', 'format' => @@ -4000,7 +4000,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripOffsets', 'title' => 'Strip Offsets', 'format' => @@ -4012,7 +4012,7 @@ class IfdAny extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripOffsets', 'title' => 'Strip Offsets', 'format' => @@ -4024,7 +4024,7 @@ class IfdAny extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageStart', 'title' => 'Preview Image Start', 'format' => @@ -4036,7 +4036,7 @@ class IfdAny extends CollectionBase { ), 3 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageStart', 'title' => 'Preview Image Start', 'format' => @@ -4048,7 +4048,7 @@ class IfdAny extends CollectionBase { ), 4 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JpgFromRawStart', 'title' => 'Jpg From Raw Start', 'format' => @@ -4063,7 +4063,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Orientation', 'title' => 'Orientation', 'format' => @@ -4092,7 +4092,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamplesPerPixel', 'title' => 'Samples Per Pixel', 'format' => @@ -4107,7 +4107,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RowsPerStrip', 'title' => 'Rows Per Strip', 'format' => @@ -4122,7 +4122,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripByteCounts', 'title' => 'Strip Byte Counts', 'format' => @@ -4134,7 +4134,7 @@ class IfdAny extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripByteCounts', 'title' => 'Strip Byte Counts', 'format' => @@ -4146,7 +4146,7 @@ class IfdAny extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageLength', 'title' => 'Preview Image Length', 'format' => @@ -4158,7 +4158,7 @@ class IfdAny extends CollectionBase { ), 3 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageLength', 'title' => 'Preview Image Length', 'format' => @@ -4170,7 +4170,7 @@ class IfdAny extends CollectionBase { ), 4 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JpgFromRawLength', 'title' => 'Jpg From Raw Length', 'format' => @@ -4185,7 +4185,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MinSampleValue', 'title' => 'Min Sample Value', 'format' => @@ -4200,7 +4200,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxSampleValue', 'title' => 'Max Sample Value', 'format' => @@ -4215,7 +4215,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XResolution', 'title' => 'X Resolution', 'format' => @@ -4230,7 +4230,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YResolution', 'title' => 'Y Resolution', 'format' => @@ -4245,7 +4245,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PlanarConfiguration', 'title' => 'Planar Configuration', 'format' => @@ -4268,7 +4268,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PageName', 'title' => 'Page Name', 'format' => @@ -4283,7 +4283,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPosition', 'title' => 'X Position', 'format' => @@ -4298,7 +4298,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YPosition', 'title' => 'Y Position', 'format' => @@ -4313,7 +4313,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FreeOffsets', 'title' => 'Free Offsets', 'format' => @@ -4328,7 +4328,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FreeByteCounts', 'title' => 'Free Byte Counts', 'format' => @@ -4343,7 +4343,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GrayResponseUnit', 'title' => 'Gray Response Unit', 'format' => @@ -4369,7 +4369,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GrayResponseCurve', 'title' => 'Gray Response Curve', 'format' => @@ -4384,7 +4384,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'T4Options', 'title' => 'T4 Options', 'format' => @@ -4408,7 +4408,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'T6Options', 'title' => 'T6 Options', 'format' => @@ -4430,7 +4430,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ResolutionUnit', 'title' => 'Resolution Unit', 'format' => @@ -4454,7 +4454,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PageNumber', 'title' => 'Page Number', 'components' => 2, @@ -4470,7 +4470,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorResponseUnit', 'title' => 'Color Response Unit', 'format' => @@ -4484,7 +4484,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TransferFunction', 'title' => 'Transfer Function', 'components' => 768, @@ -4500,7 +4500,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Software', 'title' => 'Software', 'format' => @@ -4517,7 +4517,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 20, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Time', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModifyDate', 'title' => 'Modify Date', 'format' => @@ -4532,7 +4532,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Artist', 'title' => 'Artist', 'format' => @@ -4547,7 +4547,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HostComputer', 'title' => 'Host Computer', 'format' => @@ -4562,7 +4562,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Predictor', 'title' => 'Predictor', 'format' => @@ -4585,7 +4585,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhitePoint', 'title' => 'White Point', 'components' => 2, @@ -4601,7 +4601,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PrimaryChromaticities', 'title' => 'Primary Chromaticities', 'components' => 6, @@ -4617,7 +4617,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMap', 'title' => 'Color Map', 'format' => @@ -4632,7 +4632,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HalftoneHints', 'title' => 'Halftone Hints', 'components' => 2, @@ -4648,7 +4648,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileWidth', 'title' => 'Tile Width', 'format' => @@ -4663,7 +4663,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileLength', 'title' => 'Tile Length', 'format' => @@ -4678,7 +4678,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileOffsets', 'title' => 'Tile Offsets', 'format' => @@ -4693,7 +4693,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileByteCounts', 'title' => 'Tile Byte Counts', 'format' => @@ -4708,7 +4708,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BadFaxLines', 'title' => 'Bad Fax Lines', 'format' => @@ -4722,7 +4722,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CleanFaxData', 'title' => 'Clean Fax Data', 'format' => @@ -4745,7 +4745,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ConsecutiveBadFaxLines', 'title' => 'Consecutive Bad Fax Lines', 'format' => @@ -4759,7 +4759,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'A100DataOffset', 'title' => 'A100 Data Offset', 'format' => @@ -4774,7 +4774,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InkSet', 'title' => 'Ink Set', 'format' => @@ -4797,7 +4797,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InkNames', 'title' => 'Ink Names', 'format' => @@ -4812,7 +4812,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NumberofInks', 'title' => 'Numberof Inks', 'format' => @@ -4827,7 +4827,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DotRange', 'title' => 'Dot Range', 'format' => @@ -4842,7 +4842,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TargetPrinter', 'title' => 'Target Printer', 'format' => @@ -4857,7 +4857,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExtraSamples', 'title' => 'Extra Samples', 'format' => @@ -4881,7 +4881,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SampleFormat', 'title' => 'Sample Format', 'format' => @@ -4908,7 +4908,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SMinSampleValue', 'title' => 'S Min Sample Value', 'format' => @@ -4923,7 +4923,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SMaxSampleValue', 'title' => 'S Max Sample Value', 'format' => @@ -4938,7 +4938,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TransferRange', 'title' => 'Transfer Range', 'format' => @@ -4953,7 +4953,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ClipPath', 'title' => 'Clip Path', 'format' => @@ -4968,7 +4968,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XClipPathUnits', 'title' => 'X Clip Path Units', 'format' => @@ -4983,7 +4983,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YClipPathUnits', 'title' => 'Y Clip Path Units', 'format' => @@ -4998,7 +4998,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Indexed', 'title' => 'Indexed', 'format' => @@ -5021,7 +5021,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGTables', 'title' => 'JPEG Tables', 'format' => @@ -5036,7 +5036,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OPIProxy', 'title' => 'OPI Proxy', 'format' => @@ -5059,7 +5059,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileType', 'title' => 'Profile Type', 'format' => @@ -5081,7 +5081,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaxProfile', 'title' => 'Fax Profile', 'format' => @@ -5110,7 +5110,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CodingMethods', 'title' => 'Coding Methods', 'format' => @@ -5137,7 +5137,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VersionYear', 'title' => 'Version Year', 'format' => @@ -5151,7 +5151,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModeNumber', 'title' => 'Mode Number', 'format' => @@ -5165,7 +5165,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Decode', 'title' => 'Decode', 'format' => @@ -5179,7 +5179,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultImageColor', 'title' => 'Default Image Color', 'format' => @@ -5193,7 +5193,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'T82Options', 'title' => 'T82 Options', 'format' => @@ -5207,7 +5207,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGTables', 'title' => 'JPEG Tables', 'format' => @@ -5221,7 +5221,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGProc', 'title' => 'JPEG Proc', 'format' => @@ -5244,7 +5244,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailOffset', 'title' => 'Thumbnail Offset', 'format' => @@ -5256,7 +5256,7 @@ class IfdAny extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailOffset', 'title' => 'Thumbnail Offset', 'format' => @@ -5268,7 +5268,7 @@ class IfdAny extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailOffset', 'title' => 'Thumbnail Offset', 'format' => @@ -5280,7 +5280,7 @@ class IfdAny extends CollectionBase { ), 3 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageStart', 'title' => 'Preview Image Start', 'format' => @@ -5292,7 +5292,7 @@ class IfdAny extends CollectionBase { ), 4 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageStart', 'title' => 'Preview Image Start', 'format' => @@ -5304,7 +5304,7 @@ class IfdAny extends CollectionBase { ), 5 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JpgFromRawStart', 'title' => 'Jpg From Raw Start', 'format' => @@ -5316,7 +5316,7 @@ class IfdAny extends CollectionBase { ), 6 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JpgFromRawStart', 'title' => 'Jpg From Raw Start', 'format' => @@ -5328,7 +5328,7 @@ class IfdAny extends CollectionBase { ), 7 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OtherImageStart', 'title' => 'Other Image Start', 'format' => @@ -5340,7 +5340,7 @@ class IfdAny extends CollectionBase { ), 8 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OtherImageStart', 'title' => 'Other Image Start', 'format' => @@ -5352,7 +5352,7 @@ class IfdAny extends CollectionBase { ), 9 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OtherImageStart', 'title' => 'Other Image Start', 'format' => @@ -5367,7 +5367,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailLength', 'title' => 'Thumbnail Length', 'format' => @@ -5379,7 +5379,7 @@ class IfdAny extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailLength', 'title' => 'Thumbnail Length', 'format' => @@ -5391,7 +5391,7 @@ class IfdAny extends CollectionBase { ), 2 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ThumbnailLength', 'title' => 'Thumbnail Length', 'format' => @@ -5403,7 +5403,7 @@ class IfdAny extends CollectionBase { ), 3 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageLength', 'title' => 'Preview Image Length', 'format' => @@ -5415,7 +5415,7 @@ class IfdAny extends CollectionBase { ), 4 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewImageLength', 'title' => 'Preview Image Length', 'format' => @@ -5427,7 +5427,7 @@ class IfdAny extends CollectionBase { ), 5 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JpgFromRawLength', 'title' => 'Jpg From Raw Length', 'format' => @@ -5439,7 +5439,7 @@ class IfdAny extends CollectionBase { ), 6 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JpgFromRawLength', 'title' => 'Jpg From Raw Length', 'format' => @@ -5451,7 +5451,7 @@ class IfdAny extends CollectionBase { ), 7 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OtherImageLength', 'title' => 'Other Image Length', 'format' => @@ -5463,7 +5463,7 @@ class IfdAny extends CollectionBase { ), 8 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OtherImageLength', 'title' => 'Other Image Length', 'format' => @@ -5475,7 +5475,7 @@ class IfdAny extends CollectionBase { ), 9 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OtherImageLength', 'title' => 'Other Image Length', 'format' => @@ -5490,7 +5490,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGRestartInterval', 'title' => 'JPEG Restart Interval', 'format' => @@ -5505,7 +5505,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGLosslessPredictors', 'title' => 'JPEG Lossless Predictors', 'format' => @@ -5520,7 +5520,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGPointTransforms', 'title' => 'JPEG Point Transforms', 'format' => @@ -5535,7 +5535,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGQTables', 'title' => 'JPEGQ Tables', 'format' => @@ -5550,7 +5550,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGDCTables', 'title' => 'JPEGDC Tables', 'format' => @@ -5565,7 +5565,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGACTables', 'title' => 'JPEGAC Tables', 'format' => @@ -5580,7 +5580,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YCbCrCoefficients', 'title' => 'Y Cb Cr Coefficients', 'components' => 3, @@ -5597,7 +5597,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\IfdYCbCrSubSampling', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YCbCrSubSampling', 'title' => 'Y Cb Cr Sub Sampling', 'components' => 2, @@ -5627,7 +5627,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YCbCrPositioning', 'title' => 'Y Cb Cr Positioning', 'format' => @@ -5650,7 +5650,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReferenceBlackWhite', 'title' => 'Reference Black White', 'components' => 6, @@ -5666,7 +5666,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripRowCounts', 'title' => 'Strip Row Counts', 'format' => @@ -5682,7 +5682,7 @@ class IfdAny extends CollectionBase { array ( '__todo' => 'add ifd for XMP tags', 'entryClass' => 'FileEye\\MediaProbe\\Entry\\IfdApplicationNotes', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ApplicationNotes', 'title' => 'Application Notes', 'format' => @@ -5697,7 +5697,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'USPTOMiscellaneous', 'title' => 'USPTO Miscellaneous', 'format' => @@ -5711,7 +5711,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RelatedImageFileFormat', 'title' => 'Related Image File Format', 'format' => @@ -5726,7 +5726,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RelatedImageWidth', 'title' => 'Related Image Width', 'format' => @@ -5740,7 +5740,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RelatedImageHeight', 'title' => 'Related Image Height', 'format' => @@ -5754,7 +5754,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Rating', 'title' => 'Rating', 'format' => @@ -5768,7 +5768,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XP_DIP_XML', 'title' => 'XP DIP XML', 'format' => @@ -5782,7 +5782,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RatingPercent', 'title' => 'Rating Percent', 'format' => @@ -5796,7 +5796,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SonyRawFileType', 'title' => 'Sony Raw File Type', 'format' => @@ -5820,7 +5820,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SonyToneCurve', 'title' => 'Sony Tone Curve', 'format' => @@ -5834,7 +5834,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VignettingCorrection', 'title' => 'Vignetting Correction', 'format' => @@ -5857,7 +5857,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VignettingCorrParams', 'title' => 'Vignetting Corr Params', 'components' => 17, @@ -5872,7 +5872,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationCorrection', 'title' => 'Chromatic Aberration Correction', 'format' => @@ -5895,7 +5895,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaticAberrationCorrParams', 'title' => 'Chromatic Aberration Corr Params', 'components' => 33, @@ -5910,7 +5910,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DistortionCorrection', 'title' => 'Distortion Correction', 'format' => @@ -5934,7 +5934,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DistortionCorrParams', 'title' => 'Distortion Corr Params', 'components' => 17, @@ -5949,7 +5949,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageID', 'title' => 'Image ID', 'format' => @@ -5964,7 +5964,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WangTag1', 'title' => 'Wang Tag 1', 'format' => @@ -5978,7 +5978,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WangAnnotation', 'title' => 'Wang Annotation', 'format' => @@ -5992,7 +5992,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WangTag3', 'title' => 'Wang Tag 3', 'format' => @@ -6006,7 +6006,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WangTag4', 'title' => 'Wang Tag 4', 'format' => @@ -6020,7 +6020,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageReferencePoints', 'title' => 'Image Reference Points', 'format' => @@ -6034,7 +6034,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RegionXformTackPoint', 'title' => 'Region Xform Tack Point', 'format' => @@ -6048,7 +6048,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WarpQuadrilateral', 'title' => 'Warp Quadrilateral', 'format' => @@ -6062,7 +6062,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AffineTransformMat', 'title' => 'Affine Transform Mat', 'format' => @@ -6076,7 +6076,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Matteing', 'title' => 'Matteing', 'format' => @@ -6091,7 +6091,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DataType', 'title' => 'Data Type', 'format' => @@ -6106,7 +6106,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageDepth', 'title' => 'Image Depth', 'format' => @@ -6121,7 +6121,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileDepth', 'title' => 'Tile Depth', 'format' => @@ -6136,7 +6136,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageFullWidth', 'title' => 'Image Full Width', 'format' => @@ -6150,7 +6150,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageFullHeight', 'title' => 'Image Full Height', 'format' => @@ -6164,7 +6164,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TextureFormat', 'title' => 'Texture Format', 'format' => @@ -6178,7 +6178,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WrapModes', 'title' => 'Wrap Modes', 'format' => @@ -6192,7 +6192,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FovCot', 'title' => 'Fov Cot', 'format' => @@ -6206,7 +6206,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MatrixWorldToScreen', 'title' => 'Matrix World To Screen', 'format' => @@ -6220,7 +6220,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MatrixWorldToCamera', 'title' => 'Matrix World To Camera', 'format' => @@ -6234,7 +6234,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Model2', 'title' => 'Model 2', 'format' => @@ -6248,7 +6248,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CFARepeatPatternDim', 'title' => 'CFA Repeat Pattern Dim', 'components' => 2, @@ -6264,7 +6264,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CFAPattern2', 'title' => 'CFA Pattern 2', 'format' => @@ -6279,7 +6279,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BatteryLevel', 'title' => 'Battery Level', 'format' => @@ -6295,7 +6295,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\IfdCopyright', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Copyright', 'title' => 'Copyright', 'format' => @@ -6312,7 +6312,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -6329,7 +6329,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifFNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -6344,7 +6344,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDFileTag', 'title' => 'MD File Tag', 'format' => @@ -6358,7 +6358,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDScalePixel', 'title' => 'MD Scale Pixel', 'format' => @@ -6372,7 +6372,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDColorTable', 'title' => 'MD Color Table', 'format' => @@ -6386,7 +6386,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDLabName', 'title' => 'MD Lab Name', 'format' => @@ -6400,7 +6400,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDSampleInfo', 'title' => 'MD Sample Info', 'format' => @@ -6414,7 +6414,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDPrepDate', 'title' => 'MD Prep Date', 'format' => @@ -6428,7 +6428,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDPrepTime', 'title' => 'MD Prep Time', 'format' => @@ -6442,7 +6442,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDFileUnits', 'title' => 'MD File Units', 'format' => @@ -6456,7 +6456,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PixelScale', 'title' => 'Pixel Scale', 'format' => @@ -6470,7 +6470,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AdventScale', 'title' => 'Advent Scale', 'format' => @@ -6484,7 +6484,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AdventRevision', 'title' => 'Advent Revision', 'format' => @@ -6498,7 +6498,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UIC1Tag', 'title' => 'UIC1 Tag', 'format' => @@ -6512,7 +6512,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UIC2Tag', 'title' => 'UIC2 Tag', 'format' => @@ -6526,7 +6526,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UIC3Tag', 'title' => 'UIC3 Tag', 'format' => @@ -6540,7 +6540,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UIC4Tag', 'title' => 'UIC4 Tag', 'format' => @@ -6554,7 +6554,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IPTC-NAA', 'title' => 'IPTC-NAA', 'format' => @@ -6569,7 +6569,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IntergraphPacketData', 'title' => 'Intergraph Packet Data', 'format' => @@ -6583,7 +6583,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IntergraphFlagRegisters', 'title' => 'Intergraph Flag Registers', 'format' => @@ -6597,7 +6597,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IntergraphMatrix', 'title' => 'Intergraph Matrix', 'format' => @@ -6611,7 +6611,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'INGRReserved', 'title' => 'INGR Reserved', 'format' => @@ -6625,7 +6625,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModelTiePoint', 'title' => 'Model Tie Point', 'format' => @@ -6639,7 +6639,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Site', 'title' => 'Site', 'format' => @@ -6653,7 +6653,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorSequence', 'title' => 'Color Sequence', 'format' => @@ -6667,7 +6667,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IT8Header', 'title' => 'IT8 Header', 'format' => @@ -6681,7 +6681,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RasterPadding', 'title' => 'Raster Padding', 'format' => @@ -6707,7 +6707,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BitsPerRunLength', 'title' => 'Bits Per Run Length', 'format' => @@ -6721,7 +6721,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BitsPerExtendedRunLength', 'title' => 'Bits Per Extended Run Length', 'format' => @@ -6736,7 +6736,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTable', 'title' => 'Color Table', 'format' => @@ -6750,7 +6750,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageColorIndicator', 'title' => 'Image Color Indicator', 'format' => @@ -6772,7 +6772,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BackgroundColorIndicator', 'title' => 'Background Color Indicator', 'format' => @@ -6794,7 +6794,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageColorValue', 'title' => 'Image Color Value', 'format' => @@ -6808,7 +6808,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BackgroundColorValue', 'title' => 'Background Color Value', 'format' => @@ -6822,7 +6822,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PixelIntensityRange', 'title' => 'Pixel Intensity Range', 'format' => @@ -6836,7 +6836,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TransparencyIndicator', 'title' => 'Transparency Indicator', 'format' => @@ -6850,7 +6850,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorCharacterization', 'title' => 'Color Characterization', 'format' => @@ -6864,7 +6864,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HCUsage', 'title' => 'HC Usage', 'format' => @@ -6887,7 +6887,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TrapIndicator', 'title' => 'Trap Indicator', 'format' => @@ -6901,7 +6901,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CMYKEquivalent', 'title' => 'CMYK Equivalent', 'format' => @@ -6915,7 +6915,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SEMInfo', 'title' => 'SEM Info', 'format' => @@ -6929,7 +6929,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PixelMagicJBIGOptions', 'title' => 'Pixel Magic JBIG Options', 'format' => @@ -6943,7 +6943,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPLCartoIFD', 'title' => 'JPL Carto IFD', 'format' => @@ -6957,7 +6957,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModelTransform', 'title' => 'Model Transform', 'format' => @@ -6971,7 +6971,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_GRGBLevels', 'title' => 'WB GRGB Levels', 'format' => @@ -6985,7 +6985,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TIFF_FXExtensions', 'title' => 'TIFF FX Extensions', 'format' => @@ -7010,7 +7010,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MultiProfiles', 'title' => 'Multi Profiles', 'format' => @@ -7041,7 +7041,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharedData', 'title' => 'Shared Data', 'format' => @@ -7055,7 +7055,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'T88Options', 'title' => 'T88 Options', 'format' => @@ -7069,7 +7069,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageLayer', 'title' => 'Image Layer', 'format' => @@ -7083,7 +7083,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GeoTiffDirectory', 'title' => 'Geo Tiff Directory', 'format' => @@ -7097,7 +7097,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GeoTiffDoubleParams', 'title' => 'Geo Tiff Double Params', 'format' => @@ -7111,7 +7111,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GeoTiffAsciiParams', 'title' => 'Geo Tiff Ascii Params', 'format' => @@ -7125,7 +7125,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JBIGOptions', 'title' => 'JBIG Options', 'format' => @@ -7139,7 +7139,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureProgram', 'title' => 'Exposure Program', 'format' => @@ -7170,7 +7170,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpectralSensitivity', 'title' => 'Spectral Sensitivity', 'format' => @@ -7185,7 +7185,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -7200,7 +7200,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Opto-ElectricConvFactor', 'title' => 'Opto-Electric Conv Factor', 'format' => @@ -7215,7 +7215,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Interlace', 'title' => 'Interlace', 'format' => @@ -7229,7 +7229,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeZoneOffset', 'title' => 'Time Zone Offset', 'format' => @@ -7243,7 +7243,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SelfTimerMode', 'title' => 'Self Timer Mode', 'format' => @@ -7257,7 +7257,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensitivityType', 'title' => 'Sensitivity Type', 'format' => @@ -7285,7 +7285,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardOutputSensitivity', 'title' => 'Standard Output Sensitivity', 'format' => @@ -7299,7 +7299,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RecommendedExposureIndex', 'title' => 'Recommended Exposure Index', 'format' => @@ -7313,7 +7313,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOSpeed', 'title' => 'ISO Speed', 'format' => @@ -7327,7 +7327,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOSpeedLatitudeyyy', 'title' => 'ISO Speed Latitude yyy', 'format' => @@ -7341,7 +7341,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOSpeedLatitudezzz', 'title' => 'ISO Speed Latitude zzz', 'format' => @@ -7355,7 +7355,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaxRecvParams', 'title' => 'Fax Recv Params', 'format' => @@ -7369,7 +7369,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaxSubAddress', 'title' => 'Fax Sub Address', 'format' => @@ -7383,7 +7383,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaxRecvTime', 'title' => 'Fax Recv Time', 'format' => @@ -7397,7 +7397,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FedexEDR', 'title' => 'Fedex EDR', 'format' => @@ -7413,7 +7413,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 4, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Version', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExifVersion', 'title' => 'Exif Version', 'format' => @@ -7430,7 +7430,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 20, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Time', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DateTimeOriginal', 'title' => 'Date/Time Original', 'format' => @@ -7447,7 +7447,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 20, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Time', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CreateDate', 'title' => 'Create Date', 'format' => @@ -7462,7 +7462,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GooglePlusUploadCode', 'title' => 'Google Plus Upload Code', 'format' => @@ -7476,7 +7476,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OffsetTime', 'title' => 'Offset Time', 'format' => @@ -7490,7 +7490,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OffsetTimeOriginal', 'title' => 'Offset Time Original', 'format' => @@ -7504,7 +7504,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OffsetTimeDigitized', 'title' => 'Offset Time Digitized', 'format' => @@ -7520,7 +7520,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 4, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifComponentsConfiguration', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ComponentsConfiguration', 'title' => 'Components Configuration', 'format' => @@ -7548,7 +7548,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CompressedBitsPerPixel', 'title' => 'Compressed Bits Per Pixel', 'format' => @@ -7565,7 +7565,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifShutterSpeedValue', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterSpeedValue', 'title' => 'Shutter Speed Value', 'format' => @@ -7582,7 +7582,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifApertureValue', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ApertureValue', 'title' => 'Aperture Value', 'format' => @@ -7598,7 +7598,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BrightnessValue', 'title' => 'Brightness Value', 'format' => @@ -7615,7 +7615,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifExposureBiasValue', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureCompensation', 'title' => 'Exposure Compensation', 'format' => @@ -7632,7 +7632,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifApertureValue', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxApertureValue', 'title' => 'Max Aperture Value', 'format' => @@ -7649,7 +7649,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifSubjectDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubjectDistance', 'title' => 'Subject Distance', 'format' => @@ -7664,7 +7664,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeteringMode', 'title' => 'Metering Mode', 'format' => @@ -7693,7 +7693,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LightSource', 'title' => 'Light Source', 'format' => @@ -7736,7 +7736,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Flash', 'title' => 'Flash', 'format' => @@ -7786,7 +7786,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifFocalLength', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -7801,7 +7801,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashEnergy', 'title' => 'Flash Energy', 'format' => @@ -7816,7 +7816,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpatialFrequencyResponse', 'title' => 'Spatial Frequency Response', 'format' => @@ -7831,7 +7831,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Noise', 'title' => 'Noise', 'format' => @@ -7846,7 +7846,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneXResolution', 'title' => 'Focal Plane X Resolution', 'format' => @@ -7861,7 +7861,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneYResolution', 'title' => 'Focal Plane Y Resolution', 'format' => @@ -7876,7 +7876,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneResolutionUnit', 'title' => 'Focal Plane Resolution Unit', 'format' => @@ -7902,7 +7902,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageNumber', 'title' => 'Image Number', 'format' => @@ -7917,7 +7917,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SecurityClassification', 'title' => 'Security Classification', 'format' => @@ -7943,7 +7943,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHistory', 'title' => 'Image History', 'format' => @@ -7959,7 +7959,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifSubjectArea', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubjectArea', 'title' => 'Subject Area', 'format' => @@ -7974,7 +7974,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureIndex', 'title' => 'Exposure Index', 'format' => @@ -7989,7 +7989,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TIFF-EPStandardID', 'title' => 'TIFF-EP Standard ID', 'format' => @@ -8004,7 +8004,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensingMethod', 'title' => 'Sensing Method', 'format' => @@ -8033,7 +8033,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CIP3DataFile', 'title' => 'CIP3 Data File', 'format' => @@ -8047,7 +8047,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CIP3Sheet', 'title' => 'CIP3 Sheet', 'format' => @@ -8061,7 +8061,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CIP3Side', 'title' => 'CIP3 Side', 'format' => @@ -8075,7 +8075,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StoNits', 'title' => 'Sto Nits', 'format' => @@ -8097,7 +8097,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 1 => array ( @@ -8108,7 +8108,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 2 => array ( @@ -8119,7 +8119,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 3 => array ( @@ -8130,7 +8130,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 4 => array ( @@ -8141,7 +8141,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 5 => array ( @@ -8152,7 +8152,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 6 => array ( @@ -8163,7 +8163,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 7 => array ( @@ -8174,7 +8174,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 8 => array ( @@ -8185,7 +8185,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 9 => array ( @@ -8196,7 +8196,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 10 => array ( @@ -8207,7 +8207,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 11 => array ( @@ -8218,7 +8218,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 12 => array ( @@ -8229,7 +8229,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 13 => array ( @@ -8240,7 +8240,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 14 => array ( @@ -8251,7 +8251,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 15 => array ( @@ -8262,7 +8262,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 16 => array ( @@ -8273,7 +8273,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 17 => array ( @@ -8284,7 +8284,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 18 => array ( @@ -8295,7 +8295,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 19 => array ( @@ -8306,7 +8306,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 20 => array ( @@ -8317,7 +8317,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 21 => array ( @@ -8328,7 +8328,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 22 => array ( @@ -8339,7 +8339,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 23 => array ( @@ -8350,7 +8350,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 24 => array ( @@ -8361,7 +8361,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 25 => array ( @@ -8372,7 +8372,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 26 => array ( @@ -8383,7 +8383,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 27 => array ( @@ -8394,7 +8394,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 28 => array ( @@ -8405,7 +8405,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 29 => array ( @@ -8416,7 +8416,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 30 => array ( @@ -8427,7 +8427,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 31 => array ( @@ -8438,7 +8438,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 32 => array ( @@ -8449,7 +8449,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 33 => array ( @@ -8460,7 +8460,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 34 => array ( @@ -8471,7 +8471,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 35 => array ( @@ -8482,7 +8482,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 36 => array ( @@ -8493,7 +8493,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 37 => array ( @@ -8504,7 +8504,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 38 => array ( @@ -8515,7 +8515,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 39 => array ( @@ -8526,7 +8526,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 40 => array ( @@ -8537,7 +8537,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 41 => array ( @@ -8548,7 +8548,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 42 => array ( @@ -8559,7 +8559,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 43 => array ( @@ -8570,7 +8570,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 44 => array ( @@ -8581,7 +8581,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 45 => array ( @@ -8592,7 +8592,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 46 => array ( @@ -8603,7 +8603,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 47 => array ( @@ -8614,7 +8614,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 48 => array ( @@ -8625,7 +8625,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 49 => array ( @@ -8636,7 +8636,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 50 => array ( @@ -8647,7 +8647,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 51 => array ( @@ -8658,7 +8658,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 52 => array ( @@ -8669,7 +8669,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 53 => array ( @@ -8680,7 +8680,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 54 => array ( @@ -8691,7 +8691,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 55 => array ( @@ -8702,7 +8702,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 56 => array ( @@ -8713,7 +8713,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 57 => array ( @@ -8724,7 +8724,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 58 => array ( @@ -8735,7 +8735,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 59 => array ( @@ -8746,7 +8746,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 60 => array ( @@ -8757,7 +8757,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 61 => array ( @@ -8768,7 +8768,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 62 => array ( @@ -8779,7 +8779,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 63 => array ( @@ -8790,7 +8790,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 64 => array ( @@ -8801,7 +8801,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 65 => array ( @@ -8812,7 +8812,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 66 => array ( @@ -8823,7 +8823,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 67 => array ( @@ -8834,7 +8834,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 68 => array ( @@ -8845,7 +8845,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 69 => array ( @@ -8856,7 +8856,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 70 => array ( @@ -8867,7 +8867,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 71 => array ( @@ -8878,7 +8878,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 72 => array ( @@ -8889,7 +8889,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 73 => array ( @@ -8900,7 +8900,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 74 => array ( @@ -8911,7 +8911,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 75 => array ( @@ -8922,7 +8922,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 76 => array ( @@ -8933,7 +8933,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 77 => array ( @@ -8944,7 +8944,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 78 => array ( @@ -8955,7 +8955,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 79 => array ( @@ -8966,7 +8966,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 80 => array ( @@ -8977,7 +8977,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 81 => array ( @@ -8988,7 +8988,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 82 => array ( @@ -8999,7 +8999,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 83 => array ( @@ -9010,7 +9010,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 84 => array ( @@ -9021,7 +9021,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 85 => array ( @@ -9032,7 +9032,7 @@ class IfdAny extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), ), 37510 => @@ -9040,7 +9040,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifUserComment', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserComment', 'title' => 'User Comment', 'format' => @@ -9055,7 +9055,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubSecTime', 'title' => 'Sub Sec Time', 'format' => @@ -9070,7 +9070,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubSecTimeOriginal', 'title' => 'Sub Sec Time Original', 'format' => @@ -9085,7 +9085,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubSecTimeDigitized', 'title' => 'Sub Sec Time Digitized', 'format' => @@ -9100,7 +9100,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MSDocumentText', 'title' => 'MS Document Text', 'format' => @@ -9114,7 +9114,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MSPropertySetStorage', 'title' => 'MS Property Set Storage', 'format' => @@ -9128,7 +9128,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MSDocumentTextPosition', 'title' => 'MS Document Text Position', 'format' => @@ -9142,7 +9142,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageSourceData', 'title' => 'Image Source Data', 'format' => @@ -9157,7 +9157,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AmbientTemperature', 'title' => 'Ambient Temperature', 'format' => @@ -9171,7 +9171,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Humidity', 'title' => 'Humidity', 'format' => @@ -9185,7 +9185,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Pressure', 'title' => 'Pressure', 'format' => @@ -9199,7 +9199,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WaterDepth', 'title' => 'Water Depth', 'format' => @@ -9213,7 +9213,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Acceleration', 'title' => 'Acceleration', 'format' => @@ -9227,7 +9227,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraElevationAngle', 'title' => 'Camera Elevation Angle', 'format' => @@ -9242,7 +9242,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPTitle', 'title' => 'XP Title', 'format' => @@ -9258,7 +9258,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPComment', 'title' => 'XP Comment', 'format' => @@ -9274,7 +9274,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPAuthor', 'title' => 'XP Author', 'format' => @@ -9290,7 +9290,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPKeywords', 'title' => 'XP Keywords', 'format' => @@ -9306,7 +9306,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\WindowsString', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XPSubject', 'title' => 'XP Subject', 'format' => @@ -9323,7 +9323,7 @@ class IfdAny extends CollectionBase { array ( 'components' => 4, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Version', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashpixVersion', 'title' => 'Flashpix Version', 'format' => @@ -9338,7 +9338,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorSpace', 'title' => 'Color Space', 'format' => @@ -9364,7 +9364,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExifImageWidth', 'title' => 'Exif Image Width', 'format' => @@ -9379,7 +9379,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExifImageHeight', 'title' => 'Exif Image Height', 'format' => @@ -9394,7 +9394,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RelatedSoundFile', 'title' => 'Related Sound File', 'format' => @@ -9409,7 +9409,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamsungRawPointersOffset', 'title' => 'Samsung Raw Pointers Offset', 'format' => @@ -9423,7 +9423,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamsungRawPointersLength', 'title' => 'Samsung Raw Pointers Length', 'format' => @@ -9437,7 +9437,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamsungRawByteOrder', 'title' => 'Samsung Raw Byte Order', 'format' => @@ -9451,7 +9451,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamsungRawUnknown', 'title' => 'Samsung Raw Unknown', 'format' => @@ -9465,7 +9465,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashEnergy', 'title' => 'Flash Energy', 'format' => @@ -9480,7 +9480,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpatialFrequencyResponse', 'title' => 'Spatial Frequency Response', 'format' => @@ -9495,7 +9495,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Noise', 'title' => 'Noise', 'format' => @@ -9510,7 +9510,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneXResolution', 'title' => 'Focal Plane X Resolution', 'format' => @@ -9525,7 +9525,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneYResolution', 'title' => 'Focal Plane Y Resolution', 'format' => @@ -9540,7 +9540,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneResolutionUnit', 'title' => 'Focal Plane Resolution Unit', 'format' => @@ -9566,7 +9566,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageNumber', 'title' => 'Image Number', 'format' => @@ -9581,7 +9581,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SecurityClassification', 'title' => 'Security Classification', 'format' => @@ -9596,7 +9596,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHistory', 'title' => 'Image History', 'format' => @@ -9611,7 +9611,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubjectLocation', 'title' => 'Subject Location', 'components' => 2, @@ -9627,7 +9627,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureIndex', 'title' => 'Exposure Index', 'format' => @@ -9642,7 +9642,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TIFF-EPStandardID', 'title' => 'TIFF-EP Standard ID', 'format' => @@ -9657,7 +9657,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensingMethod', 'title' => 'Sensing Method', 'format' => @@ -9685,7 +9685,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileSource', 'title' => 'File Source', 'format' => @@ -9710,7 +9710,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SceneType', 'title' => 'Scene Type', 'format' => @@ -9743,7 +9743,7 @@ class IfdAny extends CollectionBase { '2 1 1 0' => '[Blue,Green][Green,Red]', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CFAPattern', 'title' => 'CFA Pattern', 'format' => @@ -9758,7 +9758,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomRendered', 'title' => 'Custom Rendered', 'format' => @@ -9784,7 +9784,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureMode', 'title' => 'Exposure Mode', 'format' => @@ -9808,7 +9808,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -9831,7 +9831,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DigitalZoomRatio', 'title' => 'Digital Zoom Ratio', 'format' => @@ -9850,7 +9850,7 @@ class IfdAny extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLengthIn35mmFormat', 'title' => 'Focal Length In 35mm Format', 'format' => @@ -9865,7 +9865,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SceneCaptureType', 'title' => 'Scene Capture Type', 'format' => @@ -9890,7 +9890,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GainControl', 'title' => 'Gain Control', 'format' => @@ -9916,7 +9916,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Contrast', 'title' => 'Contrast', 'format' => @@ -9940,7 +9940,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Saturation', 'title' => 'Saturation', 'format' => @@ -9964,7 +9964,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -9988,7 +9988,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DeviceSettingDescription', 'title' => 'Device Setting Description', 'format' => @@ -10003,7 +10003,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubjectDistanceRange', 'title' => 'Subject Distance Range', 'format' => @@ -10028,7 +10028,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageUniqueID', 'title' => 'Image Unique ID', 'format' => @@ -10043,7 +10043,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OwnerName', 'title' => 'Owner Name', 'format' => @@ -10057,7 +10057,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumber', 'title' => 'Serial Number', 'format' => @@ -10072,7 +10072,7 @@ class IfdAny extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifLensInfo', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensInfo', 'title' => 'Lens Info', 'components' => 4, @@ -10087,7 +10087,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensMake', 'title' => 'Lens Make', 'format' => @@ -10101,7 +10101,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensModel', 'title' => 'Lens Model', 'format' => @@ -10115,7 +10115,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensSerialNumber', 'title' => 'Lens Serial Number', 'format' => @@ -10129,7 +10129,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GDALMetadata', 'title' => 'GDAL Metadata', 'format' => @@ -10143,7 +10143,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GDALNoData', 'title' => 'GDAL No Data', 'format' => @@ -10157,7 +10157,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Gamma', 'title' => 'Gamma', 'format' => @@ -10171,7 +10171,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandSoftware', 'title' => 'Expand Software', 'format' => @@ -10185,7 +10185,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandLens', 'title' => 'Expand Lens', 'format' => @@ -10199,7 +10199,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandFilm', 'title' => 'Expand Film', 'format' => @@ -10213,7 +10213,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandFilterLens', 'title' => 'Expand Filter Lens', 'format' => @@ -10227,7 +10227,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandScanner', 'title' => 'Expand Scanner', 'format' => @@ -10241,7 +10241,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandFlashLamp', 'title' => 'Expand Flash Lamp', 'format' => @@ -10255,7 +10255,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PixelFormat', 'title' => 'Pixel Format', 'format' => @@ -10330,7 +10330,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Transformation', 'title' => 'Transformation', 'format' => @@ -10358,7 +10358,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Uncompressed', 'title' => 'Uncompressed', 'format' => @@ -10380,7 +10380,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageType', 'title' => 'Image Type', 'format' => @@ -10402,7 +10402,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageWidth', 'title' => 'Image Width', 'format' => @@ -10416,7 +10416,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHeight', 'title' => 'Image Height', 'format' => @@ -10430,7 +10430,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WidthResolution', 'title' => 'Width Resolution', 'format' => @@ -10444,7 +10444,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HeightResolution', 'title' => 'Height Resolution', 'format' => @@ -10458,7 +10458,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageOffset', 'title' => 'Image Offset', 'format' => @@ -10472,7 +10472,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageByteCount', 'title' => 'Image Byte Count', 'format' => @@ -10486,7 +10486,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AlphaOffset', 'title' => 'Alpha Offset', 'format' => @@ -10500,7 +10500,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AlphaByteCount', 'title' => 'Alpha Byte Count', 'format' => @@ -10514,7 +10514,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageDataDiscard', 'title' => 'Image Data Discard', 'format' => @@ -10538,7 +10538,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AlphaDataDiscard', 'title' => 'Alpha Data Discard', 'format' => @@ -10562,7 +10562,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OceScanjobDesc', 'title' => 'Oce Scanjob Desc', 'format' => @@ -10576,7 +10576,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OceApplicationSelector', 'title' => 'Oce Application Selector', 'format' => @@ -10590,7 +10590,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OceIDNumber', 'title' => 'Oce ID Number', 'format' => @@ -10604,7 +10604,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OceImageLogic', 'title' => 'Oce Image Logic', 'format' => @@ -10618,7 +10618,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Annotations', 'title' => 'Annotations', 'format' => @@ -10632,7 +10632,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PrintIM', 'title' => 'Print Image Matching', 'format' => @@ -10645,7 +10645,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalFileName', 'title' => 'Original File Name', 'format' => @@ -10659,7 +10659,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'USPTOOriginalContentType', 'title' => 'USPTO Original Content Type', 'format' => @@ -10682,7 +10682,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CR2CFAPattern', 'title' => 'CR2 CFA Pattern', 'format' => @@ -10706,7 +10706,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGVersion', 'title' => 'DNG Version', 'components' => 4, @@ -10721,7 +10721,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGBackwardVersion', 'title' => 'DNG Backward Version', 'components' => 4, @@ -10736,7 +10736,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UniqueCameraModel', 'title' => 'Unique Camera Model', 'format' => @@ -10750,7 +10750,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LocalizedCameraModel', 'title' => 'Localized Camera Model', 'format' => @@ -10764,7 +10764,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CFAPlaneColor', 'title' => 'CFA Plane Color', 'format' => @@ -10778,7 +10778,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CFALayout', 'title' => 'CFA Layout', 'format' => @@ -10807,7 +10807,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearizationTable', 'title' => 'Linearization Table', 'format' => @@ -10821,7 +10821,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlackLevelRepeatDim', 'title' => 'Black Level Repeat Dim', 'components' => 2, @@ -10836,7 +10836,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlackLevel', 'title' => 'Black Level', 'format' => @@ -10850,7 +10850,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlackLevelDeltaH', 'title' => 'Black Level Delta H', 'format' => @@ -10864,7 +10864,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BlackLevelDeltaV', 'title' => 'Black Level Delta V', 'format' => @@ -10878,7 +10878,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteLevel', 'title' => 'White Level', 'format' => @@ -10892,7 +10892,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultScale', 'title' => 'Default Scale', 'components' => 2, @@ -10907,7 +10907,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultCropOrigin', 'title' => 'Default Crop Origin', 'components' => 2, @@ -10922,7 +10922,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultCropSize', 'title' => 'Default Crop Size', 'components' => 2, @@ -10937,7 +10937,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMatrix1', 'title' => 'Color Matrix 1', 'format' => @@ -10951,7 +10951,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMatrix2', 'title' => 'Color Matrix 2', 'format' => @@ -10965,7 +10965,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraCalibration1', 'title' => 'Camera Calibration 1', 'format' => @@ -10979,7 +10979,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraCalibration2', 'title' => 'Camera Calibration 2', 'format' => @@ -10993,7 +10993,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReductionMatrix1', 'title' => 'Reduction Matrix 1', 'format' => @@ -11007,7 +11007,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReductionMatrix2', 'title' => 'Reduction Matrix 2', 'format' => @@ -11021,7 +11021,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AnalogBalance', 'title' => 'Analog Balance', 'format' => @@ -11035,7 +11035,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotNeutral', 'title' => 'As Shot Neutral', 'format' => @@ -11049,7 +11049,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotWhiteXY', 'title' => 'As Shot White XY', 'components' => 2, @@ -11064,7 +11064,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineExposure', 'title' => 'Baseline Exposure', 'format' => @@ -11078,7 +11078,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineNoise', 'title' => 'Baseline Noise', 'format' => @@ -11092,7 +11092,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineSharpness', 'title' => 'Baseline Sharpness', 'format' => @@ -11106,7 +11106,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BayerGreenSplit', 'title' => 'Bayer Green Split', 'format' => @@ -11120,7 +11120,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LinearResponseLimit', 'title' => 'Linear Response Limit', 'format' => @@ -11134,7 +11134,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraSerialNumber', 'title' => 'Camera Serial Number', 'format' => @@ -11148,7 +11148,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGLensInfo', 'title' => 'DNG Lens Info', 'components' => 4, @@ -11163,7 +11163,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ChromaBlurRadius', 'title' => 'Chroma Blur Radius', 'format' => @@ -11177,7 +11177,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AntiAliasStrength', 'title' => 'Anti Alias Strength', 'format' => @@ -11191,7 +11191,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShadowScale', 'title' => 'Shadow Scale', 'format' => @@ -11205,7 +11205,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGAdobeData', 'title' => 'DNG Adobe Data', 'format' => @@ -11216,7 +11216,7 @@ class IfdAny extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DNGPrivateData', 'title' => 'DNG Private Data', 'format' => @@ -11230,7 +11230,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MakerNoteSafety', 'title' => 'Maker Note Safety', 'format' => @@ -11252,7 +11252,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawImageSegmentation', 'title' => 'Raw Image Segmentation', 'format' => @@ -11266,7 +11266,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CalibrationIlluminant1', 'title' => 'Calibration Illuminant 1', 'format' => @@ -11308,7 +11308,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CalibrationIlluminant2', 'title' => 'Calibration Illuminant 2', 'format' => @@ -11350,7 +11350,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BestQualityScale', 'title' => 'Best Quality Scale', 'format' => @@ -11364,7 +11364,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawDataUniqueID', 'title' => 'Raw Data Unique ID', 'components' => 16, @@ -11379,7 +11379,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AliasLayerMetadata', 'title' => 'Alias Layer Metadata', 'format' => @@ -11393,7 +11393,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalRawFileName', 'title' => 'Original Raw File Name', 'format' => @@ -11407,7 +11407,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalRawFileData', 'title' => 'Original Raw File Data', 'format' => @@ -11421,7 +11421,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ActiveArea', 'title' => 'Active Area', 'components' => 4, @@ -11436,7 +11436,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaskedAreas', 'title' => 'Masked Areas', 'format' => @@ -11450,7 +11450,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotICCProfile', 'title' => 'As Shot ICC Profile', 'format' => @@ -11464,7 +11464,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotPreProfileMatrix', 'title' => 'As Shot Pre Profile Matrix', 'format' => @@ -11478,7 +11478,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CurrentICCProfile', 'title' => 'Current ICC Profile', 'format' => @@ -11492,7 +11492,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CurrentPreProfileMatrix', 'title' => 'Current Pre Profile Matrix', 'format' => @@ -11506,7 +11506,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorimetricReference', 'title' => 'Colorimetric Reference', 'format' => @@ -11520,7 +11520,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SRawType', 'title' => 'SRaw Type', 'format' => @@ -11534,7 +11534,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PanasonicTitle', 'title' => 'Panasonic Title', 'format' => @@ -11548,7 +11548,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PanasonicTitle2', 'title' => 'Panasonic Title 2', 'format' => @@ -11562,7 +11562,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraCalibrationSig', 'title' => 'Camera Calibration Sig', 'format' => @@ -11576,7 +11576,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileCalibrationSig', 'title' => 'Profile Calibration Sig', 'format' => @@ -11590,7 +11590,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AsShotProfileName', 'title' => 'As Shot Profile Name', 'format' => @@ -11604,7 +11604,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NoiseReductionApplied', 'title' => 'Noise Reduction Applied', 'format' => @@ -11618,7 +11618,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileName', 'title' => 'Profile Name', 'format' => @@ -11632,7 +11632,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapDims', 'title' => 'Profile Hue Sat Map Dims', 'components' => 3, @@ -11647,7 +11647,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapData1', 'title' => 'Profile Hue Sat Map Data 1', 'format' => @@ -11661,7 +11661,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapData2', 'title' => 'Profile Hue Sat Map Data 2', 'format' => @@ -11675,7 +11675,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileToneCurve', 'title' => 'Profile Tone Curve', 'format' => @@ -11689,7 +11689,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileEmbedPolicy', 'title' => 'Profile Embed Policy', 'format' => @@ -11713,7 +11713,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileCopyright', 'title' => 'Profile Copyright', 'format' => @@ -11727,7 +11727,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ForwardMatrix1', 'title' => 'Forward Matrix 1', 'format' => @@ -11741,7 +11741,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ForwardMatrix2', 'title' => 'Forward Matrix 2', 'format' => @@ -11755,7 +11755,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewApplicationName', 'title' => 'Preview Application Name', 'format' => @@ -11769,7 +11769,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewApplicationVersion', 'title' => 'Preview Application Version', 'format' => @@ -11783,7 +11783,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewSettingsName', 'title' => 'Preview Settings Name', 'format' => @@ -11797,7 +11797,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewSettingsDigest', 'title' => 'Preview Settings Digest', 'format' => @@ -11811,7 +11811,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewColorSpace', 'title' => 'Preview Color Space', 'format' => @@ -11836,7 +11836,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PreviewDateTime', 'title' => 'Preview Date Time', 'format' => @@ -11850,7 +11850,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawImageDigest', 'title' => 'Raw Image Digest', 'components' => 16, @@ -11865,7 +11865,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalRawFileDigest', 'title' => 'Original Raw File Digest', 'components' => 16, @@ -11880,7 +11880,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubTileBlockSize', 'title' => 'Sub Tile Block Size', 'format' => @@ -11894,7 +11894,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RowInterleaveFactor', 'title' => 'Row Interleave Factor', 'format' => @@ -11908,7 +11908,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileLookTableDims', 'title' => 'Profile Look Table Dims', 'components' => 3, @@ -11923,7 +11923,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileLookTableData', 'title' => 'Profile Look Table Data', 'format' => @@ -11937,7 +11937,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OpcodeList1', 'title' => 'Opcode List 1', 'format' => @@ -11951,7 +11951,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OpcodeList2', 'title' => 'Opcode List 2', 'format' => @@ -11965,7 +11965,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OpcodeList3', 'title' => 'Opcode List 3', 'format' => @@ -11979,7 +11979,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NoiseProfile', 'title' => 'Noise Profile', 'format' => @@ -11993,7 +11993,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeCodes', 'title' => 'Time Codes', 'format' => @@ -12007,7 +12007,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FrameRate', 'title' => 'Frame Rate', 'format' => @@ -12021,7 +12021,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TStop', 'title' => 'T Stop', 'format' => @@ -12035,7 +12035,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ReelName', 'title' => 'Reel Name', 'format' => @@ -12049,7 +12049,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalDefaultFinalSize', 'title' => 'Original Default Final Size', 'components' => 2, @@ -12064,7 +12064,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalBestQualitySize', 'title' => 'Original Best Quality Size', 'components' => 2, @@ -12079,7 +12079,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalDefaultCropSize', 'title' => 'Original Default Crop Size', 'components' => 2, @@ -12094,7 +12094,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraLabel', 'title' => 'Camera Label', 'format' => @@ -12108,7 +12108,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileHueSatMapEncoding', 'title' => 'Profile Hue Sat Map Encoding', 'format' => @@ -12130,7 +12130,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileLookTableEncoding', 'title' => 'Profile Look Table Encoding', 'format' => @@ -12152,7 +12152,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BaselineExposureOffset', 'title' => 'Baseline Exposure Offset', 'format' => @@ -12166,7 +12166,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultBlackRender', 'title' => 'Default Black Render', 'format' => @@ -12188,7 +12188,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NewRawImageDigest', 'title' => 'New Raw Image Digest', 'components' => 16, @@ -12203,7 +12203,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawToPreviewGain', 'title' => 'Raw To Preview Gain', 'format' => @@ -12217,7 +12217,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CacheVersion', 'title' => 'Cache Version', 'components' => 4, @@ -12232,7 +12232,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultUserCrop', 'title' => 'Default User Crop', 'components' => 4, @@ -12247,7 +12247,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Padding', 'title' => 'Padding', 'format' => @@ -12260,7 +12260,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OffsetSchema', 'title' => 'Offset Schema', 'format' => @@ -12274,7 +12274,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OwnerName', 'title' => 'Owner Name', 'format' => @@ -12288,7 +12288,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumber', 'title' => 'Serial Number', 'format' => @@ -12302,7 +12302,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Lens', 'title' => 'Lens', 'format' => @@ -12316,7 +12316,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawFile', 'title' => 'Raw File', 'format' => @@ -12330,7 +12330,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Converter', 'title' => 'Converter', 'format' => @@ -12344,7 +12344,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -12358,7 +12358,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Exposure', 'title' => 'Exposure', 'format' => @@ -12372,7 +12372,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shadows', 'title' => 'Shadows', 'format' => @@ -12386,7 +12386,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Brightness', 'title' => 'Brightness', 'format' => @@ -12400,7 +12400,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Contrast', 'title' => 'Contrast', 'format' => @@ -12414,7 +12414,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Saturation', 'title' => 'Saturation', 'format' => @@ -12428,7 +12428,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -12442,7 +12442,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Smoothness', 'title' => 'Smoothness', 'format' => @@ -12456,7 +12456,7 @@ class IfdAny extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MoireFilter', 'title' => 'Moire Filter', 'format' => diff --git a/src/Collection/Tiff/IfdExif.php b/src/Collection/Tiff/IfdExif.php index 81b794a32..ab03fe66d 100644 --- a/src/Collection/Tiff/IfdExif.php +++ b/src/Collection/Tiff/IfdExif.php @@ -15,9 +15,9 @@ class IfdExif extends CollectionBase { protected static $map = array ( 'name' => 'ExifIFD', 'title' => 'Exif IFD', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd', 'DOMNode' => 'ifd', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'Tiff\\IfdExif', 'itemsByName' => array ( @@ -2589,7 +2589,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripOffsets', 'title' => 'Strip Offsets', 'format' => @@ -2601,7 +2601,7 @@ class IfdExif extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripOffsets', 'title' => 'Strip Offsets', 'format' => @@ -2616,7 +2616,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripByteCounts', 'title' => 'Strip Byte Counts', 'format' => @@ -2628,7 +2628,7 @@ class IfdExif extends CollectionBase { ), 1 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripByteCounts', 'title' => 'Strip Byte Counts', 'format' => @@ -2643,7 +2643,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FreeOffsets', 'title' => 'Free Offsets', 'format' => @@ -2658,7 +2658,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FreeByteCounts', 'title' => 'Free Byte Counts', 'format' => @@ -2673,7 +2673,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GrayResponseCurve', 'title' => 'Gray Response Curve', 'format' => @@ -2688,7 +2688,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'T4Options', 'title' => 'T4 Options', 'format' => @@ -2712,7 +2712,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'T6Options', 'title' => 'T6 Options', 'format' => @@ -2734,7 +2734,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorResponseUnit', 'title' => 'Color Response Unit', 'format' => @@ -2748,7 +2748,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorMap', 'title' => 'Color Map', 'format' => @@ -2763,7 +2763,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileOffsets', 'title' => 'Tile Offsets', 'format' => @@ -2778,7 +2778,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileByteCounts', 'title' => 'Tile Byte Counts', 'format' => @@ -2793,7 +2793,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BadFaxLines', 'title' => 'Bad Fax Lines', 'format' => @@ -2807,7 +2807,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CleanFaxData', 'title' => 'Clean Fax Data', 'format' => @@ -2830,7 +2830,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ConsecutiveBadFaxLines', 'title' => 'Consecutive Bad Fax Lines', 'format' => @@ -2844,7 +2844,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InkNames', 'title' => 'Ink Names', 'format' => @@ -2859,7 +2859,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'NumberofInks', 'title' => 'Numberof Inks', 'format' => @@ -2874,7 +2874,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DotRange', 'title' => 'Dot Range', 'format' => @@ -2889,7 +2889,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExtraSamples', 'title' => 'Extra Samples', 'format' => @@ -2913,7 +2913,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SMinSampleValue', 'title' => 'S Min Sample Value', 'format' => @@ -2928,7 +2928,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SMaxSampleValue', 'title' => 'S Max Sample Value', 'format' => @@ -2943,7 +2943,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TransferRange', 'title' => 'Transfer Range', 'format' => @@ -2958,7 +2958,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ClipPath', 'title' => 'Clip Path', 'format' => @@ -2973,7 +2973,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XClipPathUnits', 'title' => 'X Clip Path Units', 'format' => @@ -2988,7 +2988,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'YClipPathUnits', 'title' => 'Y Clip Path Units', 'format' => @@ -3003,7 +3003,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Indexed', 'title' => 'Indexed', 'format' => @@ -3026,7 +3026,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGTables', 'title' => 'JPEG Tables', 'format' => @@ -3041,7 +3041,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OPIProxy', 'title' => 'OPI Proxy', 'format' => @@ -3064,7 +3064,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ProfileType', 'title' => 'Profile Type', 'format' => @@ -3086,7 +3086,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaxProfile', 'title' => 'Fax Profile', 'format' => @@ -3115,7 +3115,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CodingMethods', 'title' => 'Coding Methods', 'format' => @@ -3142,7 +3142,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'VersionYear', 'title' => 'Version Year', 'format' => @@ -3156,7 +3156,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModeNumber', 'title' => 'Mode Number', 'format' => @@ -3170,7 +3170,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Decode', 'title' => 'Decode', 'format' => @@ -3184,7 +3184,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DefaultImageColor', 'title' => 'Default Image Color', 'format' => @@ -3198,7 +3198,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'T82Options', 'title' => 'T82 Options', 'format' => @@ -3212,7 +3212,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGTables', 'title' => 'JPEG Tables', 'format' => @@ -3226,7 +3226,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGProc', 'title' => 'JPEG Proc', 'format' => @@ -3249,7 +3249,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OtherImageStart', 'title' => 'Other Image Start', 'format' => @@ -3264,7 +3264,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OtherImageLength', 'title' => 'Other Image Length', 'format' => @@ -3279,7 +3279,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGRestartInterval', 'title' => 'JPEG Restart Interval', 'format' => @@ -3294,7 +3294,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGLosslessPredictors', 'title' => 'JPEG Lossless Predictors', 'format' => @@ -3309,7 +3309,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGPointTransforms', 'title' => 'JPEG Point Transforms', 'format' => @@ -3324,7 +3324,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGQTables', 'title' => 'JPEGQ Tables', 'format' => @@ -3339,7 +3339,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGDCTables', 'title' => 'JPEGDC Tables', 'format' => @@ -3354,7 +3354,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPEGACTables', 'title' => 'JPEGAC Tables', 'format' => @@ -3369,7 +3369,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StripRowCounts', 'title' => 'Strip Row Counts', 'format' => @@ -3383,7 +3383,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'USPTOMiscellaneous', 'title' => 'USPTO Miscellaneous', 'format' => @@ -3397,7 +3397,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'XP_DIP_XML', 'title' => 'XP DIP XML', 'format' => @@ -3411,7 +3411,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SonyRawFileType', 'title' => 'Sony Raw File Type', 'format' => @@ -3435,7 +3435,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SonyToneCurve', 'title' => 'Sony Tone Curve', 'format' => @@ -3449,7 +3449,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageID', 'title' => 'Image ID', 'format' => @@ -3464,7 +3464,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WangTag1', 'title' => 'Wang Tag 1', 'format' => @@ -3478,7 +3478,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WangAnnotation', 'title' => 'Wang Annotation', 'format' => @@ -3492,7 +3492,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WangTag3', 'title' => 'Wang Tag 3', 'format' => @@ -3506,7 +3506,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WangTag4', 'title' => 'Wang Tag 4', 'format' => @@ -3520,7 +3520,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageReferencePoints', 'title' => 'Image Reference Points', 'format' => @@ -3534,7 +3534,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RegionXformTackPoint', 'title' => 'Region Xform Tack Point', 'format' => @@ -3548,7 +3548,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WarpQuadrilateral', 'title' => 'Warp Quadrilateral', 'format' => @@ -3562,7 +3562,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AffineTransformMat', 'title' => 'Affine Transform Mat', 'format' => @@ -3576,7 +3576,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Matteing', 'title' => 'Matteing', 'format' => @@ -3591,7 +3591,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DataType', 'title' => 'Data Type', 'format' => @@ -3606,7 +3606,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageDepth', 'title' => 'Image Depth', 'format' => @@ -3621,7 +3621,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TileDepth', 'title' => 'Tile Depth', 'format' => @@ -3636,7 +3636,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageFullWidth', 'title' => 'Image Full Width', 'format' => @@ -3650,7 +3650,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageFullHeight', 'title' => 'Image Full Height', 'format' => @@ -3664,7 +3664,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TextureFormat', 'title' => 'Texture Format', 'format' => @@ -3678,7 +3678,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WrapModes', 'title' => 'Wrap Modes', 'format' => @@ -3692,7 +3692,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FovCot', 'title' => 'Fov Cot', 'format' => @@ -3706,7 +3706,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MatrixWorldToScreen', 'title' => 'Matrix World To Screen', 'format' => @@ -3720,7 +3720,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MatrixWorldToCamera', 'title' => 'Matrix World To Camera', 'format' => @@ -3734,7 +3734,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Model2', 'title' => 'Model 2', 'format' => @@ -3748,7 +3748,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BatteryLevel', 'title' => 'Battery Level', 'format' => @@ -3765,7 +3765,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifExposureTime', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureTime', 'title' => 'Exposure Time', 'format' => @@ -3782,7 +3782,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifFNumber', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FNumber', 'title' => 'F Number', 'format' => @@ -3797,7 +3797,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDFileTag', 'title' => 'MD File Tag', 'format' => @@ -3811,7 +3811,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDScalePixel', 'title' => 'MD Scale Pixel', 'format' => @@ -3825,7 +3825,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDColorTable', 'title' => 'MD Color Table', 'format' => @@ -3839,7 +3839,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDLabName', 'title' => 'MD Lab Name', 'format' => @@ -3853,7 +3853,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDSampleInfo', 'title' => 'MD Sample Info', 'format' => @@ -3867,7 +3867,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDPrepDate', 'title' => 'MD Prep Date', 'format' => @@ -3881,7 +3881,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDPrepTime', 'title' => 'MD Prep Time', 'format' => @@ -3895,7 +3895,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MDFileUnits', 'title' => 'MD File Units', 'format' => @@ -3909,7 +3909,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PixelScale', 'title' => 'Pixel Scale', 'format' => @@ -3923,7 +3923,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AdventScale', 'title' => 'Advent Scale', 'format' => @@ -3937,7 +3937,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AdventRevision', 'title' => 'Advent Revision', 'format' => @@ -3951,7 +3951,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UIC1Tag', 'title' => 'UIC1 Tag', 'format' => @@ -3965,7 +3965,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UIC2Tag', 'title' => 'UIC2 Tag', 'format' => @@ -3979,7 +3979,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UIC3Tag', 'title' => 'UIC3 Tag', 'format' => @@ -3993,7 +3993,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UIC4Tag', 'title' => 'UIC4 Tag', 'format' => @@ -4007,7 +4007,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IntergraphPacketData', 'title' => 'Intergraph Packet Data', 'format' => @@ -4021,7 +4021,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IntergraphFlagRegisters', 'title' => 'Intergraph Flag Registers', 'format' => @@ -4035,7 +4035,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IntergraphMatrix', 'title' => 'Intergraph Matrix', 'format' => @@ -4049,7 +4049,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'INGRReserved', 'title' => 'INGR Reserved', 'format' => @@ -4063,7 +4063,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModelTiePoint', 'title' => 'Model Tie Point', 'format' => @@ -4077,7 +4077,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Site', 'title' => 'Site', 'format' => @@ -4091,7 +4091,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorSequence', 'title' => 'Color Sequence', 'format' => @@ -4105,7 +4105,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'IT8Header', 'title' => 'IT8 Header', 'format' => @@ -4119,7 +4119,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RasterPadding', 'title' => 'Raster Padding', 'format' => @@ -4145,7 +4145,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BitsPerRunLength', 'title' => 'Bits Per Run Length', 'format' => @@ -4159,7 +4159,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BitsPerExtendedRunLength', 'title' => 'Bits Per Extended Run Length', 'format' => @@ -4174,7 +4174,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorTable', 'title' => 'Color Table', 'format' => @@ -4188,7 +4188,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageColorIndicator', 'title' => 'Image Color Indicator', 'format' => @@ -4210,7 +4210,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BackgroundColorIndicator', 'title' => 'Background Color Indicator', 'format' => @@ -4232,7 +4232,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageColorValue', 'title' => 'Image Color Value', 'format' => @@ -4246,7 +4246,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BackgroundColorValue', 'title' => 'Background Color Value', 'format' => @@ -4260,7 +4260,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PixelIntensityRange', 'title' => 'Pixel Intensity Range', 'format' => @@ -4274,7 +4274,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TransparencyIndicator', 'title' => 'Transparency Indicator', 'format' => @@ -4288,7 +4288,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorCharacterization', 'title' => 'Color Characterization', 'format' => @@ -4302,7 +4302,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HCUsage', 'title' => 'HC Usage', 'format' => @@ -4325,7 +4325,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TrapIndicator', 'title' => 'Trap Indicator', 'format' => @@ -4339,7 +4339,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CMYKEquivalent', 'title' => 'CMYK Equivalent', 'format' => @@ -4353,7 +4353,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PixelMagicJBIGOptions', 'title' => 'Pixel Magic JBIG Options', 'format' => @@ -4367,7 +4367,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JPLCartoIFD', 'title' => 'JPL Carto IFD', 'format' => @@ -4381,7 +4381,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ModelTransform', 'title' => 'Model Transform', 'format' => @@ -4395,7 +4395,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WB_GRGBLevels', 'title' => 'WB GRGB Levels', 'format' => @@ -4409,7 +4409,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TIFF_FXExtensions', 'title' => 'TIFF FX Extensions', 'format' => @@ -4434,7 +4434,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MultiProfiles', 'title' => 'Multi Profiles', 'format' => @@ -4465,7 +4465,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SharedData', 'title' => 'Shared Data', 'format' => @@ -4479,7 +4479,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'T88Options', 'title' => 'T88 Options', 'format' => @@ -4493,7 +4493,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageLayer', 'title' => 'Image Layer', 'format' => @@ -4507,7 +4507,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'JBIGOptions', 'title' => 'JBIG Options', 'format' => @@ -4522,7 +4522,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureProgram', 'title' => 'Exposure Program', 'format' => @@ -4553,7 +4553,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpectralSensitivity', 'title' => 'Spectral Sensitivity', 'format' => @@ -4572,7 +4572,7 @@ class IfdExif extends CollectionBase { array ( 0 => 'ISOSpeedRatings', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISO', 'title' => 'ISO', 'format' => @@ -4587,7 +4587,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Opto-ElectricConvFactor', 'title' => 'Opto-Electric Conv Factor', 'format' => @@ -4602,7 +4602,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Interlace', 'title' => 'Interlace', 'format' => @@ -4616,7 +4616,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TimeZoneOffset', 'title' => 'Time Zone Offset', 'format' => @@ -4630,7 +4630,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SelfTimerMode', 'title' => 'Self Timer Mode', 'format' => @@ -4644,7 +4644,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensitivityType', 'title' => 'Sensitivity Type', 'format' => @@ -4672,7 +4672,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StandardOutputSensitivity', 'title' => 'Standard Output Sensitivity', 'format' => @@ -4686,7 +4686,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RecommendedExposureIndex', 'title' => 'Recommended Exposure Index', 'format' => @@ -4700,7 +4700,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOSpeed', 'title' => 'ISO Speed', 'format' => @@ -4714,7 +4714,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOSpeedLatitudeyyy', 'title' => 'ISO Speed Latitude yyy', 'format' => @@ -4728,7 +4728,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ISOSpeedLatitudezzz', 'title' => 'ISO Speed Latitude zzz', 'format' => @@ -4742,7 +4742,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaxRecvParams', 'title' => 'Fax Recv Params', 'format' => @@ -4756,7 +4756,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaxSubAddress', 'title' => 'Fax Sub Address', 'format' => @@ -4770,7 +4770,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FaxRecvTime', 'title' => 'Fax Recv Time', 'format' => @@ -4784,7 +4784,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FedexEDR', 'title' => 'Fedex EDR', 'format' => @@ -4800,7 +4800,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 4, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Version', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExifVersion', 'title' => 'Exif Version', 'format' => @@ -4817,7 +4817,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 20, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Time', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DateTimeOriginal', 'title' => 'Date/Time Original', 'format' => @@ -4834,7 +4834,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 20, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Time', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CreateDate', 'title' => 'Create Date', 'format' => @@ -4849,7 +4849,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GooglePlusUploadCode', 'title' => 'Google Plus Upload Code', 'format' => @@ -4864,7 +4864,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 7, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OffsetTime', 'title' => 'Offset Time', 'format' => @@ -4879,7 +4879,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 7, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OffsetTimeOriginal', 'title' => 'Offset Time Original', 'format' => @@ -4894,7 +4894,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 7, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OffsetTimeDigitized', 'title' => 'Offset Time Digitized', 'format' => @@ -4910,7 +4910,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 4, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifComponentsConfiguration', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ComponentsConfiguration', 'title' => 'Components Configuration', 'format' => @@ -4939,7 +4939,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CompressedBitsPerPixel', 'title' => 'Compressed Bits Per Pixel', 'format' => @@ -4956,7 +4956,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifShutterSpeedValue', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ShutterSpeedValue', 'title' => 'Shutter Speed Value', 'format' => @@ -4973,7 +4973,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifApertureValue', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ApertureValue', 'title' => 'Aperture Value', 'format' => @@ -4989,7 +4989,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'BrightnessValue', 'title' => 'Brightness Value', 'format' => @@ -5010,7 +5010,7 @@ class IfdExif extends CollectionBase { 0 => 'ExposureBiasValue', ), 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureCompensation', 'title' => 'Exposure Compensation', 'format' => @@ -5027,7 +5027,7 @@ class IfdExif extends CollectionBase { array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifApertureValue', 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MaxApertureValue', 'title' => 'Max Aperture Value', 'format' => @@ -5044,7 +5044,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifSubjectDistance', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubjectDistance', 'title' => 'Subject Distance', 'format' => @@ -5060,7 +5060,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MeteringMode', 'title' => 'Metering Mode', 'format' => @@ -5090,7 +5090,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LightSource', 'title' => 'Light Source', 'format' => @@ -5134,7 +5134,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Flash', 'title' => 'Flash', 'format' => @@ -5184,7 +5184,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 1, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifFocalLength', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLength', 'title' => 'Focal Length', 'format' => @@ -5199,7 +5199,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashEnergy', 'title' => 'Flash Energy', 'format' => @@ -5214,7 +5214,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpatialFrequencyResponse', 'title' => 'Spatial Frequency Response', 'format' => @@ -5229,7 +5229,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Noise', 'title' => 'Noise', 'format' => @@ -5244,7 +5244,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneXResolution', 'title' => 'Focal Plane X Resolution', 'format' => @@ -5259,7 +5259,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneYResolution', 'title' => 'Focal Plane Y Resolution', 'format' => @@ -5274,7 +5274,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneResolutionUnit', 'title' => 'Focal Plane Resolution Unit', 'format' => @@ -5300,7 +5300,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageNumber', 'title' => 'Image Number', 'format' => @@ -5315,7 +5315,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SecurityClassification', 'title' => 'Security Classification', 'format' => @@ -5341,7 +5341,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHistory', 'title' => 'Image History', 'format' => @@ -5357,7 +5357,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifSubjectArea', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubjectArea', 'title' => 'Subject Area', 'format' => @@ -5372,7 +5372,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureIndex', 'title' => 'Exposure Index', 'format' => @@ -5387,7 +5387,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TIFF-EPStandardID', 'title' => 'TIFF-EP Standard ID', 'format' => @@ -5402,7 +5402,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensingMethod', 'title' => 'Sensing Method', 'format' => @@ -5431,7 +5431,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CIP3DataFile', 'title' => 'CIP3 Data File', 'format' => @@ -5445,7 +5445,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CIP3Sheet', 'title' => 'CIP3 Sheet', 'format' => @@ -5459,7 +5459,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CIP3Side', 'title' => 'CIP3 Side', 'format' => @@ -5473,7 +5473,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'StoNits', 'title' => 'Sto Nits', 'format' => @@ -5495,7 +5495,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 1 => array ( @@ -5506,7 +5506,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 2 => array ( @@ -5517,7 +5517,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 3 => array ( @@ -5528,7 +5528,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 4 => array ( @@ -5539,7 +5539,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 5 => array ( @@ -5550,7 +5550,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 6 => array ( @@ -5561,7 +5561,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 7 => array ( @@ -5572,7 +5572,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 8 => array ( @@ -5583,7 +5583,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 9 => array ( @@ -5594,7 +5594,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 10 => array ( @@ -5605,7 +5605,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 11 => array ( @@ -5616,7 +5616,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 12 => array ( @@ -5627,7 +5627,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 13 => array ( @@ -5638,7 +5638,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 14 => array ( @@ -5649,7 +5649,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 15 => array ( @@ -5660,7 +5660,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 16 => array ( @@ -5671,7 +5671,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 17 => array ( @@ -5682,7 +5682,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 18 => array ( @@ -5693,7 +5693,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 19 => array ( @@ -5704,7 +5704,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 20 => array ( @@ -5715,7 +5715,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 21 => array ( @@ -5726,7 +5726,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 22 => array ( @@ -5737,7 +5737,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 23 => array ( @@ -5748,7 +5748,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 24 => array ( @@ -5759,7 +5759,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 25 => array ( @@ -5770,7 +5770,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 26 => array ( @@ -5781,7 +5781,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 27 => array ( @@ -5792,7 +5792,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 28 => array ( @@ -5803,7 +5803,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 29 => array ( @@ -5814,7 +5814,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 30 => array ( @@ -5825,7 +5825,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 31 => array ( @@ -5836,7 +5836,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 32 => array ( @@ -5847,7 +5847,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 33 => array ( @@ -5858,7 +5858,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 34 => array ( @@ -5869,7 +5869,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 35 => array ( @@ -5880,7 +5880,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 36 => array ( @@ -5891,7 +5891,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 37 => array ( @@ -5902,7 +5902,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 38 => array ( @@ -5913,7 +5913,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 39 => array ( @@ -5924,7 +5924,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 40 => array ( @@ -5935,7 +5935,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 41 => array ( @@ -5946,7 +5946,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 42 => array ( @@ -5957,7 +5957,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 43 => array ( @@ -5968,7 +5968,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 44 => array ( @@ -5979,7 +5979,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 45 => array ( @@ -5990,7 +5990,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 46 => array ( @@ -6001,7 +6001,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 47 => array ( @@ -6012,7 +6012,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 48 => array ( @@ -6023,7 +6023,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 49 => array ( @@ -6034,7 +6034,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 50 => array ( @@ -6045,7 +6045,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 51 => array ( @@ -6056,7 +6056,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 52 => array ( @@ -6067,7 +6067,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 53 => array ( @@ -6078,7 +6078,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 54 => array ( @@ -6089,7 +6089,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 55 => array ( @@ -6100,7 +6100,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 56 => array ( @@ -6111,7 +6111,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 57 => array ( @@ -6122,7 +6122,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 58 => array ( @@ -6133,7 +6133,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 59 => array ( @@ -6144,7 +6144,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 60 => array ( @@ -6155,7 +6155,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 61 => array ( @@ -6166,7 +6166,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 62 => array ( @@ -6177,7 +6177,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 63 => array ( @@ -6188,7 +6188,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 64 => array ( @@ -6199,7 +6199,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 65 => array ( @@ -6210,7 +6210,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 66 => array ( @@ -6221,7 +6221,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 67 => array ( @@ -6232,7 +6232,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 68 => array ( @@ -6243,7 +6243,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 69 => array ( @@ -6254,7 +6254,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 70 => array ( @@ -6265,7 +6265,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 71 => array ( @@ -6276,7 +6276,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 72 => array ( @@ -6287,7 +6287,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 73 => array ( @@ -6298,7 +6298,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 74 => array ( @@ -6309,7 +6309,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 75 => array ( @@ -6320,7 +6320,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 76 => array ( @@ -6331,7 +6331,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 77 => array ( @@ -6342,7 +6342,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 78 => array ( @@ -6353,7 +6353,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 79 => array ( @@ -6364,7 +6364,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 80 => array ( @@ -6375,7 +6375,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 81 => array ( @@ -6386,7 +6386,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 82 => array ( @@ -6397,7 +6397,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 83 => array ( @@ -6408,7 +6408,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 84 => array ( @@ -6419,7 +6419,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), 85 => array ( @@ -6430,7 +6430,7 @@ class IfdExif extends CollectionBase { 0 => 7, ), 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifMakerNote', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', ), ), 37510 => @@ -6438,7 +6438,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifUserComment', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'UserComment', 'title' => 'User Comment', 'format' => @@ -6453,7 +6453,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubSecTime', 'title' => 'Sub Sec Time', 'format' => @@ -6468,7 +6468,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubSecTimeOriginal', 'title' => 'Sub Sec Time Original', 'format' => @@ -6483,7 +6483,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubSecTimeDigitized', 'title' => 'Sub Sec Time Digitized', 'format' => @@ -6498,7 +6498,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MSDocumentText', 'title' => 'MS Document Text', 'format' => @@ -6512,7 +6512,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MSPropertySetStorage', 'title' => 'MS Property Set Storage', 'format' => @@ -6526,7 +6526,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MSDocumentTextPosition', 'title' => 'MS Document Text Position', 'format' => @@ -6540,7 +6540,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AmbientTemperature', 'title' => 'Ambient Temperature', 'format' => @@ -6554,7 +6554,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Humidity', 'title' => 'Humidity', 'format' => @@ -6568,7 +6568,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Pressure', 'title' => 'Pressure', 'format' => @@ -6582,7 +6582,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WaterDepth', 'title' => 'Water Depth', 'format' => @@ -6596,7 +6596,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Acceleration', 'title' => 'Acceleration', 'format' => @@ -6610,7 +6610,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CameraElevationAngle', 'title' => 'Camera Elevation Angle', 'format' => @@ -6626,7 +6626,7 @@ class IfdExif extends CollectionBase { array ( 'components' => 4, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Version', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashpixVersion', 'title' => 'Flashpix Version', 'format' => @@ -6642,7 +6642,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ColorSpace', 'title' => 'Color Space', 'format' => @@ -6678,7 +6678,7 @@ class IfdExif extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExifImageWidth', 'title' => 'Exif Image Width', 'phpExifTag' => 'ExifImageWidth', @@ -6699,7 +6699,7 @@ class IfdExif extends CollectionBase { 0 => 3, 1 => 4, ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExifImageHeight', 'title' => 'Exif Image Height', 'phpExifTag' => 'ExifImageLength', @@ -6710,7 +6710,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RelatedSoundFile', 'title' => 'Related Sound File', 'format' => @@ -6732,7 +6732,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamsungRawPointersOffset', 'title' => 'Samsung Raw Pointers Offset', 'format' => @@ -6746,7 +6746,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamsungRawPointersLength', 'title' => 'Samsung Raw Pointers Length', 'format' => @@ -6760,7 +6760,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamsungRawByteOrder', 'title' => 'Samsung Raw Byte Order', 'format' => @@ -6774,7 +6774,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SamsungRawUnknown', 'title' => 'Samsung Raw Unknown', 'format' => @@ -6789,7 +6789,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FlashEnergy', 'title' => 'Flash Energy', 'format' => @@ -6804,7 +6804,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SpatialFrequencyResponse', 'title' => 'Spatial Frequency Response', 'format' => @@ -6819,7 +6819,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Noise', 'title' => 'Noise', 'format' => @@ -6835,7 +6835,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneXResolution', 'title' => 'Focal Plane X Resolution', 'format' => @@ -6851,7 +6851,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneYResolution', 'title' => 'Focal Plane Y Resolution', 'format' => @@ -6867,7 +6867,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalPlaneResolutionUnit', 'title' => 'Focal Plane Resolution Unit', 'format' => @@ -6893,7 +6893,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageNumber', 'title' => 'Image Number', 'format' => @@ -6908,7 +6908,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SecurityClassification', 'title' => 'Security Classification', 'format' => @@ -6923,7 +6923,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHistory', 'title' => 'Image History', 'format' => @@ -6939,7 +6939,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubjectLocation', 'title' => 'Subject Location', 'format' => @@ -6955,7 +6955,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureIndex', 'title' => 'Exposure Index', 'format' => @@ -6970,7 +6970,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'TIFF-EPStandardID', 'title' => 'TIFF-EP Standard ID', 'format' => @@ -6986,7 +6986,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SensingMethod', 'title' => 'Sensing Method', 'format' => @@ -7015,7 +7015,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FileSource', 'title' => 'File Source', 'format' => @@ -7041,7 +7041,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SceneType', 'title' => 'Scene Type', 'format' => @@ -7074,7 +7074,7 @@ class IfdExif extends CollectionBase { '2 1 1 0' => '[Blue,Green][Green,Red]', ), ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CFAPattern', 'title' => 'CFA Pattern', 'format' => @@ -7090,7 +7090,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CustomRendered', 'title' => 'Custom Rendered', 'format' => @@ -7117,7 +7117,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExposureMode', 'title' => 'Exposure Mode', 'format' => @@ -7142,7 +7142,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -7166,7 +7166,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DigitalZoomRatio', 'title' => 'Digital Zoom Ratio', 'format' => @@ -7190,7 +7190,7 @@ class IfdExif extends CollectionBase { array ( 'default' => '{value} mm', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'FocalLengthIn35mmFormat', 'title' => 'Focal Length In 35mm Format', 'format' => @@ -7206,7 +7206,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SceneCaptureType', 'title' => 'Scene Capture Type', 'format' => @@ -7232,7 +7232,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GainControl', 'title' => 'Gain Control', 'format' => @@ -7259,7 +7259,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Contrast', 'title' => 'Contrast', 'format' => @@ -7284,7 +7284,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Saturation', 'title' => 'Saturation', 'format' => @@ -7309,7 +7309,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -7333,7 +7333,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'DeviceSettingDescription', 'title' => 'Device Setting Description', 'format' => @@ -7349,7 +7349,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubjectDistanceRange', 'title' => 'Subject Distance Range', 'format' => @@ -7375,7 +7375,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 32, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageUniqueID', 'title' => 'Image Unique ID', 'format' => @@ -7390,7 +7390,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OwnerName', 'title' => 'Owner Name', 'format' => @@ -7404,7 +7404,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumber', 'title' => 'Serial Number', 'format' => @@ -7419,7 +7419,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\ExifLensInfo', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensInfo', 'title' => 'Lens Info', 'components' => 4, @@ -7434,7 +7434,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensMake', 'title' => 'Lens Make', 'format' => @@ -7448,7 +7448,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensModel', 'title' => 'Lens Model', 'format' => @@ -7462,7 +7462,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'LensSerialNumber', 'title' => 'Lens Serial Number', 'format' => @@ -7476,7 +7476,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GDALMetadata', 'title' => 'GDAL Metadata', 'format' => @@ -7490,7 +7490,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GDALNoData', 'title' => 'GDAL No Data', 'format' => @@ -7505,7 +7505,7 @@ class IfdExif extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Gamma', 'title' => 'Gamma', 'format' => @@ -7519,7 +7519,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandSoftware', 'title' => 'Expand Software', 'format' => @@ -7533,7 +7533,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandLens', 'title' => 'Expand Lens', 'format' => @@ -7547,7 +7547,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandFilm', 'title' => 'Expand Film', 'format' => @@ -7561,7 +7561,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandFilterLens', 'title' => 'Expand Filter Lens', 'format' => @@ -7575,7 +7575,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandScanner', 'title' => 'Expand Scanner', 'format' => @@ -7589,7 +7589,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ExpandFlashLamp', 'title' => 'Expand Flash Lamp', 'format' => @@ -7603,7 +7603,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'PixelFormat', 'title' => 'Pixel Format', 'format' => @@ -7678,7 +7678,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Transformation', 'title' => 'Transformation', 'format' => @@ -7706,7 +7706,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Uncompressed', 'title' => 'Uncompressed', 'format' => @@ -7728,7 +7728,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageType', 'title' => 'Image Type', 'format' => @@ -7750,7 +7750,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageWidth', 'title' => 'Image Width', 'format' => @@ -7764,7 +7764,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageHeight', 'title' => 'Image Height', 'format' => @@ -7778,7 +7778,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WidthResolution', 'title' => 'Width Resolution', 'format' => @@ -7792,7 +7792,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'HeightResolution', 'title' => 'Height Resolution', 'format' => @@ -7806,7 +7806,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageOffset', 'title' => 'Image Offset', 'format' => @@ -7820,7 +7820,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageByteCount', 'title' => 'Image Byte Count', 'format' => @@ -7834,7 +7834,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AlphaOffset', 'title' => 'Alpha Offset', 'format' => @@ -7848,7 +7848,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AlphaByteCount', 'title' => 'Alpha Byte Count', 'format' => @@ -7862,7 +7862,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'ImageDataDiscard', 'title' => 'Image Data Discard', 'format' => @@ -7886,7 +7886,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AlphaDataDiscard', 'title' => 'Alpha Data Discard', 'format' => @@ -7910,7 +7910,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OceScanjobDesc', 'title' => 'Oce Scanjob Desc', 'format' => @@ -7924,7 +7924,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OceApplicationSelector', 'title' => 'Oce Application Selector', 'format' => @@ -7938,7 +7938,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OceIDNumber', 'title' => 'Oce ID Number', 'format' => @@ -7952,7 +7952,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OceImageLogic', 'title' => 'Oce Image Logic', 'format' => @@ -7966,7 +7966,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Annotations', 'title' => 'Annotations', 'format' => @@ -7980,7 +7980,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OriginalFileName', 'title' => 'Original File Name', 'format' => @@ -7994,7 +7994,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'USPTOOriginalContentType', 'title' => 'USPTO Original Content Type', 'format' => @@ -8017,7 +8017,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'CR2CFAPattern', 'title' => 'CR2 CFA Pattern', 'format' => @@ -8041,7 +8041,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawImageSegmentation', 'title' => 'Raw Image Segmentation', 'format' => @@ -8055,7 +8055,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'AliasLayerMetadata', 'title' => 'Alias Layer Metadata', 'format' => @@ -8069,7 +8069,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SubTileBlockSize', 'title' => 'Sub Tile Block Size', 'format' => @@ -8083,7 +8083,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RowInterleaveFactor', 'title' => 'Row Interleave Factor', 'format' => @@ -8097,7 +8097,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Padding', 'title' => 'Padding', 'format' => @@ -8110,7 +8110,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OffsetSchema', 'title' => 'Offset Schema', 'format' => @@ -8124,7 +8124,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'OwnerName', 'title' => 'Owner Name', 'format' => @@ -8138,7 +8138,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'SerialNumber', 'title' => 'Serial Number', 'format' => @@ -8152,7 +8152,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Lens', 'title' => 'Lens', 'format' => @@ -8166,7 +8166,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RawFile', 'title' => 'Raw File', 'format' => @@ -8180,7 +8180,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Converter', 'title' => 'Converter', 'format' => @@ -8194,7 +8194,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'WhiteBalance', 'title' => 'White Balance', 'format' => @@ -8208,7 +8208,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Exposure', 'title' => 'Exposure', 'format' => @@ -8222,7 +8222,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Shadows', 'title' => 'Shadows', 'format' => @@ -8236,7 +8236,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Brightness', 'title' => 'Brightness', 'format' => @@ -8250,7 +8250,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Contrast', 'title' => 'Contrast', 'format' => @@ -8264,7 +8264,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Saturation', 'title' => 'Saturation', 'format' => @@ -8278,7 +8278,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Sharpness', 'title' => 'Sharpness', 'format' => @@ -8292,7 +8292,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'Smoothness', 'title' => 'Smoothness', 'format' => @@ -8306,7 +8306,7 @@ class IfdExif extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'MoireFilter', 'title' => 'Moire Filter', 'format' => diff --git a/src/Collection/Tiff/IfdGps.php b/src/Collection/Tiff/IfdGps.php index 667e4b8a5..9615bedde 100644 --- a/src/Collection/Tiff/IfdGps.php +++ b/src/Collection/Tiff/IfdGps.php @@ -15,9 +15,9 @@ class IfdGps extends CollectionBase { protected static $map = array ( 'name' => 'GPS', 'title' => 'GPS IFD', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd', 'DOMNode' => 'ifd', - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'Tiff\\IfdGps', 'itemsByName' => array ( @@ -415,7 +415,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\GPSVersionId', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSVersionID', 'title' => 'GPS Version ID', 'components' => 4, @@ -431,7 +431,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSLatitudeRef', 'title' => 'GPS Latitude Ref', 'components' => 2, @@ -456,7 +456,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\GPSDegrees', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSLatitude', 'title' => 'GPS Latitude', 'components' => 3, @@ -472,7 +472,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSLongitudeRef', 'title' => 'GPS Longitude Ref', 'components' => 2, @@ -497,7 +497,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\GPSDegrees', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSLongitude', 'title' => 'GPS Longitude', 'components' => 3, @@ -515,7 +515,7 @@ class IfdGps extends CollectionBase { array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\GPSAltitudeRef', 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSAltitudeRef', 'title' => 'GPS Altitude Ref', 'format' => @@ -540,7 +540,7 @@ class IfdGps extends CollectionBase { array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\GPSAltitude', 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSAltitude', 'title' => 'GPS Altitude', 'format' => @@ -556,7 +556,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'entryClass' => 'FileEye\\MediaProbe\\Entry\\GPSTimeStamp', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSTimeStamp', 'title' => 'GPS Time Stamp', 'components' => 3, @@ -572,7 +572,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSSatellites', 'title' => 'GPS Satellites', 'format' => @@ -587,7 +587,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSStatus', 'title' => 'GPS Status', 'components' => 2, @@ -611,7 +611,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSMeasureMode', 'title' => 'GPS Measure Mode', 'components' => 2, @@ -636,7 +636,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDOP', 'title' => 'GPS Dilution Of Precision', 'format' => @@ -651,7 +651,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSSpeedRef', 'title' => 'GPS Speed Ref', 'components' => 2, @@ -676,7 +676,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSSpeed', 'title' => 'GPS Speed', 'format' => @@ -691,7 +691,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSTrackRef', 'title' => 'GPS Track Ref', 'components' => 2, @@ -716,7 +716,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSTrack', 'title' => 'GPS Track', 'format' => @@ -731,7 +731,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSImgDirectionRef', 'title' => 'GPS Img Direction Ref', 'components' => 2, @@ -756,7 +756,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSImgDirection', 'title' => 'GPS Img Direction', 'format' => @@ -771,7 +771,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSMapDatum', 'title' => 'GPS Map Datum', 'format' => @@ -786,7 +786,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDestLatitudeRef', 'title' => 'GPS Dest Latitude Ref', 'components' => 2, @@ -810,7 +810,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDestLatitude', 'title' => 'GPS Dest Latitude', 'components' => 3, @@ -826,7 +826,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDestLongitudeRef', 'title' => 'GPS Dest Longitude Ref', 'components' => 2, @@ -850,7 +850,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDestLongitude', 'title' => 'GPS Dest Longitude', 'components' => 3, @@ -866,7 +866,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDestBearingRef', 'title' => 'GPS Dest Bearing Ref', 'components' => 2, @@ -891,7 +891,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDestBearing', 'title' => 'GPS Dest Bearing', 'format' => @@ -906,7 +906,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDestDistanceRef', 'title' => 'GPS Dest Distance Ref', 'components' => 2, @@ -932,7 +932,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDestDistance', 'title' => 'GPS Dest Distance', 'format' => @@ -947,7 +947,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSProcessingMethod', 'title' => 'GPS Processing Method', 'format' => @@ -962,7 +962,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSAreaInformation', 'title' => 'GPS Area Information', 'format' => @@ -977,7 +977,7 @@ class IfdGps extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDateStamp', 'title' => 'GPS Date Stamp', 'components' => 11, @@ -994,7 +994,7 @@ class IfdGps extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSDifferential', 'title' => 'GPS Differential', 'format' => @@ -1021,7 +1021,7 @@ class IfdGps extends CollectionBase { array ( 'default' => '{value} m', ), - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'GPSHPositioningError', 'title' => 'GPS Horizontal Positioning Error', 'format' => diff --git a/src/Collection/Tiff/IfdInteroperability.php b/src/Collection/Tiff/IfdInteroperability.php index e785d8fef..e86c80f0e 100644 --- a/src/Collection/Tiff/IfdInteroperability.php +++ b/src/Collection/Tiff/IfdInteroperability.php @@ -15,13 +15,13 @@ class IfdInteroperability extends CollectionBase { protected static $map = array ( 'name' => 'InteropIFD', 'title' => 'Interoperability IFD', - 'class' => 'FileEye\\MediaProbe\\Block\\Exif\\Ifd', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Ifd', 'DOMNode' => 'ifd', 'alias' => array ( 0 => 'Interop', ), - 'defaultItemCollection' => 'Tag', + 'defaultItemCollection' => 'Tiff\\Tag', 'id' => 'Tiff\\IfdInteroperability', 'itemsByName' => array ( @@ -99,7 +99,7 @@ class IfdInteroperability extends CollectionBase { 0 => array ( 'components' => 4, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InteropIndex', 'title' => 'Interoperability Index', 'format' => @@ -125,7 +125,7 @@ class IfdInteroperability extends CollectionBase { array ( 'components' => 4, 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Version', - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'InteropVersion', 'title' => 'Interoperability Version', 'format' => @@ -140,7 +140,7 @@ class IfdInteroperability extends CollectionBase { array ( 0 => array ( - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RelatedImageFileFormat', 'title' => 'Related Image File Format', 'format' => @@ -156,7 +156,7 @@ class IfdInteroperability extends CollectionBase { 0 => array ( 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RelatedImageWidth', 'title' => 'Related Image Width', 'format' => @@ -176,7 +176,7 @@ class IfdInteroperability extends CollectionBase { 0 => 'RelatedImageLength', ), 'components' => 1, - 'collection' => 'Tag', + 'collection' => 'Tiff\\Tag', 'name' => 'RelatedImageHeight', 'title' => 'Related Image Height', 'format' => diff --git a/src/Collection/Tag.php b/src/Collection/Tiff/Tag.php similarity index 72% rename from src/Collection/Tag.php rename to src/Collection/Tiff/Tag.php index 0d65e94ec..aa9a47a2c 100644 --- a/src/Collection/Tag.php +++ b/src/Collection/Tiff/Tag.php @@ -6,7 +6,7 @@ */ // phpcs:disable -namespace FileEye\MediaProbe\Collection; +namespace FileEye\MediaProbe\Collection\Tiff; use FileEye\MediaProbe\Collection\CollectionBase; @@ -14,8 +14,8 @@ class Tag extends CollectionBase { protected static $map = array ( 'title' => 'Tag', - 'class' => 'FileEye\\MediaProbe\\Block\\Tag', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Tag', 'DOMNode' => 'tag', - 'id' => 'Tag', + 'id' => 'Tiff\\Tag', ); } diff --git a/src/Collection/Tiff/Tiff.php b/src/Collection/Tiff/Tiff.php index f1d7d4924..b46d778fa 100644 --- a/src/Collection/Tiff/Tiff.php +++ b/src/Collection/Tiff/Tiff.php @@ -14,7 +14,9 @@ class Tiff extends CollectionBase { protected static $map = array ( 'title' => 'TIFF image data', - 'class' => 'FileEye\\MediaProbe\\Block\\Tiff', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Tiff', + 'parser' => 'FileEye\\MediaProbe\\Parser\\Tiff\\Tiff', + 'writer' => 'FileEye\\MediaProbe\\Writer\\Tiff\\Tiff', 'DOMNode' => 'tiff', 'id' => 'Tiff\\Tiff', 'items' => diff --git a/src/Collection/UnknownTag.php b/src/Collection/Tiff/UnknownTag.php similarity index 72% rename from src/Collection/UnknownTag.php rename to src/Collection/Tiff/UnknownTag.php index 567b16577..a289aa590 100644 --- a/src/Collection/UnknownTag.php +++ b/src/Collection/Tiff/UnknownTag.php @@ -6,7 +6,7 @@ */ // phpcs:disable -namespace FileEye\MediaProbe\Collection; +namespace FileEye\MediaProbe\Collection\Tiff; use FileEye\MediaProbe\Collection\CollectionBase; @@ -14,8 +14,8 @@ class UnknownTag extends CollectionBase { protected static $map = array ( 'title' => 'Unknown Tag', - 'class' => 'FileEye\\MediaProbe\\Block\\Tag', + 'class' => 'FileEye\\MediaProbe\\Block\\Tiff\\Tag', 'DOMNode' => 'tag', - 'id' => 'UnknownTag', + 'id' => 'Tiff\\UnknownTag', ); } diff --git a/src/Command/DumpCommand.php b/src/Command/DumpCommand.php index 1ac0d0c73..a19f3ca42 100644 --- a/src/Command/DumpCommand.php +++ b/src/Command/DumpCommand.php @@ -2,11 +2,10 @@ namespace FileEye\MediaProbe\Command; -use FileEye\MediaProbe\Block\Exif\Exif; -use FileEye\MediaProbe\Block\Exif\Ifd; -use FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\Tag; -use FileEye\MediaProbe\Block\Tiff; +use FileEye\MediaProbe\Block\Jpeg\Exif; +use FileEye\MediaProbe\Block\Tiff\Ifd; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; +use FileEye\MediaProbe\Block\Tiff\Tag; use FileEye\MediaProbe\Dumper\DefaultDumper; use FileEye\MediaProbe\Media; use FileEye\MediaProbe\MediaProbe; diff --git a/src/Media.php b/src/Media.php index 393e55402..db0fc1a00 100644 --- a/src/Media.php +++ b/src/Media.php @@ -2,8 +2,6 @@ namespace FileEye\MediaProbe; -use FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\Tiff; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Collection\CollectionInterface; use FileEye\MediaProbe\Data\DataElement; @@ -119,7 +117,7 @@ public static function parse(DataElement $dataElement, ?LoggerInterface $externa // Build the Media object and its immediate child, that represents the actual media. Then // parse the media according to the media format. - $media = new static($externalLogger, $failLevel); + $media = new Media($externalLogger, $failLevel); $media->setAttribute('mimeType', (string) $mediaType->collection->getPropertyValue('item')); $media->getStopwatch()->start('media-parsing'); assert($media->debugInfo(['dataElement' => $dataElement])); @@ -197,4 +195,14 @@ public function getStopwatch(): Stopwatch { return $this->stopWatch; } + + public function collectInfo(array $context = []): array + { + $info = parent::collectInfo($context); + + $info['mimeType'] = $this->getAttribute('mimeType'); + $info['_msg'] .= ' MIME type: {mimeType}'; + + return $info; + } } diff --git a/src/Parser/Jpeg/Jpeg.php b/src/Parser/Jpeg/Jpeg.php index a5f89df8b..1fc2b6ee7 100644 --- a/src/Parser/Jpeg/Jpeg.php +++ b/src/Parser/Jpeg/Jpeg.php @@ -2,21 +2,17 @@ namespace FileEye\MediaProbe\Parser\Jpeg; -use FileEye\MediaProbe\Block\Jpeg as JpegBlock; +use FileEye\MediaProbe\Block\Jpeg\Jpeg as JpegBlock; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataException; use FileEye\MediaProbe\Data\DataFormat; -use FileEye\MediaProbe\Data\DataWindow; -use FileEye\MediaProbe\Entry\Core\Undefined; use FileEye\MediaProbe\ItemDefinition; -use FileEye\MediaProbe\MediaProbe; -use FileEye\MediaProbe\Model\BlockBase; use FileEye\MediaProbe\Parser\ParserBase; use FileEye\MediaProbe\Utility\ConvertBytes; /** - * Class for handling a JPEG image data. + * Class for parsing a JPEG image data. */ class Jpeg extends ParserBase { @@ -34,45 +30,45 @@ public function parseData(DataElement $data): void while ($offset < $data->getSize()) { // Get the next JPEG segment id offset. try { - $new_offset = $this->getJpegSegmentIdOffset($data, $offset); - $segment_id = $segment_id ?? 0; - if ($new_offset !== $offset) { + $newOffset = $this->getJpegSegmentIdOffset($data, $offset); + $segmentId = $segmentId ?? 0; + if ($newOffset !== $offset) { // Add any trailing data from previous segment in a // RawData block. $this->block->error('Unexpected data found at end of JPEG segment {id}/{hexid} @ offset {offset}, size {size}', [ - 'id' => $segment_id, - 'hexid' => '0x' . strtoupper(dechex($segment_id)), + 'id' => $segmentId, + 'hexid' => '0x' . strtoupper(dechex($segmentId)), 'offset' => $data->getAbsoluteOffset($offset), - 'size' => $new_offset - $offset, + 'size' => $newOffset - $offset, ]); $trail = new ItemDefinition( CollectionFactory::get('RawData', ['name' => 'trail']), DataFormat::BYTE, $offset ); - $this->block->addBlock($trail)->parseData($data, $offset, $new_offset - $offset); + $this->block->addBlock($trail)->parseData($data, $offset, $newOffset - $offset); } - $offset = $new_offset; + $offset = $newOffset; } catch (DataException $e) { $this->block->error($e->getMessage()); return; } // Get the JPEG segment id. - $segment_id = $data->getByte($offset + 1); + $segmentId = $data->getByte($offset + 1); // Warn if an unidentified segment is detected. - if (!in_array($segment_id, $this->block->getCollection()->listItemIds())) { + if (!in_array($segmentId, $this->block->getCollection()->listItemIds())) { $this->block->warning('Invalid JPEG marker {id}/{hexid} found @ offset {offset}', [ - 'id' => $segment_id, - 'hexid' => '0x' . strtoupper(dechex($segment_id)), + 'id' => $segmentId, + 'hexid' => '0x' . strtoupper(dechex($segmentId)), 'offset' => $data->getAbsoluteOffset($offset), ]); } // Get the JPEG segment size. - $segment_collection = $this->block->getCollection()->getItemCollection($segment_id); - $segment_size = match ($segment_collection->getPropertyValue('payload')) { + $segmentCollection = $this->block->getCollection()->getItemCollection($segmentId); + $segmentSize = match ($segmentCollection->getPropertyValue('payload')) { // The data window size is the JPEG delimiter byte and the segment identifier byte. 'none' => 2, // Read the length of the segment. The data window size includes the JPEG delimiter @@ -81,15 +77,15 @@ public function parseData(DataElement $data): void 'variable' => $data->getShort($offset + 2) + 2, // The data window size includes the JPEG delimiter byte and the segment identifier // byte. - 'fixed' => $segment_collection->getPropertyValue('components') + 2, + 'fixed' => $segmentCollection->getPropertyValue('components') + 2, // In case of image scan segment, the window is to the end of the data. 'scan' => null, }; // Parse the MediaProbe JPEG segment data. - $segment_definition = new ItemDefinition($segment_collection); - $segment = $this->block->addBlock($segment_definition); - $segment->parseData($data, $offset, $segment_size); + $segmentDefinition = new ItemDefinition($segmentCollection); + $segment = $this->block->addBlock($segmentDefinition); + $segment->parseData($data, $offset, $segmentSize); // Position to end of the segment. $offset += $segment->getSize(); @@ -112,7 +108,7 @@ public function parseData(DataElement $data): void * JPEG sections start with 0xFF. The first byte that is not 0xFF is a * marker (hopefully). * - * @param DataElement $data_element + * @param DataElement $dataElement * The data element to be checked. * @param int $offset * The starting offset in the data element. @@ -123,27 +119,27 @@ public function parseData(DataElement $data): void * @throws DataException * In case of marker not found. */ - protected function getJpegSegmentIdOffset(DataElement $data_element, int $offset): int + protected function getJpegSegmentIdOffset(DataElement $dataElement, int $offset): int { for ($i = $offset; $i < $offset + 128; $i++) { - if ($data_element->getByte($i) === JpegBlock::JPEG_DELIMITER && $data_element->getByte($i + 1) !== JpegBlock::JPEG_DELIMITER) { + if ($dataElement->getByte($i) === JpegBlock::JPEG_DELIMITER && $dataElement->getByte($i + 1) !== JpegBlock::JPEG_DELIMITER) { return $i; } } - throw new DataException('JPEG marker not found @%d', $data_element->getAbsoluteOffset($offset)); + throw new DataException('JPEG marker not found @%d', $dataElement->getAbsoluteOffset($offset)); } /** * Determines if the data is a JPEG image. * - * @param DataElement $data_element + * @param DataElement $dataElement * The data element to be checked. * * @return bool * TRUE if the data element is a JPEG image. */ - public static function isDataMatchingMediaType(DataElement $data_element): bool + public static function isDataMatchingMediaType(DataElement $dataElement): bool { - return $data_element->getBytes(0, 3) === JpegBlock::JPEG_HEADER; + return $dataElement->getBytes(0, 3) === JpegBlock::JPEG_HEADER; } } diff --git a/src/Parser/Tiff/Tiff.php b/src/Parser/Tiff/Tiff.php index 25ccc4469..30bec330a 100644 --- a/src/Parser/Tiff/Tiff.php +++ b/src/Parser/Tiff/Tiff.php @@ -2,21 +2,17 @@ namespace FileEye\MediaProbe\Parser\Tiff; -use FileEye\MediaProbe\Block\Tiff as TiffBlock; +use FileEye\MediaProbe\Block\Tiff\Tiff as TiffBlock; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Data\DataException; use FileEye\MediaProbe\Data\DataFormat; -use FileEye\MediaProbe\Data\DataWindow; -use FileEye\MediaProbe\Image; use FileEye\MediaProbe\ItemDefinition; -use FileEye\MediaProbe\MediaProbe; -use FileEye\MediaProbe\Model\BlockBase; use FileEye\MediaProbe\Parser\ParserBase; use FileEye\MediaProbe\Utility\ConvertBytes; /** - * Class for handling TIFF data. + * Class for parsing TIFF data. */ class Tiff extends ParserBase { @@ -30,23 +26,23 @@ public function parseData(DataElement $data): void assert($this->block->debugInfo(['dataElement' => $data])); // Starting IFD will be at offset 4 (2 bytes for byte order + 2 for header). - $ifd_offset = $data->getLong(4); + $ifdOffset = $data->getLong(4); // If the offset to first IFD is higher than 8, then there may be an // image scan (TIFF) in between. Store that in a RawData block. - if ($ifd_offset > 8) { + if ($ifdOffset > 8) { $scan = new ItemDefinition( collection: CollectionFactory::get('RawData', ['name' => 'scan']), format: DataFormat::BYTE, - valuesCount: $ifd_offset - 8, + valuesCount: $ifdOffset - 8, ); - $this->block->addBlock($scan)->parseData($data, 8, $ifd_offset - 8); + $this->block->addBlock($scan)->parseData($data, 8, $ifdOffset - 8); } // Loops through IFDs. In fact we should only have IFD0 and IFD1. for ($i = 0; $i <= 1; $i++) { // Check data is accessible, warn otherwise. - if ($ifd_offset >= $data->getSize() || $ifd_offset + 4 > $data->getSize()) { + if ($ifdOffset >= $data->getSize() || $ifdOffset + 4 > $data->getSize()) { $this->block->warning( 'Could not determine number of entries for {item}, overflow', ['item' => $this->block->getCollection()->getItemCollection($i)->getPropertyValue('name')] @@ -55,8 +51,8 @@ public function parseData(DataElement $data): void } // Find number of tags in IFD and warn if not enough data to read them. - $ifd_tags_count = $data->getShort($ifd_offset); - if ($ifd_offset + $ifd_tags_count * 4 > $data->getSize()) { + $ifdTagsCount = $data->getShort($ifdOffset); + if ($ifdOffset + $ifdTagsCount * 4 > $data->getSize()) { $this->block->warning( 'Invalid data for {item}', ['item' => $this->block->getCollection()->getItemCollection($i)->getPropertyValue('name')] @@ -67,9 +63,9 @@ public function parseData(DataElement $data): void // Create and load the IFDs. Note that the data element cannot // be split in windows since any pointer will refer to the // entire segment space. - $ifd_class = $this->block->getCollection()->getItemCollection($i)->getPropertyValue('class'); - $ifd_item = new ItemDefinition($this->block->getCollection()->getItemCollection($i), DataFormat::LONG, $ifd_tags_count, $ifd_offset, 0, $i); - $ifd = new $ifd_class($ifd_item, $this->block); + $ifdClass = $this->block->getCollection()->getItemCollection($i)->getPropertyValue('class'); + $ifdItem = new ItemDefinition($this->block->getCollection()->getItemCollection($i), DataFormat::LONG, $ifdTagsCount, $ifdOffset, 0, $i); + $ifd = new $ifdClass($ifdItem, $this->block); try { $ifd->parseData($data); } catch (DataException $e) { @@ -81,10 +77,10 @@ public function parseData(DataElement $data): void } // Offset to next IFD. - $ifd_offset = $data->getLong($ifd_offset + $ifd_tags_count * 12 + 2); + $ifdOffset = $data->getLong($ifdOffset + $ifdTagsCount * 12 + 2); // If next IFD offset is 0 we are finished. - if ($ifd_offset === 0) { + if ($ifdOffset === 0) { break; } @@ -99,14 +95,14 @@ public function parseData(DataElement $data): void /** * Determines if the data is a TIFF image. * - * @param DataElement $data_element + * @param DataElement $dataElement * The data element to be checked. * * @return bool */ - public static function isDataMatchingMediaType(DataElement $data_element): bool + public static function isDataMatchingMediaType(DataElement $dataElement): bool { - return static::getTiffSegmentByteOrder($data_element) !== null; + return static::getTiffSegmentByteOrder($dataElement) !== null; } /** @@ -116,28 +112,28 @@ public static function isDataMatchingMediaType(DataElement $data_element): bool * The byte order of the TIFF segment in case data is a TIFF block, null * otherwise. */ - public static function getTiffSegmentByteOrder(DataElement $data_element, int $offset = 0): ?int + public static function getTiffSegmentByteOrder(DataElement $dataElement, int $offset = 0): ?int { // There must be at least 8 bytes available: 2 bytes for the byte // order, 2 bytes for the TIFF header, and 4 bytes for the offset to // the first IFD. - if ($data_element->getSize() - $offset < 8) { + if ($dataElement->getSize() - $offset < 8) { return null; } // Byte order. - $order_string = $data_element->getBytes($offset, 2); - if ($order_string === 'II') { + $orderString = $dataElement->getBytes($offset, 2); + if ($orderString === 'II') { $order = ConvertBytes::LITTLE_ENDIAN; - } elseif ($order_string === 'MM') { + } elseif ($orderString === 'MM') { $order = ConvertBytes::BIG_ENDIAN; } else { return null; } // Verify the TIFF header. - $magic_string = $data_element->getBytes($offset + 2, 2); - if (ConvertBytes::toShort($magic_string, $order) !== TiffBlock::TIFF_HEADER) { + $magicString = $dataElement->getBytes($offset + 2, 2); + if (ConvertBytes::toShort($magicString, $order) !== TiffBlock::TIFF_HEADER) { return null; } diff --git a/tests/Bug3017880Test.php b/tests/Bug3017880Test.php index 4a68c23c8..acf66b04a 100644 --- a/tests/Bug3017880Test.php +++ b/tests/Bug3017880Test.php @@ -2,11 +2,11 @@ namespace FileEye\MediaProbe\Test; -use FileEye\MediaProbe\Block\Exif\Exif; -use FileEye\MediaProbe\Block\Exif\Ifd; -use FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\Tag; -use FileEye\MediaProbe\Block\Tiff; +use FileEye\MediaProbe\Block\Jpeg\Exif; +use FileEye\MediaProbe\Block\Tiff\Ifd; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; +use FileEye\MediaProbe\Block\Tiff\Tag; +use FileEye\MediaProbe\Block\Tiff\Tiff; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Data\DataFormat; use FileEye\MediaProbe\Data\DataString; @@ -32,7 +32,7 @@ public function testThisDoesNotWorkAsExpected() if ($exif === null) { $app1_segment_mock = $this->getStubRoot(); - $exif_definition = new ItemDefinition(CollectionFactory::get('Exif\Exif')); + $exif_definition = new ItemDefinition(CollectionFactory::get('Jpeg\Exif')); $exif = new Exif($exif_definition, $app1_segment_mock); $tiff_definition = new ItemDefinition(CollectionFactory::get('Tiff\Tiff')); new Tiff($tiff_definition, $exif); diff --git a/tests/GH16Test.php b/tests/GH16Test.php index e25f7906a..b4a32b8a3 100644 --- a/tests/GH16Test.php +++ b/tests/GH16Test.php @@ -2,11 +2,11 @@ namespace FileEye\MediaProbe\Test; -use FileEye\MediaProbe\Block\Exif\Exif; -use FileEye\MediaProbe\Block\Exif\Ifd; -use FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\Tag; -use FileEye\MediaProbe\Block\Tiff; +use FileEye\MediaProbe\Block\Jpeg\Exif; +use FileEye\MediaProbe\Block\Tiff\Ifd; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; +use FileEye\MediaProbe\Block\Tiff\Tag; +use FileEye\MediaProbe\Block\Tiff\Tiff; use FileEye\MediaProbe\Data\DataString; use FileEye\MediaProbe\Entry\WindowsString; use FileEye\MediaProbe\ItemDefinition; diff --git a/tests/GH21Test.php b/tests/GH21Test.php index 329e3de03..46454609a 100644 --- a/tests/GH21Test.php +++ b/tests/GH21Test.php @@ -2,9 +2,9 @@ namespace FileEye\MediaProbe\Test; -use FileEye\MediaProbe\Block\Exif\Exif; -use FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\JpegSegmentApp1; +use FileEye\MediaProbe\Block\Jpeg\Exif; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; +use FileEye\MediaProbe\Block\Jpeg\SegmentApp1; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Data\DataString; use FileEye\MediaProbe\ItemDefinition; @@ -68,10 +68,10 @@ public function testThisDoesNotWorkAsExpected() // Insert the APP1 segment before the COM one. $app1_segment_definition = new ItemDefinition($out_jpeg->getCollection()->getItemCollectionByName('APP1')); - $out_app1_segment = new JpegSegmentApp1($app1_segment_definition, $out_jpeg, $out_com_segment); + $out_app1_segment = new SegmentApp1($app1_segment_definition, $out_jpeg, $out_com_segment); // Add the EXIF block to the APP1 segment. - $exif_definition = new ItemDefinition(CollectionFactory::get('Exif\Exif')); + $exif_definition = new ItemDefinition(CollectionFactory::get('Jpeg\Exif')); $exif_block = new Exif($exif_definition, $out_app1_segment); $exif_data = $input_exif->toBytes(); $data_string = new DataString($exif_data); diff --git a/tests/GH77Test.php b/tests/GH77Test.php index b4219f2f5..8b949aff4 100644 --- a/tests/GH77Test.php +++ b/tests/GH77Test.php @@ -2,8 +2,8 @@ namespace FileEye\MediaProbe\Test; -use FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\Tiff; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; +use FileEye\MediaProbe\Block\Tiff\Tiff; use FileEye\MediaProbe\MediaProbe; use FileEye\MediaProbe\Media; diff --git a/tests/IfdTest.php b/tests/IfdTest.php index 32ed9fb01..6ac12fafe 100644 --- a/tests/IfdTest.php +++ b/tests/IfdTest.php @@ -2,12 +2,12 @@ namespace FileEye\MediaProbe\Test; -use FileEye\MediaProbe\Block\Exif\Ifd; +use FileEye\MediaProbe\Block\Tiff\Ifd; use FileEye\MediaProbe\Data\DataString; use FileEye\MediaProbe\Data\DataFormat; use FileEye\MediaProbe\ItemDefinition; -use FileEye\MediaProbe\Block\Tag; -use FileEye\MediaProbe\Block\Tiff; +use FileEye\MediaProbe\Block\Tiff\Tag; +use FileEye\MediaProbe\Block\Tiff\Tiff; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Entry\Core\Ascii; use FileEye\MediaProbe\Entry\Time; diff --git a/tests/MediaFilesTest.php b/tests/MediaFilesTest.php index 1054546be..1abc6090b 100644 --- a/tests/MediaFilesTest.php +++ b/tests/MediaFilesTest.php @@ -2,7 +2,7 @@ namespace FileEye\MediaProbe\Test; -use FileEye\MediaProbe\Block\Jpeg; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; use FileEye\MediaProbe\Data\DataString; use FileEye\MediaProbe\Model\EntryInterface; use FileEye\MediaProbe\Data\DataFormat; diff --git a/tests/MisplacedExifTest.php b/tests/MisplacedExifTest.php index d26461a57..7db658750 100644 --- a/tests/MisplacedExifTest.php +++ b/tests/MisplacedExifTest.php @@ -2,9 +2,9 @@ namespace FileEye\MediaProbe\Test; -use FileEye\MediaProbe\Block\Exif\Exif; -use FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\JpegSegmentApp1; +use FileEye\MediaProbe\Block\Jpeg\Exif; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; +use FileEye\MediaProbe\Block\Jpeg\SegmentApp1; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\ItemDefinition; use FileEye\MediaProbe\Media; @@ -27,8 +27,8 @@ public function testRead() // Add a new APP1 segment. $app1_segment_definition = new ItemDefinition(CollectionFactory::get('Jpeg\SegmentApp1')); - $app1_segment = new JpegSegmentApp1($app1_segment_definition, $jpeg); - $exif_definition = new ItemDefinition(CollectionFactory::get('Exif\Exif')); + $app1_segment = new SegmentApp1($app1_segment_definition, $jpeg); + $exif_definition = new ItemDefinition(CollectionFactory::get('Jpeg\Exif')); $newExif = new Exif($exif_definition, $app1_segment); // Ensure new APP1 segment is set to correct position among segments. diff --git a/tests/ReadWriteTest.php b/tests/ReadWriteTest.php index c125b2c6d..7081f30e1 100644 --- a/tests/ReadWriteTest.php +++ b/tests/ReadWriteTest.php @@ -2,12 +2,12 @@ namespace FileEye\MediaProbe\Test; -use FileEye\MediaProbe\Block\Exif\Exif; -use FileEye\MediaProbe\Block\Exif\Ifd; -use FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\JpegSegmentApp1; -use FileEye\MediaProbe\Block\Tag; -use FileEye\MediaProbe\Block\Tiff; +use FileEye\MediaProbe\Block\Jpeg\Exif; +use FileEye\MediaProbe\Block\Tiff\Ifd; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; +use FileEye\MediaProbe\Block\Jpeg\SegmentApp1; +use FileEye\MediaProbe\Block\Tiff\Tag; +use FileEye\MediaProbe\Block\Tiff\Tiff; use FileEye\MediaProbe\Data\DataString; use FileEye\MediaProbe\Entry\Core\Ascii; use FileEye\MediaProbe\Entry\Core\Byte; @@ -49,7 +49,7 @@ public function testWriteRead(array $entries) // Insert the APP1 segment before the COM one. $app1_segment_definition = new ItemDefinition($jpeg->getCollection()->getItemCollectionByName('APP1')); - $app1_segment = new JpegSegmentApp1($app1_segment_definition, $jpeg, $com_segment); + $app1_segment = new SegmentApp1($app1_segment_definition, $jpeg, $com_segment); $exif = new Exif(new ItemDefinition($app1_segment->getCollection()->getItemCollection('Exif')), $app1_segment); $this->assertNotNull($jpeg->getElement("jpegSegment/exif")); @@ -62,7 +62,7 @@ public function testWriteRead(array $entries) $ifd = new Ifd(new ItemDefinition($tiff->getCollection()->getItemCollection('0'), DataFormat::LONG), $tiff); foreach ($entries as $entry) { - $item_collection = $ifd->getCollection()->getItemCollection($entry[0], 0, 'UnknownTag', [ + $item_collection = $ifd->getCollection()->getItemCollection($entry[0], 0, 'Tiff\UnknownTag', [ 'item' => $entry[0], 'DOMNode' => 'tag', ]); @@ -83,14 +83,14 @@ public function testWriteRead(array $entries) $r_media = Media::parseFromFile(dirname(__FILE__) . '/test-output.jpg', null, 'error'); $r_jpeg = $r_media->getElement("jpeg"); - $this->assertInstanceOf('FileEye\MediaProbe\Block\Exif\Exif', $r_jpeg->getElement("jpegSegment/exif")); + $this->assertInstanceOf('FileEye\MediaProbe\Block\Jpeg\Exif', $r_jpeg->getElement("jpegSegment/exif")); $tiff = $r_jpeg->getElement("jpegSegment/exif/tiff"); - $this->assertInstanceOf('FileEye\MediaProbe\Block\Tiff', $tiff); + $this->assertInstanceOf('FileEye\MediaProbe\Block\Tiff\Tiff', $tiff); $this->assertCount(1, $tiff->getMultipleElements("ifd")); $ifd = $tiff->getElement("ifd[@name='IFD0']"); - $this->assertInstanceOf('FileEye\MediaProbe\Block\Exif\Ifd', $ifd); + $this->assertInstanceOf('FileEye\MediaProbe\Block\Tiff\Ifd', $ifd); $this->assertEquals($ifd->getAttribute('name'), 'IFD0'); foreach ($entries as $entry_name => $entry) { diff --git a/tests/SpecCompilerTest.php b/tests/SpecCompilerTest.php index 18dbfde81..e33934bfb 100644 --- a/tests/SpecCompilerTest.php +++ b/tests/SpecCompilerTest.php @@ -3,10 +3,10 @@ namespace FileEye\MediaProbe\Test; use FileEye\MediaProbe\Test\TestClasses\Core; -use FileEye\MediaProbe\Block\Exif\Ifd; +use FileEye\MediaProbe\Block\Tiff\Ifd; use FileEye\MediaProbe\Data\DataFormat; use FileEye\MediaProbe\ItemDefinition; -use FileEye\MediaProbe\Block\Tiff; +use FileEye\MediaProbe\Block\Tiff\Tiff; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Utility\SpecCompiler; use Symfony\Component\Filesystem\Filesystem; diff --git a/tests/SpecTest.php b/tests/SpecTest.php index c805f5e28..52bf639ca 100644 --- a/tests/SpecTest.php +++ b/tests/SpecTest.php @@ -2,11 +2,11 @@ namespace FileEye\MediaProbe\Test; -use FileEye\MediaProbe\Block\Exif\Ifd; +use FileEye\MediaProbe\Block\Tiff\Ifd; use FileEye\MediaProbe\Block\Index; use FileEye\MediaProbe\Block\Map; -use FileEye\MediaProbe\Block\Tag; -use FileEye\MediaProbe\Block\Tiff; +use FileEye\MediaProbe\Block\Tiff\Tag; +use FileEye\MediaProbe\Block\Tiff\Tiff; use FileEye\MediaProbe\Collection\CollectionException; use FileEye\MediaProbe\Collection\CollectionFactory; use FileEye\MediaProbe\Data\DataString; @@ -28,7 +28,7 @@ class SpecTest extends MediaProbeTestCaseBase */ public function testDefaultSpec() { - $tiff_mock = $this->getMockBuilder('FileEye\MediaProbe\Block\Tiff') + $tiff_mock = $this->getMockBuilder('FileEye\MediaProbe\Block\Tiff\Tiff') ->disableOriginalConstructor() ->getMock(); $ifd_0 = new Ifd(new ItemDefinition(CollectionFactory::get('Tiff\Ifd0'), DataFormat::LONG), $tiff_mock); @@ -46,8 +46,8 @@ public function testDefaultSpec() // Test retrieving IFD post-load callbacks. $this->assertEquals([ - 'FileEye\MediaProbe\Block\Exif\Ifd::thumbnailToBlock', - 'FileEye\MediaProbe\Block\Exif\Ifd::makerNoteToBlock', + 'FileEye\MediaProbe\Block\Tiff\Ifd::thumbnailToBlock', + 'FileEye\MediaProbe\Block\Tiff\Ifd::makerNoteToBlock', ], $ifd_0->getCollection()->getPropertyValue('postParse')); $this->assertNull($ifd_canon_camera_settings->getCollection()->getPropertyValue('postParse')); diff --git a/tests/Tags1Test.php b/tests/Tags1Test.php index cf516dd28..1a5fe88de 100644 --- a/tests/Tags1Test.php +++ b/tests/Tags1Test.php @@ -4,8 +4,8 @@ use FileEye\MediaProbe\MediaProbe; use FileEye\MediaProbe\Media; -use FileEye\MediaProbe\Block\Exif\Ifd; -use FileEye\MediaProbe\Block\Jpeg; +use FileEye\MediaProbe\Block\Tiff\Ifd; +use FileEye\MediaProbe\Block\Jpeg\Jpeg; class Tags1Test extends MediaProbeTestCaseBase { @@ -14,18 +14,18 @@ public function testTags() $media = Media::parseFromFile(dirname(__FILE__) . '/media-samples/image/test-tags-1.jpg', null, 'error'); $jpeg = $media->getElement("jpeg"); - $this->assertInstanceOf('FileEye\MediaProbe\Block\Exif\Exif', $jpeg->getElement("jpegSegment/exif")); - $this->assertInstanceOf('FileEye\MediaProbe\Block\Tiff', $jpeg->getElement("jpegSegment/exif/tiff")); + $this->assertInstanceOf('FileEye\MediaProbe\Block\Jpeg\Exif', $jpeg->getElement("jpegSegment/exif")); + $this->assertInstanceOf('FileEye\MediaProbe\Block\Tiff\Tiff', $jpeg->getElement("jpegSegment/exif/tiff")); $ifd0 = $jpeg->getElement("jpegSegment/exif/tiff/ifd[@name='IFD0']"); - $this->assertInstanceOf('FileEye\MediaProbe\Block\Exif\Ifd', $ifd0); + $this->assertInstanceOf('FileEye\MediaProbe\Block\Tiff\Ifd', $ifd0); $ratingPercent = $ifd0->getElement("tag[@name='RatingPercent']/entry"); $this->assertInstanceOf('FileEye\MediaProbe\Entry\Core\Short', $ratingPercent); $this->assertEquals(78, $ratingPercent->getValue()); $exifIfd = $ifd0->getElement("ifd[@name='ExifIFD']"); - $this->assertInstanceOf('FileEye\MediaProbe\Block\Exif\Ifd', $exifIfd); + $this->assertInstanceOf('FileEye\MediaProbe\Block\Tiff\Ifd', $exifIfd); $offsetTime = $exifIfd->getElement("tag[@name='OffsetTime']/entry"); $this->assertInstanceOf('FileEye\MediaProbe\Entry\Core\Ascii', $offsetTime); diff --git a/tests/fixtures/spec/valid_stub/Ifd0.yaml b/tests/fixtures/spec/valid_stub/Ifd0.yaml index fbffe4971..9bd9dae99 100644 --- a/tests/fixtures/spec/valid_stub/Ifd0.yaml +++ b/tests/fixtures/spec/valid_stub/Ifd0.yaml @@ -1,20 +1,20 @@ collection: Tiff\Ifd0 name: IFD0 title: IFD0 -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: ifd alias: - '0' - 'Main' items: 0x0100: - collection: tag + collection: Tiff\Tag name: ImageWidth title: 'Image Width' components: 1 format: [Short, Long] 0x0101: - collection: tag + collection: Tiff\Tag name: ImageLength title: 'Image Length' components: 1 diff --git a/tests/fixtures/spec/valid_stub/IfdExif.yaml b/tests/fixtures/spec/valid_stub/IfdExif.yaml index 3e130669f..1b85a3804 100644 --- a/tests/fixtures/spec/valid_stub/IfdExif.yaml +++ b/tests/fixtures/spec/valid_stub/IfdExif.yaml @@ -1,17 +1,17 @@ collection: IfdExif name: ExifIFD title: IFD Exif -class: FileEye\MediaProbe\Block\Exif\Ifd +class: FileEye\MediaProbe\Block\Tiff\Ifd DOMNode: ifd items: 0x829A: - collection: tag + collection: Tiff\Tag name: ExposureTime title: 'Exposure Time' components: 1 format: Rational 0x829D: - collection: tag + collection: Tiff\Tag name: FNumber title: FNumber components: 1 diff --git a/tests/fixtures/spec/valid_stub/Tiff.yaml b/tests/fixtures/spec/valid_stub/Tiff.yaml index 5187eec56..9985655f4 100644 --- a/tests/fixtures/spec/valid_stub/Tiff.yaml +++ b/tests/fixtures/spec/valid_stub/Tiff.yaml @@ -1,7 +1,7 @@ collection: Tiff name: Tiff title: TIFF image -class: FileEye\MediaProbe\Block\Tiff +class: FileEye\MediaProbe\Block\Tiff\Tiff DOMNode: ifd items: 0: diff --git a/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml b/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml index 132ad2d37..072158594 100644 --- a/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml +++ b/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml @@ -146,15 +146,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -172,7 +172,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -190,7 +190,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -199,21 +199,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -222,11 +222,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -240,11 +240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Artist:315' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Artist id: '315' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Copyright:33432' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Copyright id: '33432' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,7 +384,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -393,11 +393,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -411,11 +411,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -429,11 +429,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -447,11 +447,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -465,11 +465,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -483,11 +483,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -501,11 +501,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -519,11 +519,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -537,11 +537,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -555,11 +555,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -573,11 +573,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -591,11 +591,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -609,11 +609,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -627,11 +627,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -645,7 +645,7 @@ elements: - node: makerNote path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: Canon id: '37500' @@ -680,11 +680,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MacroMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -698,11 +698,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SelfTimer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -716,11 +716,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Quality:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Quality id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -734,11 +734,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonFlashMode:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashMode id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -752,11 +752,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ContinuousDrive:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousDrive id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -770,11 +770,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusMode:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusMode id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -788,11 +788,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:RecordMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecordMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -806,11 +806,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonImageSize:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageSize id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -824,11 +824,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:EasyMode:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: EasyMode id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -842,11 +842,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DigitalZoom:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoom id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -860,11 +860,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Contrast:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -878,11 +878,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Saturation:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -896,11 +896,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Sharpness:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -914,11 +914,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CameraISO:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraISO id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -932,11 +932,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MeteringMode:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -950,11 +950,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusRange:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusRange id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -968,11 +968,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AFPoint:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPoint id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -986,11 +986,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonExposureMode:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonExposureMode id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1004,11 +1004,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:LensType:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1022,11 +1022,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxFocalLength:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1040,11 +1040,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinFocalLength:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1058,11 +1058,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocalUnits:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalUnits id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1076,11 +1076,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxAperture:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxAperture id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1094,11 +1094,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinAperture:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinAperture id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1112,11 +1112,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashActivity:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashActivity id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1130,11 +1130,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashBits id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1148,11 +1148,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusContinuous:32' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusContinuous id: '32' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1166,11 +1166,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AESetting:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AESetting id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1184,11 +1184,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ImageStabilization:34' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageStabilization id: '34' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1202,11 +1202,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DisplayAperture:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DisplayAperture id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1220,11 +1220,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomSourceWidth:36' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomSourceWidth id: '36' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1238,11 +1238,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomTargetWidth:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomTargetWidth id: '37' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1256,11 +1256,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SpotMeteringMode:39' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpotMeteringMode id: '39' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1274,11 +1274,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:PhotoEffect:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotoEffect id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1292,11 +1292,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ManualFlashOutput:41' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualFlashOutput id: '41' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1310,11 +1310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ColorTone:42' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTone id: '42' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1328,11 +1328,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SRAWQuality:46' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SRAWQuality id: '46' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1355,11 +1355,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalType:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalType id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1373,11 +1373,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalLength:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1391,11 +1391,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneXSize:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXSize id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1409,11 +1409,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneYSize:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYSize id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1427,11 +1427,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFlashInfo:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashInfo id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1471,11 +1471,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoISO:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoISO id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1489,11 +1489,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BaseISO:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BaseISO id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1507,11 +1507,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1525,11 +1525,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetAperture:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetAperture id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1543,11 +1543,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetExposureTime:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetExposureTime id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1561,11 +1561,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureCompensation:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1579,11 +1579,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:WhiteBalance:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1597,11 +1597,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SlowShutter:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SlowShutter id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1615,11 +1615,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SequenceNumber:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SequenceNumber id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1633,11 +1633,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:OpticalZoomCode:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OpticalZoomCode id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1651,11 +1651,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraTemperature:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1669,11 +1669,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashGuideNumber:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashGuideNumber id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1687,11 +1687,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AFPointsInFocus:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1705,11 +1705,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashExposureComp:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureComp id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1723,11 +1723,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoExposureBracketing:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoExposureBracketing id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1741,11 +1741,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AEBBracketValue:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBBracketValue id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1759,11 +1759,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ControlMode:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ControlMode id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1777,11 +1777,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceUpper:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1795,11 +1795,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceLower:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1813,11 +1813,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FNumber:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1831,11 +1831,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureTime:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1849,11 +1849,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV2:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV2 id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1867,11 +1867,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BulbDuration:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BulbDuration id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1885,11 +1885,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraType:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraType id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1903,11 +1903,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoRotate:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoRotate id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1921,11 +1921,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:NDFilter:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NDFilter id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1939,11 +1939,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SelfTimer2:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer2 id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1957,11 +1957,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashOutput:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashOutput id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1975,11 +1975,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonImageType:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageType id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1993,11 +1993,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFirmwareVersion:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFirmwareVersion id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2011,11 +2011,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:OwnerName:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OwnerName id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2055,11 +2055,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FNumber:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2073,11 +2073,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ExposureTime:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2091,11 +2091,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ISO:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2109,11 +2109,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:CameraTemperature:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2127,11 +2127,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FocalLength:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2145,11 +2145,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:CameraOrientation:125' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraOrientation id: '125' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2163,11 +2163,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FocusDistanceUpper:140' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '140' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2181,11 +2181,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FocusDistanceLower:142' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '142' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2199,11 +2199,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:WhiteBalance:188' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '188' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2217,11 +2217,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ColorTemperature:192' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTemperature id: '192' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2235,11 +2235,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:PictureStyle:244' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyle id: '244' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2253,11 +2253,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:LensType:295' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '295' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2271,11 +2271,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:MinFocalLength:297' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '297' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2289,11 +2289,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:MaxFocalLength:299' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '299' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2307,11 +2307,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FirmwareVersion:539' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FirmwareVersion id: '539' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2325,11 +2325,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FirmwareVersion:544' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: FirmwareVersion id: '544' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2343,11 +2343,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FileIndex:624' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileIndex id: '624' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2361,11 +2361,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FileIndex:628' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileIndex id: '628' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2379,11 +2379,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:DirectoryIndex:636' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DirectoryIndex id: '636' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2397,11 +2397,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:DirectoryIndex:640' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DirectoryIndex id: '640' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2415,11 +2415,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonModelID:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonModelID id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2433,11 +2433,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ThumbnailImageValidArea:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ThumbnailImageValidArea id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2451,10 +2451,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '25' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2495,11 +2495,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2513,11 +2513,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:NumAFPoints:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NumAFPoints id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2531,11 +2531,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:ValidAFPoints:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ValidAFPoints id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2549,11 +2549,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:CanonImageWidth:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageWidth id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2567,11 +2567,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:CanonImageHeight:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageHeight id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2585,11 +2585,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFImageWidth:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageWidth id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2603,11 +2603,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFImageHeight:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageHeight id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2621,11 +2621,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaWidths:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaWidths id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2639,11 +2639,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaHeights:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaHeights id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2657,11 +2657,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaXPositions:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaXPositions id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2675,11 +2675,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaYPositions:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaYPositions id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2693,11 +2693,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFPointsInFocus:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2711,11 +2711,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFPointsSelected:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsSelected id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2729,11 +2729,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:PrimaryAFPoint:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrimaryAFPoint id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2747,10 +2747,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '15' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2764,10 +2764,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2807,11 +2807,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonTimeInfo:53/tag:TimeZone:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TimeZone id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2825,11 +2825,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonTimeInfo:53/tag:TimeZoneCity:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TimeZoneCity id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2843,11 +2843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonTimeInfo:53/tag:DaylightSavings:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DaylightSavings id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2887,11 +2887,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FileNumber:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileNumber id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2905,11 +2905,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketMode:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketMode id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2923,11 +2923,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketValue:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketValue id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2941,11 +2941,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketShotNumber:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketShotNumber id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2959,11 +2959,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgQuality:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgQuality id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2977,11 +2977,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgSize:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgSize id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2995,11 +2995,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:LongExposureNoiseReduction2:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LongExposureNoiseReduction2 id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3013,11 +3013,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3031,11 +3031,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketValueAB:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketValueAB id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3049,11 +3049,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketValueGM:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketValueGM id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3067,11 +3067,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FilterEffect:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FilterEffect id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3085,11 +3085,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:ToningEffect:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToningEffect id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3103,11 +3103,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:MacroMagnification:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMagnification id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3121,11 +3121,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:LiveViewShooting:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LiveViewShooting id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3139,11 +3139,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FocusDistanceUpper:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3157,11 +3157,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FocusDistanceLower:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3175,11 +3175,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FlashExposureLock:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureLock id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3193,11 +3193,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:LensModel:149' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: LensModel id: '149' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3211,11 +3211,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:InternalSerialNumber:150' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InternalSerialNumber id: '150' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3229,11 +3229,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:DustRemovalData:151' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DustRemovalData id: '151' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3256,11 +3256,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropLeftMargin:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropLeftMargin id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3274,11 +3274,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropRightMargin:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropRightMargin id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3292,11 +3292,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropTopMargin:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropTopMargin id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3310,11 +3310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropBottomMargin:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropBottomMargin id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3346,11 +3346,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ExposureLevelIncrements:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureLevelIncrements id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3364,11 +3364,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ISOSpeedRange:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISOSpeedRange id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3391,11 +3391,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:HighlightTonePriority:515' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: HighlightTonePriority id: '515' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3418,11 +3418,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFAssistBeam:1294' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAssistBeam id: '1294' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3436,11 +3436,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:MirrorLockup:1551' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MirrorLockup id: '1551' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3463,11 +3463,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:Shutter-AELock:1793' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Shutter-AELock id: '1793' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3481,11 +3481,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:SetButtonWhenShooting:1796' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SetButtonWhenShooting id: '1796' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3499,11 +3499,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:LCDDisplayAtPowerOn:2065' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LCDDisplayAtPowerOn id: '2065' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3526,11 +3526,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:AspectRatio:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AspectRatio id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3544,11 +3544,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageWidth:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageWidth id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3562,11 +3562,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageHeight:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageHeight id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3580,11 +3580,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageLeft:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageLeft id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3598,11 +3598,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageTop:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageTop id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3643,11 +3643,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:ToneCurve:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToneCurve id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3661,11 +3661,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:Sharpness:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3679,11 +3679,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SharpnessFrequency:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SharpnessFrequency id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3697,11 +3697,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SensorRedLevel:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorRedLevel id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3715,11 +3715,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SensorBlueLevel:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorBlueLevel id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3733,11 +3733,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalanceRed:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalanceRed id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3751,11 +3751,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalanceBlue:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalanceBlue id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3769,11 +3769,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalance:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3787,11 +3787,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:ColorTemperature:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTemperature id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3805,11 +3805,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:PictureStyle:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyle id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3823,11 +3823,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:DigitalGain:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalGain id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3841,11 +3841,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WBShiftAB:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBShiftAB id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3859,11 +3859,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WBShiftGM:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBShiftGM id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3904,11 +3904,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:MeasuredRGGB:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredRGGB id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3922,10 +3922,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '2' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -3939,11 +3939,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ColorSpace:180' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '180' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3957,11 +3957,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:VRDOffset:208' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: VRDOffset id: '208' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4002,11 +4002,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorWidth:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorWidth id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4020,11 +4020,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorHeight:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorHeight id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4038,10 +4038,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '3' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4055,10 +4055,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '4' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4072,11 +4072,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorLeftBorder:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorLeftBorder id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4090,11 +4090,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorTopBorder:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorTopBorder id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4108,11 +4108,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorRightBorder:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorRightBorder id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4126,11 +4126,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorBottomBorder:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorBottomBorder id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4144,11 +4144,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskLeftBorder:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskLeftBorder id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4162,11 +4162,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskTopBorder:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskTopBorder id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4180,11 +4180,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskRightBorder:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskRightBorder id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4198,11 +4198,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskBottomBorder:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskBottomBorder id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4216,10 +4216,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '13' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4233,10 +4233,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '14' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4250,10 +4250,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '15' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4267,10 +4267,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4310,11 +4310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorDataVersion:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorDataVersion id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4328,11 +4328,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsAsShot:63' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsAsShot id: '63' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4346,11 +4346,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempAsShot:67' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempAsShot id: '67' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4364,11 +4364,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsAuto:68' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsAuto id: '68' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4382,11 +4382,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempAuto:72' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempAuto id: '72' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4400,11 +4400,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsMeasured:73' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsMeasured id: '73' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4418,11 +4418,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempMeasured:77' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempMeasured id: '77' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4436,11 +4436,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown:78' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown id: '78' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4454,11 +4454,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown:82' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown id: '82' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4472,11 +4472,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown2:83' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown2 id: '83' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4490,11 +4490,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown2:87' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown2 id: '87' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4508,11 +4508,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown3:88' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown3 id: '88' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4526,11 +4526,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown3:92' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown3 id: '92' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4544,11 +4544,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown4:93' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown4 id: '93' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4562,11 +4562,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown4:97' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown4 id: '97' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4580,11 +4580,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown5:98' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown5 id: '98' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4598,11 +4598,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown5:102' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown5 id: '102' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4616,11 +4616,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown6:103' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown6 id: '103' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4634,11 +4634,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown6:107' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown6 id: '107' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4652,11 +4652,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown7:108' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown7 id: '108' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4670,11 +4670,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown7:112' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown7 id: '112' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4688,11 +4688,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown8:113' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown8 id: '113' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4706,11 +4706,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown8:117' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown8 id: '117' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4724,11 +4724,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown9:118' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown9 id: '118' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4742,11 +4742,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown9:122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown9 id: '122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4760,11 +4760,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown10:123' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown10 id: '123' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4778,11 +4778,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown10:127' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown10 id: '127' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4796,11 +4796,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsDaylight:128' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsDaylight id: '128' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4814,11 +4814,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempDaylight:132' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempDaylight id: '132' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4832,11 +4832,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsShade:133' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsShade id: '133' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4850,11 +4850,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempShade:137' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempShade id: '137' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4868,11 +4868,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsCloudy:138' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsCloudy id: '138' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4886,11 +4886,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempCloudy:142' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempCloudy id: '142' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4904,11 +4904,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsTungsten:143' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsTungsten id: '143' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4922,11 +4922,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempTungsten:147' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempTungsten id: '147' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4940,11 +4940,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsFluorescent:148' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsFluorescent id: '148' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4958,11 +4958,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempFluorescent:152' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempFluorescent id: '152' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4976,11 +4976,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsKelvin:153' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsKelvin id: '153' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4994,11 +4994,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempKelvin:157' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempKelvin id: '157' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5012,11 +5012,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsFlash:158' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsFlash id: '158' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5030,11 +5030,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempFlash:162' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempFlash id: '162' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5048,11 +5048,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown11:163' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown11 id: '163' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5066,11 +5066,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown11:167' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown11 id: '167' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5084,11 +5084,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown12:168' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown12 id: '168' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5102,11 +5102,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown12:172' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown12 id: '172' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5120,11 +5120,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown13:173' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown13 id: '173' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5138,11 +5138,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown13:177' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown13 id: '177' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5156,11 +5156,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown14:178' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown14 id: '178' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5174,11 +5174,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown14:182' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown14 id: '182' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5192,11 +5192,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown15:183' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown15 id: '183' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5210,11 +5210,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown15:187' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown15 id: '187' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5228,11 +5228,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown16:188' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown16 id: '188' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5246,11 +5246,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown16:192' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown16 id: '192' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5264,11 +5264,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown17:193' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown17 id: '193' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5282,11 +5282,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown17:197' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown17 id: '197' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5300,11 +5300,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown18:198' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown18 id: '198' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5318,11 +5318,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown18:202' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown18 id: '202' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5336,11 +5336,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown19:203' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown19 id: '203' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5354,11 +5354,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown19:207' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown19 id: '207' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5372,11 +5372,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown20:208' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown20 id: '208' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5390,11 +5390,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown20:212' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown20 id: '212' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5408,11 +5408,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:AverageBlackLevel:276' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AverageBlackLevel id: '276' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5426,11 +5426,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:RawMeasuredRGGB:429' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawMeasuredRGGB id: '429' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5444,11 +5444,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:PerChannelBlackLevel:504' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PerChannelBlackLevel id: '504' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5462,11 +5462,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:NormalWhiteLevel:508' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NormalWhiteLevel id: '508' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5480,11 +5480,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:SpecularWhiteLevel:509' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpecularWhiteLevel id: '509' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5498,11 +5498,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:LinearityUpperMargin:510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LinearityUpperMargin id: '510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5516,11 +5516,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:RawMeasuredRGGB:619' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawMeasuredRGGB id: '619' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5534,11 +5534,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:PerChannelBlackLevel:728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PerChannelBlackLevel id: '728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5552,11 +5552,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:NormalWhiteLevel:732' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NormalWhiteLevel id: '732' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5570,11 +5570,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:SpecularWhiteLevel:733' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpecularWhiteLevel id: '733' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5588,11 +5588,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:LinearityUpperMargin:734' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LinearityUpperMargin id: '734' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5606,11 +5606,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:PictureStyleUserDef:16392' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyleUserDef id: '16392' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5624,11 +5624,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:PictureStylePC:16393' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStylePC id: '16393' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5642,11 +5642,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CustomPictureStyleFileName:16400' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomPictureStyleFileName id: '16400' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5660,10 +5660,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16401' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16401' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5677,10 +5677,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16402' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16402' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5738,11 +5738,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAFMicroAdj:16403/tag:AFMicroAdjMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroAdjMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5756,11 +5756,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAFMicroAdj:16403/tag:AFMicroAdjValue:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroAdjValue id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5774,11 +5774,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonVignettingCorr:16405' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonVignettingCorr id: '16405' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5836,11 +5836,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonVignettingCorr2:16406/tag:PeripheralLightingSetting:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PeripheralLightingSetting id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5854,11 +5854,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonVignettingCorr2:16406/tag:ChromaticAberrationSetting:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ChromaticAberrationSetting id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5898,11 +5898,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:PeripheralIlluminationCorr:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PeripheralIlluminationCorr id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5916,11 +5916,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:AutoLightingOptimizer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoLightingOptimizer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5934,11 +5934,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:HighlightTonePriority:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: HighlightTonePriority id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5952,11 +5952,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:LongExposureNoiseReduction:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LongExposureNoiseReduction id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5970,11 +5970,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:HighISONoiseReduction:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: HighISONoiseReduction id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5988,11 +5988,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonLensInfo:16409' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonLensInfo id: '16409' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6050,11 +6050,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAmbience:16416/tag:AmbienceSelection:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AmbienceSelection id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6068,11 +6068,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonRawBurstModeRoll:16421' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonRawBurstModeRoll id: '16421' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6086,10 +6086,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16423' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16423' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6103,11 +6103,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6121,11 +6121,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTime:37520' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTime id: '37520' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6139,11 +6139,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6157,11 +6157,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6175,11 +6175,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6193,11 +6193,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6211,11 +6211,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6229,11 +6229,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6247,7 +6247,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -6256,11 +6256,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6274,11 +6274,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6292,11 +6292,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6310,11 +6310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6328,11 +6328,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6346,11 +6346,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6364,11 +6364,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6382,11 +6382,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6400,11 +6400,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6418,7 +6418,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -6427,11 +6427,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSVersionID id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6445,7 +6445,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -6454,11 +6454,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6472,11 +6472,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6490,11 +6490,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6508,11 +6508,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6542,7 +6542,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -6560,7 +6560,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -6578,7 +6578,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -6596,7 +6596,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF2:194' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF2 id: '194' @@ -6614,7 +6614,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -6632,7 +6632,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -6650,7 +6650,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -6668,7 +6668,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -6738,7 +6738,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: canon-eos-650d.jpg - FileDateTime: 1690031131 + FileDateTime: 1639835048 FileSize: 42207 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/broken/gh-10-a.jpg.dump.yml b/tests/media-dumps/image/broken/gh-10-a.jpg.dump.yml index 0aa56f13f..974a508b7 100644 --- a/tests/media-dumps/image/broken/gh-10-a.jpg.dump.yml +++ b/tests/media-dumps/image/broken/gh-10-a.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -46,21 +46,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: false name: IFD0 id: '0' @@ -69,11 +69,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,11 +231,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -249,11 +249,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -267,11 +267,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Copyright:33432' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Copyright id: '33432' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -285,7 +285,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,11 +636,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -654,11 +654,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -672,11 +672,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -690,11 +690,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -708,11 +708,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -726,7 +726,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP12:236' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP12 id: '236' @@ -744,7 +744,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -762,7 +762,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP2:226' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP2 id: '226' @@ -780,7 +780,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP14:238' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP14 id: '238' @@ -798,7 +798,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -816,7 +816,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -834,7 +834,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -852,7 +852,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -870,7 +870,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -893,13 +893,13 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - message: 'Found 21 data components, expected 20 for item ''ModifyDate'' in ''IFD0''' + message: "Found 21 data components, expected 20 for item 'ModifyDate' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - message: 'Found 21 data components, expected 20 for item ''DateTimeOriginal'' in ''ExifIFD''' + message: "Found 21 data components, expected 20 for item 'DateTimeOriginal' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - message: 'Found 21 data components, expected 20 for item ''CreateDate'' in ''ExifIFD''' + message: "Found 21 data components, expected 20 for item 'CreateDate' in 'ExifIFD'" gdInfo: 0: 330 1: 220 @@ -910,7 +910,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: gh-10-a.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 33843 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/broken/gh-10-b.jpg.dump.yml b/tests/media-dumps/image/broken/gh-10-b.jpg.dump.yml index 26b15cc4a..264c05081 100644 --- a/tests/media-dumps/image/broken/gh-10-b.jpg.dump.yml +++ b/tests/media-dumps/image/broken/gh-10-b.jpg.dump.yml @@ -108,15 +108,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -134,7 +134,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -152,7 +152,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -161,21 +161,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -184,11 +184,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -202,11 +202,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -220,11 +220,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -238,11 +238,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -256,11 +256,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -274,11 +274,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -292,11 +292,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -310,11 +310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -328,11 +328,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -346,11 +346,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -364,11 +364,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -382,11 +382,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -400,11 +400,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -418,11 +418,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -436,7 +436,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: false name: ExifIFD id: '34665' @@ -445,11 +445,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -463,11 +463,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -481,11 +481,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -499,11 +499,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -517,11 +517,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -535,11 +535,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -553,11 +553,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -571,11 +571,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -589,11 +589,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -607,11 +607,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -625,11 +625,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -643,11 +643,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -661,11 +661,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -679,11 +679,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -697,7 +697,7 @@ elements: - node: makerNote path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: Canon id: '37500' @@ -732,11 +732,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MacroMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -750,11 +750,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SelfTimer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -768,11 +768,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Quality:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Quality id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -786,11 +786,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonFlashMode:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashMode id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -804,11 +804,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ContinuousDrive:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousDrive id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -822,11 +822,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusMode:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusMode id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -840,11 +840,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:RecordMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecordMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -858,11 +858,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonImageSize:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageSize id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -876,11 +876,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:EasyMode:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: EasyMode id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -894,11 +894,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DigitalZoom:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoom id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -912,11 +912,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Contrast:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -930,11 +930,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Saturation:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -948,11 +948,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Sharpness:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -966,11 +966,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CameraISO:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraISO id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -984,11 +984,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MeteringMode:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1002,11 +1002,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusRange:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusRange id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1020,11 +1020,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AFPoint:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPoint id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1038,11 +1038,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonExposureMode:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonExposureMode id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1056,11 +1056,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:LensType:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1074,11 +1074,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxFocalLength:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1092,11 +1092,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinFocalLength:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1110,11 +1110,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocalUnits:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalUnits id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1128,11 +1128,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxAperture:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxAperture id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1146,11 +1146,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinAperture:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinAperture id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1164,11 +1164,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashActivity:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashActivity id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1182,11 +1182,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashBits id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1200,11 +1200,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusContinuous:32' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusContinuous id: '32' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1218,11 +1218,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AESetting:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AESetting id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1236,11 +1236,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ImageStabilization:34' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageStabilization id: '34' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1254,11 +1254,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DisplayAperture:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DisplayAperture id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1272,11 +1272,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomSourceWidth:36' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomSourceWidth id: '36' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1290,11 +1290,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomTargetWidth:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomTargetWidth id: '37' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1308,11 +1308,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SpotMeteringMode:39' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpotMeteringMode id: '39' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1326,11 +1326,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:PhotoEffect:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotoEffect id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1344,11 +1344,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ManualFlashOutput:41' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualFlashOutput id: '41' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1362,11 +1362,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ColorTone:42' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTone id: '42' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1389,11 +1389,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalType:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalType id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1407,11 +1407,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalLength:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1425,11 +1425,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneXSize:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXSize id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1443,11 +1443,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneYSize:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYSize id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1461,11 +1461,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFlashInfo:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashInfo id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1479,11 +1479,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:FileNumber:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileNumber id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1497,11 +1497,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonModelID:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonModelID id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1515,11 +1515,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1533,11 +1533,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1551,11 +1551,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1569,11 +1569,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1587,11 +1587,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1605,7 +1605,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1623,7 +1623,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1641,7 +1641,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1659,7 +1659,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1677,7 +1677,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1695,7 +1695,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1713,7 +1713,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1731,7 +1731,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1749,7 +1749,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1775,34 +1775,34 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1' - message: 'Could not access value for item ''SRAWQuality'' in ''CanonCameraSettings'', overflow' + message: "Could not access value for item 'SRAWQuality' in 'CanonCameraSettings', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - message: 'Could not get value for item ''CanonShotInfo'' in ''Canon'', not enough data' + message: "Could not get value for item 'CanonShotInfo' in 'Canon', not enough data" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - message: 'Could not access value for item ''n/a'' in ''Canon'', overflow' + message: "Could not access value for item 'n/a' in 'Canon', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - message: 'Could not access value for item ''n/a'' in ''Canon'', overflow' + message: "Could not access value for item 'n/a' in 'Canon', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - message: 'Could not access value for item ''CanonAFInfo'' in ''Canon'', overflow' + message: "Could not access value for item 'CanonAFInfo' in 'Canon', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - message: 'Could not access value for item ''ThumbnailImageValidArea'' in ''Canon'', overflow' + message: "Could not access value for item 'ThumbnailImageValidArea' in 'Canon', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - message: 'Could not access value for item ''CanonImageType'' in ''Canon'', overflow' + message: "Could not access value for item 'CanonImageType' in 'Canon', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - message: 'Could not access value for item ''CanonFirmwareVersion'' in ''Canon'', overflow' + message: "Could not access value for item 'CanonFirmwareVersion' in 'Canon', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - message: 'Could not access value for item ''OwnerName'' in ''Canon'', overflow' + message: "Could not access value for item 'OwnerName' in 'Canon', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - message: 'Could not access value for item ''CanonCameraInfo'' in ''Canon'', overflow' + message: "Could not access value for item 'CanonCameraInfo' in 'Canon', overflow" gdInfo: 0: 150 1: 150 @@ -1813,7 +1813,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: gh-10-b.jpg - FileDateTime: 1644525798 + FileDateTime: 1639835048 FileSize: 12043 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/broken/gh-11.jpg.dump.yml b/tests/media-dumps/image/broken/gh-11.jpg.dump.yml index 4fb127887..8f8496424 100644 --- a/tests/media-dumps/image/broken/gh-11.jpg.dump.yml +++ b/tests/media-dumps/image/broken/gh-11.jpg.dump.yml @@ -44,15 +44,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -70,7 +70,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -88,7 +88,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -97,14 +97,14 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: @@ -128,7 +128,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -137,11 +137,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -155,11 +155,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -173,11 +173,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -191,11 +191,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -209,11 +209,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -227,11 +227,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -245,11 +245,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -263,11 +263,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -281,11 +281,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -299,7 +299,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -308,11 +308,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -326,11 +326,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -344,11 +344,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -362,11 +362,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -380,11 +380,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -398,11 +398,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -416,11 +416,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -434,11 +434,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -452,11 +452,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -470,11 +470,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -488,11 +488,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -506,11 +506,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -524,11 +524,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -542,11 +542,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -560,11 +560,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -578,11 +578,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -596,11 +596,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -614,11 +614,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -632,11 +632,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -650,11 +650,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -668,7 +668,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -677,11 +677,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -695,11 +695,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -713,11 +713,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -731,11 +731,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -749,11 +749,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -767,11 +767,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -785,11 +785,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -803,11 +803,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -821,11 +821,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -839,11 +839,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -857,11 +857,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -875,11 +875,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -893,11 +893,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -911,11 +911,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -929,11 +929,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -947,11 +947,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -965,11 +965,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -983,11 +983,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1001,11 +1001,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1019,11 +1019,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1037,10 +1037,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:40965' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '40965' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1054,11 +1054,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1072,11 +1072,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1090,11 +1090,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1108,11 +1108,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1126,11 +1126,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1144,11 +1144,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1162,11 +1162,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1180,11 +1180,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1198,11 +1198,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1216,11 +1216,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1234,11 +1234,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1252,11 +1252,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1270,11 +1270,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1288,11 +1288,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1306,11 +1306,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1324,11 +1324,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1342,11 +1342,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1360,11 +1360,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1378,7 +1378,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1396,7 +1396,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1414,7 +1414,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1432,7 +1432,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1450,7 +1450,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1468,7 +1468,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1486,7 +1486,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1504,7 +1504,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1522,7 +1522,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1539,70 +1539,70 @@ elements: text: '2 byte(s) of data' log: WARNING: - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - message: 'Error processing IFD1: Offset out of bounds - rel 2716 [0, 2715], abs 2746 [30, 2745].' - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - message: 'Found SignedRational data format, expected Rational for item ''XResolution'' in ''IFD0''' + message: "Found SignedRational data format, expected Rational for item 'XResolution' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - message: 'Found SignedRational data format, expected Rational for item ''YResolution'' in ''IFD0''' + message: "Found SignedRational data format, expected Rational for item 'YResolution' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - message: 'Found 21 data components, expected 20 for item ''ModifyDate'' in ''IFD0''' + message: "Found 21 data components, expected 20 for item 'ModifyDate' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - message: 'Found SignedRational data format, expected Rational for item ''ExposureTime'' in ''ExifIFD''' + message: "Found SignedRational data format, expected Rational for item 'ExposureTime' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - message: 'Found SignedRational data format, expected Rational for item ''FNumber'' in ''ExifIFD''' + message: "Found SignedRational data format, expected Rational for item 'FNumber' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - message: 'Found 21 data components, expected 20 for item ''DateTimeOriginal'' in ''ExifIFD''' + message: "Found 21 data components, expected 20 for item 'DateTimeOriginal' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - message: 'Found 21 data components, expected 20 for item ''CreateDate'' in ''ExifIFD''' + message: "Found 21 data components, expected 20 for item 'CreateDate' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - message: 'Found SignedRational data format, expected Rational for item ''CompressedBitsPerPixel'' in ''ExifIFD''' + message: "Found SignedRational data format, expected Rational for item 'CompressedBitsPerPixel' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - message: 'Found SignedRational data format, expected Rational for item ''MaxApertureValue'' in ''ExifIFD''' + message: "Found SignedRational data format, expected Rational for item 'MaxApertureValue' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - message: 'Found SignedRational data format, expected Rational for item ''FocalLength'' in ''ExifIFD''' + message: "Found SignedRational data format, expected Rational for item 'FocalLength' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExposureTime:33434' - message: 'Found SignedRational data format, expected Rational for item ''ExposureTime'' in ''InteropIFD''' + message: "Found SignedRational data format, expected Rational for item 'ExposureTime' in 'InteropIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:FNumber:33437' - message: 'Found SignedRational data format, expected Rational for item ''FNumber'' in ''InteropIFD''' + message: "Found SignedRational data format, expected Rational for item 'FNumber' in 'InteropIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:DateTimeOriginal:36867' - message: 'Found 21 data components, expected 20 for item ''DateTimeOriginal'' in ''InteropIFD''' + message: "Found 21 data components, expected 20 for item 'DateTimeOriginal' in 'InteropIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:CreateDate:36868' - message: 'Found 21 data components, expected 20 for item ''CreateDate'' in ''InteropIFD''' + message: "Found 21 data components, expected 20 for item 'CreateDate' in 'InteropIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:CompressedBitsPerPixel:37122' - message: 'Found SignedRational data format, expected Rational for item ''CompressedBitsPerPixel'' in ''InteropIFD''' + message: "Found SignedRational data format, expected Rational for item 'CompressedBitsPerPixel' in 'InteropIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:MaxApertureValue:37381' - message: 'Found SignedRational data format, expected Rational for item ''MaxApertureValue'' in ''InteropIFD''' + message: "Found SignedRational data format, expected Rational for item 'MaxApertureValue' in 'InteropIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:FocalLength:37386' - message: 'Found SignedRational data format, expected Rational for item ''FocalLength'' in ''InteropIFD''' + message: "Found SignedRational data format, expected Rational for item 'FocalLength' in 'InteropIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExifImageWidth:40962' - message: 'Found Long data format, expected Short for item ''ExifImageWidth'' in ''InteropIFD''' + message: "Found Long data format, expected Short for item 'ExifImageWidth' in 'InteropIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:ExifImageHeight:40963' - message: 'Found Long data format, expected Short for item ''ExifImageHeight'' in ''InteropIFD''' + message: "Found Long data format, expected Short for item 'ExifImageHeight' in 'InteropIFD'" + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' + message: 'Could not determine number of entries for IFD1, overflow' NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:40965' - message: 'Unknown item 40965/0xA005 in ''InteropIFD''' + message: "Unknown item 40965/0xA005 in 'InteropIFD'" gdInfo: 0: 50 1: 38 @@ -1613,7 +1613,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: gh-11.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 4304 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/broken/misplaced-exif.jpg.dump.yml b/tests/media-dumps/image/broken/misplaced-exif.jpg.dump.yml index c10415a25..2bf26c12a 100644 --- a/tests/media-dumps/image/broken/misplaced-exif.jpg.dump.yml +++ b/tests/media-dumps/image/broken/misplaced-exif.jpg.dump.yml @@ -1,6 +1,7 @@ skip: phpExif: - ExifVersion + - Title exiftool: - 'ExifIFD:ExifVersion' fileName: misplaced-exif.jpg @@ -16,15 +17,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -42,7 +43,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -60,7 +61,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -78,7 +79,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -87,21 +88,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -110,11 +111,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XPTitle:40091' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XPTitle id: '40091' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -128,11 +129,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -146,11 +147,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -164,7 +165,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -173,11 +174,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSVersionID id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -191,7 +192,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -200,11 +201,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -218,11 +219,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTime:37520' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTime id: '37520' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -236,11 +237,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTime:36880' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTime id: '36880' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -254,7 +255,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -279,7 +280,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:COM:254' - class: FileEye\MediaProbe\Block\JpegSegmentCom + class: FileEye\MediaProbe\Block\Jpeg\SegmentCom valid: true name: COM id: '254' @@ -297,7 +298,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -315,7 +316,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -333,7 +334,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF2:194' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF2 id: '194' @@ -351,7 +352,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -369,7 +370,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -387,7 +388,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -405,7 +406,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -424,13 +425,13 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - message: 'Found 11 data components, expected 20 for item ''ModifyDate'' in ''IFD0''' + message: "Found 11 data components, expected 20 for item 'ModifyDate' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306/entry' - message: 'Invalid datetime format for ''1509749992''' + message: "Invalid datetime format for '1509749992'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - message: 'Found Byte data format, expected Undefined for item ''ExifVersion'' in ''ExifIFD''' + message: "Found Byte data format, expected Undefined for item 'ExifVersion' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864/entry' message: 'Incorrect version data.' @@ -444,7 +445,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: misplaced-exif.jpg - FileDateTime: 1644612165 + FileDateTime: 1639835048 FileSize: 4587 FileType: 2 MimeType: image/jpeg @@ -457,7 +458,7 @@ exifReadData: ByteOrderMotorola: 0 Thumbnail.FileType: 2 Thumbnail.MimeType: image/jpeg - Title: '' + Title: '?' ImageDescription: Test1 DateTime: '1509749992' GPS_IFD_Pointer: 91 diff --git a/tests/media-dumps/image/broken/pel-141.jpg.dump.yml b/tests/media-dumps/image/broken/pel-141.jpg.dump.yml index 3d1689265..902a43540 100644 --- a/tests/media-dumps/image/broken/pel-141.jpg.dump.yml +++ b/tests/media-dumps/image/broken/pel-141.jpg.dump.yml @@ -16,15 +16,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -42,7 +42,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -51,21 +51,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -74,11 +74,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -92,11 +92,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -110,11 +110,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -128,11 +128,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -146,11 +146,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -164,11 +164,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -182,11 +182,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -200,7 +200,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -209,11 +209,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSImgDirection:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSImgDirection id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -227,11 +227,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSImgDirectionRef:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSImgDirectionRef id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -245,11 +245,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -263,11 +263,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageWidth:256' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageWidth id: '256' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -281,11 +281,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageHeight:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageHeight id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -299,11 +299,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -317,11 +317,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -335,11 +335,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -353,11 +353,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -371,11 +371,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -389,11 +389,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -407,11 +407,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -425,11 +425,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -443,11 +443,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -461,11 +461,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -479,11 +479,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -497,11 +497,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -515,11 +515,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -533,11 +533,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -551,11 +551,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -569,11 +569,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -587,7 +587,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -596,11 +596,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OtherImageStart:513' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OtherImageStart id: '513' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -614,11 +614,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OtherImageLength:514' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OtherImageLength id: '514' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -632,11 +632,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -650,11 +650,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -668,7 +668,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -686,7 +686,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -704,7 +704,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -722,7 +722,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -740,7 +740,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -758,7 +758,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -776,7 +776,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -794,7 +794,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DRI:221' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DRI id: '221' @@ -812,7 +812,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -830,7 +830,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -865,31 +865,31 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ExifVersion:36864' - message: 'Found Byte data format, expected Undefined for item ''ExifVersion'' in ''IFD0''' + message: "Found Byte data format, expected Undefined for item 'ExifVersion' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ExifVersion:36864/entry' message: 'Incorrect version data.' - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ExposureTime:33434' - message: 'Found SignedRational data format, expected Rational for item ''ExposureTime'' in ''IFD0''' + message: "Found SignedRational data format, expected Rational for item 'ExposureTime' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ComponentsConfiguration:37121' - message: 'Found Byte data format, expected Undefined for item ''ComponentsConfiguration'' in ''IFD0''' + message: "Found Byte data format, expected Undefined for item 'ComponentsConfiguration' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:FNumber:33437' - message: 'Found SignedRational data format, expected Rational for item ''FNumber'' in ''IFD0''' + message: "Found SignedRational data format, expected Rational for item 'FNumber' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:UserComment:37510' - message: 'Found Ascii data format, expected Undefined for item ''UserComment'' in ''IFD0''' + message: "Found Ascii data format, expected Undefined for item 'UserComment' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:UserComment:37510/entry' message: 'Invalid EXIF text encoding for UserComment.' - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OtherImageStart:513' - message: 'Found Long data format, expected Undefined for item ''OtherImageStart'' in ''ExifIFD''' + message: "Found Long data format, expected Undefined for item 'OtherImageStart' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OtherImageLength:514' - message: 'Found Long data format, expected Undefined for item ''OtherImageLength'' in ''ExifIFD''' + message: "Found Long data format, expected Undefined for item 'OtherImageLength' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:SOS:218' message: 'Found trailing content after EOI: 3504 bytes' @@ -903,7 +903,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: pel-141.jpg - FileDateTime: 1644612165 + FileDateTime: 1639835048 FileSize: 1167394 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/broken/pel-152.jpg.dump.yml b/tests/media-dumps/image/broken/pel-152.jpg.dump.yml index e1f0144d9..94fd3db28 100644 --- a/tests/media-dumps/image/broken/pel-152.jpg.dump.yml +++ b/tests/media-dumps/image/broken/pel-152.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP13:237' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP13 id: '237' @@ -90,7 +90,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -108,7 +108,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -126,7 +126,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -144,7 +144,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -162,7 +162,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -180,7 +180,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -198,7 +198,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -216,7 +216,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -234,7 +234,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -264,7 +264,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: pel-152.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 17694 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/broken/pel-156.jpg.dump.yml b/tests/media-dumps/image/broken/pel-156.jpg.dump.yml index b0022db58..c0276a418 100644 --- a/tests/media-dumps/image/broken/pel-156.jpg.dump.yml +++ b/tests/media-dumps/image/broken/pel-156.jpg.dump.yml @@ -22,15 +22,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -48,7 +48,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -66,7 +66,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -75,21 +75,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -98,11 +98,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageWidth:256' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageWidth id: '256' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -116,11 +116,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageHeight:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageHeight id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -134,11 +134,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:BitsPerSample:258' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BitsPerSample id: '258' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -152,11 +152,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PhotometricInterpretation:262' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotometricInterpretation id: '262' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -170,11 +170,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -188,11 +188,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -206,11 +206,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -224,11 +224,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -242,11 +242,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:SamplesPerPixel:277' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SamplesPerPixel id: '277' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -260,11 +260,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -278,11 +278,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -296,11 +296,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -314,11 +314,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -332,11 +332,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -350,11 +350,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:WhitePoint:318' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhitePoint id: '318' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -368,11 +368,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrimaryChromaticities:319' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrimaryChromaticities id: '319' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -386,11 +386,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrCoefficients:529' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrCoefficients id: '529' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -404,11 +404,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -422,7 +422,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -431,11 +431,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -449,11 +449,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -467,11 +467,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -485,11 +485,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -503,11 +503,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -521,11 +521,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -539,11 +539,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -557,11 +557,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -575,11 +575,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -593,11 +593,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -611,11 +611,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -629,11 +629,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -647,11 +647,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -665,11 +665,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -683,11 +683,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -701,11 +701,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -719,11 +719,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -737,11 +737,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -755,11 +755,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTime:37520' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTime id: '37520' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -773,11 +773,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -791,11 +791,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -809,11 +809,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -827,11 +827,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -845,11 +845,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -863,11 +863,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -881,11 +881,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -899,11 +899,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -917,11 +917,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -935,11 +935,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CFAPattern:41730' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CFAPattern id: '41730' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -953,11 +953,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -971,11 +971,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -989,11 +989,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1007,11 +1007,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1025,11 +1025,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1043,11 +1043,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1061,11 +1061,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:GainControl:41991' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GainControl id: '41991' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1079,11 +1079,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1097,11 +1097,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1115,11 +1115,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1133,11 +1133,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectDistanceRange:41996' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectDistanceRange id: '41996' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1151,11 +1151,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Gamma:42240' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Gamma id: '42240' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1169,7 +1169,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -1178,11 +1178,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1196,7 +1196,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -1205,11 +1205,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSVersionID id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1223,11 +1223,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitudeRef:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitudeRef id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1241,11 +1241,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitude:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitude id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1259,11 +1259,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitudeRef:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitudeRef id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1277,11 +1277,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitude:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitude id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1295,7 +1295,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -1304,11 +1304,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1322,11 +1322,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1340,11 +1340,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1358,11 +1358,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1392,7 +1392,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1410,7 +1410,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1428,7 +1428,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1446,7 +1446,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1464,7 +1464,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1482,7 +1482,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1500,7 +1500,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1518,7 +1518,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1536,7 +1536,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1562,7 +1562,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: pel-156.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 448078 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/broken/pel-176-RPT200076_03.jpg.dump.yml b/tests/media-dumps/image/broken/pel-176-RPT200076_03.jpg.dump.yml index 764aa03ff..4e23951f8 100644 --- a/tests/media-dumps/image/broken/pel-176-RPT200076_03.jpg.dump.yml +++ b/tests/media-dumps/image/broken/pel-176-RPT200076_03.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Artist:315' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: Artist id: '315' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,7 +231,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -240,11 +240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensitivityType:34864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensitivityType id: '34864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:RecommendedExposureIndex:34866' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecommendedExposureIndex id: '34866' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTime:36880' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: OffsetTime id: '36880' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,11 +636,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -654,11 +654,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -672,11 +672,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -690,11 +690,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -708,11 +708,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -726,11 +726,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SerialNumber:42033' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: SerialNumber id: '42033' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -744,11 +744,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensInfo:42034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensInfo id: '42034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -762,11 +762,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensModel:42036' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: LensModel id: '42036' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -780,11 +780,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensSerialNumber:42037' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: LensSerialNumber id: '42037' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -798,7 +798,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP2:226' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP2 id: '226' @@ -816,7 +816,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -834,7 +834,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -852,7 +852,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -870,7 +870,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -888,7 +888,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -907,16 +907,16 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - message: 'Found 19 data components, expected 20 for item ''ModifyDate'' in ''IFD0''' + message: "Found 19 data components, expected 20 for item 'ModifyDate' in 'IFD0'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - message: 'Found 19 data components, expected 20 for item ''DateTimeOriginal'' in ''ExifIFD''' + message: "Found 19 data components, expected 20 for item 'DateTimeOriginal' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - message: 'Found 19 data components, expected 20 for item ''CreateDate'' in ''ExifIFD''' + message: "Found 19 data components, expected 20 for item 'CreateDate' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTime:36880' - message: 'Found 6 data components, expected 7 for item ''OffsetTime'' in ''ExifIFD''' + message: "Found 6 data components, expected 7 for item 'OffsetTime' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' message: 'Could not determine number of entries for IFD1, overflow' @@ -970,7 +970,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: pel-176-RPT200076_03.jpg - FileDateTime: 1644612165 + FileDateTime: 1639835048 FileSize: 53475 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/bug3017880.jpg.dump.yml b/tests/media-dumps/image/bug3017880.jpg.dump.yml index e1d72f1e9..2825e4330 100644 --- a/tests/media-dumps/image/bug3017880.jpg.dump.yml +++ b/tests/media-dumps/image/bug3017880.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,7 +105,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -123,7 +123,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -141,7 +141,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -159,7 +159,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -185,7 +185,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: bug3017880.jpg - FileDateTime: 1644443593 + FileDateTime: 1639835048 FileSize: 4900 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/apple-iphone11.jpg.dump.yml b/tests/media-dumps/image/camera/apple-iphone11.jpg.dump.yml index e7fb1295e..dbdc66816 100644 --- a/tests/media-dumps/image/camera/apple-iphone11.jpg.dump.yml +++ b/tests/media-dumps/image/camera/apple-iphone11.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -46,21 +46,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -69,11 +69,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,7 +231,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -240,11 +240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTime:36880' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTime id: '36880' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTimeOriginal:36881' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTimeOriginal id: '36881' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTimeDigitized:36882' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTimeDigitized id: '36882' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:BrightnessValue:37379' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BrightnessValue id: '37379' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectArea:37396' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectArea id: '37396' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -608,10 +608,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '1' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -625,10 +625,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '2' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -651,11 +651,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeFlags:flags' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeFlags id: flags - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -669,11 +669,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeValue:value' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeValue id: value - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -687,11 +687,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeScale:timescale' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeScale id: timescale - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -705,11 +705,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeEpoch:epoch' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeEpoch id: epoch - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -723,10 +723,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '4' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -740,10 +740,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '5' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -757,10 +757,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '6' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -774,10 +774,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '7' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -791,11 +791,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AccelerationVector:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AccelerationVector id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -809,10 +809,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '12' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -826,10 +826,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '13' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -843,10 +843,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '14' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -860,10 +860,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -877,10 +877,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -894,10 +894,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '22' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -911,10 +911,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '23' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -928,10 +928,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '25' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -945,10 +945,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '26' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -962,10 +962,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '31' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -979,10 +979,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:32' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '32' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -996,10 +996,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '33' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1013,10 +1013,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '35' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1030,10 +1030,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '37' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1047,10 +1047,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:38' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '38' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1064,10 +1064,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:39' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '39' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1081,10 +1081,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '40' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1098,10 +1098,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:43' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '43' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1115,11 +1115,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1133,11 +1133,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1151,11 +1151,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1169,11 +1169,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1187,11 +1187,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1205,11 +1205,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1223,11 +1223,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1241,11 +1241,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1259,11 +1259,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1277,11 +1277,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1295,11 +1295,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1313,11 +1313,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1331,11 +1331,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensInfo:42034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensInfo id: '42034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1349,11 +1349,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensMake:42035' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensMake id: '42035' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1367,11 +1367,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensModel:42036' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensModel id: '42036' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1385,10 +1385,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:42080' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '42080' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1402,7 +1402,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -1411,11 +1411,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitudeRef:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitudeRef id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1429,11 +1429,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitude:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitude id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1447,11 +1447,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitudeRef:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitudeRef id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1465,11 +1465,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitude:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitude id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1483,11 +1483,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitudeRef:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitudeRef id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1501,11 +1501,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitude:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitude id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1519,11 +1519,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSSpeedRef:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSSpeedRef id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1537,11 +1537,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSSpeed:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSSpeed id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1555,11 +1555,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSImgDirectionRef:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSImgDirectionRef id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1573,11 +1573,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSImgDirection:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSImgDirection id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1591,11 +1591,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSDestBearingRef:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSDestBearingRef id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1609,11 +1609,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSDestBearing:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSDestBearing id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1627,11 +1627,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSHPositioningError:31' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSHPositioningError id: '31' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1645,7 +1645,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -1654,11 +1654,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1672,11 +1672,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1690,11 +1690,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1708,11 +1708,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1742,7 +1742,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP2:226' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP2 id: '226' @@ -1760,7 +1760,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP10:234' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP10 id: '234' @@ -1778,7 +1778,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1796,7 +1796,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DRI:221' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DRI id: '221' @@ -1814,7 +1814,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1832,7 +1832,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1850,7 +1850,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1868,7 +1868,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1887,79 +1887,79 @@ log: NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:42080' - message: 'Unknown item 42080/0xA460 in ''ExifIFD''' + message: "Unknown item 42080/0xA460 in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' - message: 'Unknown item 1/0x1 in ''Apple''' + message: "Unknown item 1/0x1 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' - message: 'Unknown item 2/0x2 in ''Apple''' + message: "Unknown item 2/0x2 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' - message: 'Unknown item 4/0x4 in ''Apple''' + message: "Unknown item 4/0x4 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' - message: 'Unknown item 5/0x5 in ''Apple''' + message: "Unknown item 5/0x5 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' - message: 'Unknown item 6/0x6 in ''Apple''' + message: "Unknown item 6/0x6 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' - message: 'Unknown item 7/0x7 in ''Apple''' + message: "Unknown item 7/0x7 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:12' - message: 'Unknown item 12/0xC in ''Apple''' + message: "Unknown item 12/0xC in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:13' - message: 'Unknown item 13/0xD in ''Apple''' + message: "Unknown item 13/0xD in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:14' - message: 'Unknown item 14/0xE in ''Apple''' + message: "Unknown item 14/0xE in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:16' - message: 'Unknown item 16/0x10 in ''Apple''' + message: "Unknown item 16/0x10 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' - message: 'Unknown item 20/0x14 in ''Apple''' + message: "Unknown item 20/0x14 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:22' - message: 'Unknown item 22/0x16 in ''Apple''' + message: "Unknown item 22/0x16 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' - message: 'Unknown item 23/0x17 in ''Apple''' + message: "Unknown item 23/0x17 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' - message: 'Unknown item 25/0x19 in ''Apple''' + message: "Unknown item 25/0x19 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:26' - message: 'Unknown item 26/0x1A in ''Apple''' + message: "Unknown item 26/0x1A in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' - message: 'Unknown item 31/0x1F in ''Apple''' + message: "Unknown item 31/0x1F in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:32' - message: 'Unknown item 32/0x20 in ''Apple''' + message: "Unknown item 32/0x20 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:33' - message: 'Unknown item 33/0x21 in ''Apple''' + message: "Unknown item 33/0x21 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:35' - message: 'Unknown item 35/0x23 in ''Apple''' + message: "Unknown item 35/0x23 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:37' - message: 'Unknown item 37/0x25 in ''Apple''' + message: "Unknown item 37/0x25 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:38' - message: 'Unknown item 38/0x26 in ''Apple''' + message: "Unknown item 38/0x26 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:39' - message: 'Unknown item 39/0x27 in ''Apple''' + message: "Unknown item 39/0x27 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:40' - message: 'Unknown item 40/0x28 in ''Apple''' + message: "Unknown item 40/0x28 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:43' - message: 'Unknown item 43/0x2B in ''Apple''' + message: "Unknown item 43/0x2B in 'Apple'" gdInfo: 0: 4032 1: 3024 @@ -1970,7 +1970,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: apple-iphone11.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 4233685 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml b/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml index 804dac932..74a50d048 100644 --- a/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml +++ b/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -46,21 +46,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -69,11 +69,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,7 +231,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -240,11 +240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:BrightnessValue:37379' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BrightnessValue id: '37379' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectArea:37396' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectArea id: '37396' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -554,10 +554,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '1' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -571,10 +571,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '2' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -597,11 +597,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeFlags:flags' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeFlags id: flags - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -615,11 +615,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeValue:value' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeValue id: value - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -633,11 +633,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeScale:timescale' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeScale id: timescale - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -651,11 +651,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeEpoch:epoch' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeEpoch id: epoch - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -669,10 +669,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '4' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -686,10 +686,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '5' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -703,10 +703,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '6' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -720,10 +720,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '7' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -737,11 +737,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AccelerationVector:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AccelerationVector id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -755,10 +755,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '9' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -772,10 +772,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '14' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -789,11 +789,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ContentIdentifier:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContentIdentifier id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -807,10 +807,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -824,10 +824,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '23' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -841,10 +841,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '25' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -858,10 +858,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '31' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -875,11 +875,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -893,11 +893,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -911,11 +911,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -929,11 +929,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -947,11 +947,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -965,11 +965,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -983,11 +983,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1001,11 +1001,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1019,11 +1019,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1037,11 +1037,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1055,11 +1055,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1073,11 +1073,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1091,11 +1091,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensInfo:42034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensInfo id: '42034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1109,11 +1109,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensMake:42035' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensMake id: '42035' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1127,11 +1127,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensModel:42036' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensModel id: '42036' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1145,7 +1145,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -1154,11 +1154,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitudeRef:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitudeRef id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1172,11 +1172,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitude:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitude id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1190,11 +1190,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitudeRef:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitudeRef id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1208,11 +1208,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitude:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitude id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1226,11 +1226,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitudeRef:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitudeRef id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1244,11 +1244,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitude:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitude id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1262,11 +1262,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSTimeStamp:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSTimeStamp id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1280,11 +1280,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSSpeedRef:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSSpeedRef id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1298,11 +1298,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSSpeed:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSSpeed id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1316,11 +1316,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSImgDirectionRef:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSImgDirectionRef id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1334,11 +1334,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSImgDirection:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSImgDirection id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1352,11 +1352,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSDestBearingRef:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSDestBearingRef id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1370,11 +1370,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSDestBearing:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSDestBearing id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1388,11 +1388,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSDateStamp:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSDateStamp id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1406,11 +1406,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSHPositioningError:31' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSHPositioningError id: '31' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1424,7 +1424,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -1433,11 +1433,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1451,11 +1451,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1469,11 +1469,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1487,11 +1487,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1521,7 +1521,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1539,7 +1539,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DRI:221' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DRI id: '221' @@ -1557,7 +1557,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1575,7 +1575,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1593,7 +1593,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1611,7 +1611,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1630,40 +1630,40 @@ log: NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' - message: 'Unknown item 1/0x1 in ''Apple''' + message: "Unknown item 1/0x1 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' - message: 'Unknown item 2/0x2 in ''Apple''' + message: "Unknown item 2/0x2 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' - message: 'Unknown item 4/0x4 in ''Apple''' + message: "Unknown item 4/0x4 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' - message: 'Unknown item 5/0x5 in ''Apple''' + message: "Unknown item 5/0x5 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' - message: 'Unknown item 6/0x6 in ''Apple''' + message: "Unknown item 6/0x6 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' - message: 'Unknown item 7/0x7 in ''Apple''' + message: "Unknown item 7/0x7 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:9' - message: 'Unknown item 9/0x9 in ''Apple''' + message: "Unknown item 9/0x9 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:14' - message: 'Unknown item 14/0xE in ''Apple''' + message: "Unknown item 14/0xE in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' - message: 'Unknown item 20/0x14 in ''Apple''' + message: "Unknown item 20/0x14 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' - message: 'Unknown item 23/0x17 in ''Apple''' + message: "Unknown item 23/0x17 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' - message: 'Unknown item 25/0x19 in ''Apple''' + message: "Unknown item 25/0x19 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' - message: 'Unknown item 31/0x1F in ''Apple''' + message: "Unknown item 31/0x1F in 'Apple'" gdInfo: 0: 4032 1: 3024 @@ -1674,7 +1674,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: apple-iphone6s.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 1812177 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml b/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml index 085f1d38b..2149b9d49 100644 --- a/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml +++ b/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,7 +231,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -240,11 +240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:BrightnessValue:37379' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BrightnessValue id: '37379' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectArea:37396' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectArea id: '37396' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -554,10 +554,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '1' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -571,10 +571,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '2' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -597,11 +597,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeFlags:flags' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeFlags id: flags - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -615,11 +615,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeValue:value' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeValue id: value - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -633,11 +633,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeScale:timescale' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeScale id: timescale - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -651,11 +651,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeEpoch:epoch' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RunTimeEpoch id: epoch - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -669,10 +669,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '4' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -686,10 +686,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '5' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -703,10 +703,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '6' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -720,10 +720,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '7' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -737,11 +737,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AccelerationVector:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AccelerationVector id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -755,10 +755,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '12' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -772,10 +772,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '13' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -789,10 +789,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '14' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -806,10 +806,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -823,11 +823,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ContentIdentifier:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContentIdentifier id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -841,10 +841,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -858,10 +858,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '22' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -875,10 +875,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '23' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -892,10 +892,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '25' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -909,10 +909,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '26' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -926,10 +926,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '31' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -943,11 +943,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -961,11 +961,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -979,11 +979,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -997,11 +997,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1015,11 +1015,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1033,11 +1033,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1051,11 +1051,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1069,11 +1069,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1087,11 +1087,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1105,11 +1105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1123,11 +1123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1141,11 +1141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1159,11 +1159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensInfo:42034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensInfo id: '42034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1177,11 +1177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensMake:42035' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensMake id: '42035' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1195,11 +1195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensModel:42036' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensModel id: '42036' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1213,7 +1213,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -1222,11 +1222,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitudeRef:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitudeRef id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1240,11 +1240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitude:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitude id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1258,11 +1258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitudeRef:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitudeRef id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1276,11 +1276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitude:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitude id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1294,11 +1294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitudeRef:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitudeRef id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1312,11 +1312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitude:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitude id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1330,11 +1330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSSpeedRef:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSSpeedRef id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1348,11 +1348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSSpeed:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSSpeed id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1366,11 +1366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSImgDirectionRef:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSImgDirectionRef id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1384,11 +1384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSImgDirection:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSImgDirection id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1402,11 +1402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSDestBearingRef:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSDestBearingRef id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1420,11 +1420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSDestBearing:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSDestBearing id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1438,11 +1438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSHPositioningError:31' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSHPositioningError id: '31' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1456,7 +1456,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -1474,7 +1474,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP13:237' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP13 id: '237' @@ -1492,7 +1492,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1510,7 +1510,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1528,7 +1528,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1546,7 +1546,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1564,7 +1564,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1582,7 +1582,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1600,7 +1600,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1618,7 +1618,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DRI:221' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DRI id: '221' @@ -1636,7 +1636,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1654,7 +1654,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1673,52 +1673,52 @@ log: NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' - message: 'Unknown item 1/0x1 in ''Apple''' + message: "Unknown item 1/0x1 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' - message: 'Unknown item 2/0x2 in ''Apple''' + message: "Unknown item 2/0x2 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' - message: 'Unknown item 4/0x4 in ''Apple''' + message: "Unknown item 4/0x4 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' - message: 'Unknown item 5/0x5 in ''Apple''' + message: "Unknown item 5/0x5 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' - message: 'Unknown item 6/0x6 in ''Apple''' + message: "Unknown item 6/0x6 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' - message: 'Unknown item 7/0x7 in ''Apple''' + message: "Unknown item 7/0x7 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:12' - message: 'Unknown item 12/0xC in ''Apple''' + message: "Unknown item 12/0xC in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:13' - message: 'Unknown item 13/0xD in ''Apple''' + message: "Unknown item 13/0xD in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:14' - message: 'Unknown item 14/0xE in ''Apple''' + message: "Unknown item 14/0xE in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:16' - message: 'Unknown item 16/0x10 in ''Apple''' + message: "Unknown item 16/0x10 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' - message: 'Unknown item 20/0x14 in ''Apple''' + message: "Unknown item 20/0x14 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:22' - message: 'Unknown item 22/0x16 in ''Apple''' + message: "Unknown item 22/0x16 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' - message: 'Unknown item 23/0x17 in ''Apple''' + message: "Unknown item 23/0x17 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' - message: 'Unknown item 25/0x19 in ''Apple''' + message: "Unknown item 25/0x19 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:26' - message: 'Unknown item 26/0x1A in ''Apple''' + message: "Unknown item 26/0x1A in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' - message: 'Unknown item 31/0x1F in ''Apple''' + message: "Unknown item 31/0x1F in 'Apple'" gdInfo: 0: 4032 1: 3024 @@ -1729,7 +1729,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: apple-iphone7.JPG - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 3663872 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/canon-ixus-ii.jpg.dump.yml b/tests/media-dumps/image/camera/canon-ixus-ii.jpg.dump.yml index 536f33c1b..3385af465 100644 --- a/tests/media-dumps/image/camera/canon-ixus-ii.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon-ixus-ii.jpg.dump.yml @@ -21,15 +21,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -47,7 +47,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -56,21 +56,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -79,11 +79,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -97,11 +97,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -115,11 +115,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -133,11 +133,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -151,11 +151,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -169,11 +169,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -187,11 +187,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -205,11 +205,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -223,7 +223,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -232,11 +232,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -250,11 +250,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -268,11 +268,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -286,11 +286,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -304,11 +304,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -322,11 +322,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -340,11 +340,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -358,11 +358,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -376,11 +376,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -394,11 +394,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -412,11 +412,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -430,11 +430,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -448,11 +448,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -466,11 +466,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -484,7 +484,7 @@ elements: - node: makerNote path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: Canon id: '37500' @@ -519,11 +519,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MacroMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -537,11 +537,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SelfTimer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -555,11 +555,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Quality:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Quality id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -573,11 +573,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonFlashMode:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashMode id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -591,11 +591,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ContinuousDrive:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousDrive id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -609,11 +609,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusMode:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusMode id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -627,11 +627,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:RecordMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecordMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -645,11 +645,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonImageSize:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageSize id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -663,11 +663,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:EasyMode:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: EasyMode id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -681,11 +681,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DigitalZoom:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoom id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -699,11 +699,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Contrast:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -717,11 +717,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Saturation:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -735,11 +735,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Sharpness:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -753,11 +753,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CameraISO:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraISO id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -771,11 +771,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MeteringMode:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -789,11 +789,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusRange:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusRange id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -807,11 +807,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AFPoint:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPoint id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -825,11 +825,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonExposureMode:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonExposureMode id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -843,11 +843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:LensType:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -861,11 +861,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxFocalLength:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -879,11 +879,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinFocalLength:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -897,11 +897,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocalUnits:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalUnits id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -915,11 +915,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxAperture:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxAperture id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -933,11 +933,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinAperture:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinAperture id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -951,11 +951,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashActivity:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashActivity id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -969,11 +969,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashBits id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -987,11 +987,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusContinuous:32' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusContinuous id: '32' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1005,11 +1005,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AESetting:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AESetting id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1023,11 +1023,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ImageStabilization:34' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageStabilization id: '34' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1041,11 +1041,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DisplayAperture:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DisplayAperture id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1059,11 +1059,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomSourceWidth:36' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomSourceWidth id: '36' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1077,11 +1077,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomTargetWidth:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomTargetWidth id: '37' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1095,11 +1095,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SpotMeteringMode:39' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpotMeteringMode id: '39' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1113,11 +1113,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:PhotoEffect:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotoEffect id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1131,11 +1131,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ManualFlashOutput:41' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualFlashOutput id: '41' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1149,11 +1149,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ColorTone:42' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTone id: '42' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1176,11 +1176,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalType:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalType id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1194,11 +1194,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalLength:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1212,11 +1212,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneXSize:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXSize id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1230,11 +1230,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneYSize:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYSize id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1248,11 +1248,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFlashInfo:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashInfo id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1292,11 +1292,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoISO:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoISO id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1310,11 +1310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BaseISO:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BaseISO id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1328,11 +1328,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1346,11 +1346,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetAperture:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetAperture id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1364,11 +1364,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetExposureTime:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetExposureTime id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1382,11 +1382,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureCompensation:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1400,11 +1400,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:WhiteBalance:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1418,11 +1418,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SlowShutter:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SlowShutter id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1436,11 +1436,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SequenceNumber:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SequenceNumber id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1454,11 +1454,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:OpticalZoomCode:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OpticalZoomCode id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1472,11 +1472,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraTemperature:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1490,11 +1490,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashGuideNumber:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashGuideNumber id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1508,11 +1508,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AFPointsInFocus:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1526,11 +1526,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashExposureComp:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureComp id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1544,11 +1544,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoExposureBracketing:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoExposureBracketing id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1562,11 +1562,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AEBBracketValue:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBBracketValue id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1580,11 +1580,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ControlMode:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ControlMode id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1598,11 +1598,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceUpper:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1616,11 +1616,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceLower:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1634,11 +1634,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FNumber:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1652,11 +1652,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureTime:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1670,11 +1670,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV2:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV2 id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1688,11 +1688,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BulbDuration:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BulbDuration id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1706,11 +1706,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraType:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraType id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1724,11 +1724,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoRotate:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoRotate id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1742,11 +1742,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:NDFilter:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NDFilter id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1760,11 +1760,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SelfTimer2:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer2 id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1778,11 +1778,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashOutput:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashOutput id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1796,10 +1796,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '0' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1813,10 +1813,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '0' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1839,11 +1839,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:NumAFPoints:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NumAFPoints id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1857,11 +1857,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:ValidAFPoints:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ValidAFPoints id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1875,11 +1875,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:CanonImageWidth:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageWidth id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1893,11 +1893,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:CanonImageHeight:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageHeight id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1911,11 +1911,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFImageWidth:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageWidth id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1929,11 +1929,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFImageHeight:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageHeight id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1947,11 +1947,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaWidth:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaWidth id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1965,11 +1965,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaHeight:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaHeight id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1983,11 +1983,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaXPositions:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaXPositions id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2001,11 +2001,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaYPositions:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaYPositions id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2019,11 +2019,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFPointsInFocus:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2037,11 +2037,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:PrimaryAFPoint:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrimaryAFPoint id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2055,11 +2055,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ThumbnailImageValidArea:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ThumbnailImageValidArea id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2073,11 +2073,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonImageType:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageType id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2091,11 +2091,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFirmwareVersion:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFirmwareVersion id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2109,11 +2109,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:FileNumber:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileNumber id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2127,11 +2127,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:OwnerName:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OwnerName id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2145,11 +2145,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonModelID:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonModelID id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2189,11 +2189,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2207,11 +2207,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2225,11 +2225,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2243,11 +2243,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2261,11 +2261,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2279,7 +2279,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -2288,11 +2288,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2306,11 +2306,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2324,11 +2324,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:RelatedImageWidth:4097' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RelatedImageWidth id: '4097' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2342,11 +2342,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:RelatedImageHeight:4098' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RelatedImageHeight id: '4098' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2360,11 +2360,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2378,11 +2378,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2396,11 +2396,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2414,11 +2414,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2432,11 +2432,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2450,11 +2450,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2468,11 +2468,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2486,11 +2486,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2504,11 +2504,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2522,11 +2522,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2540,7 +2540,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -2549,11 +2549,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2567,11 +2567,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2585,11 +2585,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2603,11 +2603,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2637,7 +2637,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -2655,7 +2655,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -2673,7 +2673,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -2691,7 +2691,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -2709,7 +2709,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -2728,17 +2728,17 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1' - message: 'Could not access value for item ''SRAWQuality'' in ''CanonCameraSettings'', overflow' + message: "Could not access value for item 'SRAWQuality' in 'CanonCameraSettings', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13' - message: 'Could not access value for item ''LensSerialNumber'' in ''CanonCameraInfo'', overflow' + message: "Could not access value for item 'LensSerialNumber' in 'CanonCameraInfo', overflow" NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - message: 'Unknown item 0/0x0 in ''Canon''' + message: "Unknown item 0/0x0 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - message: 'Unknown item 0/0x0 in ''Canon''' + message: "Unknown item 0/0x0 in 'Canon'" gdInfo: 0: 640 1: 480 @@ -2749,7 +2749,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: canon-ixus-ii.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 37553 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml b/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml index 9c32ebc90..8a823cad5 100644 --- a/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml @@ -21,15 +21,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -47,7 +47,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -56,21 +56,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -79,11 +79,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -97,11 +97,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -115,11 +115,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -133,11 +133,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -151,11 +151,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -169,11 +169,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -187,11 +187,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -205,11 +205,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -223,7 +223,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -232,11 +232,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -250,11 +250,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -268,11 +268,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -286,11 +286,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -304,11 +304,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -322,11 +322,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -340,11 +340,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -358,11 +358,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -376,11 +376,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -394,11 +394,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -412,11 +412,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -430,11 +430,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -448,11 +448,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -466,11 +466,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -484,7 +484,7 @@ elements: - node: makerNote path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: Canon id: '37500' @@ -519,11 +519,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MacroMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -537,11 +537,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SelfTimer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -555,11 +555,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Quality:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Quality id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -573,11 +573,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonFlashMode:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashMode id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -591,11 +591,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ContinuousDrive:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousDrive id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -609,11 +609,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusMode:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusMode id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -627,11 +627,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:RecordMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecordMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -645,11 +645,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonImageSize:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageSize id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -663,11 +663,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:EasyMode:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: EasyMode id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -681,11 +681,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DigitalZoom:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoom id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -699,11 +699,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Contrast:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -717,11 +717,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Saturation:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -735,11 +735,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Sharpness:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -753,11 +753,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CameraISO:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraISO id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -771,11 +771,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MeteringMode:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -789,11 +789,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusRange:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusRange id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -807,11 +807,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AFPoint:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPoint id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -825,11 +825,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonExposureMode:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonExposureMode id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -843,11 +843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:LensType:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -861,11 +861,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxFocalLength:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -879,11 +879,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinFocalLength:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -897,11 +897,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocalUnits:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalUnits id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -915,11 +915,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxAperture:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxAperture id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -933,11 +933,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinAperture:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinAperture id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -951,11 +951,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashActivity:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashActivity id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -969,11 +969,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashBits id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -987,11 +987,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusContinuous:32' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusContinuous id: '32' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1005,11 +1005,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AESetting:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AESetting id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1023,11 +1023,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ImageStabilization:34' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageStabilization id: '34' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1041,11 +1041,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DisplayAperture:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DisplayAperture id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1059,11 +1059,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomSourceWidth:36' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomSourceWidth id: '36' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1077,11 +1077,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomTargetWidth:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomTargetWidth id: '37' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1095,11 +1095,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SpotMeteringMode:39' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpotMeteringMode id: '39' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1113,11 +1113,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:PhotoEffect:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotoEffect id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1131,11 +1131,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ManualFlashOutput:41' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualFlashOutput id: '41' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1149,11 +1149,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ColorTone:42' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTone id: '42' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1176,11 +1176,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalType:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalType id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1194,11 +1194,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalLength:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1212,11 +1212,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneXSize:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXSize id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1230,11 +1230,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneYSize:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYSize id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1248,11 +1248,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFlashInfo:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashInfo id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1292,11 +1292,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoISO:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoISO id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1310,11 +1310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BaseISO:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BaseISO id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1328,11 +1328,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1346,11 +1346,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetAperture:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetAperture id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1364,11 +1364,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetExposureTime:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetExposureTime id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1382,11 +1382,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureCompensation:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1400,11 +1400,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:WhiteBalance:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1418,11 +1418,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SlowShutter:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SlowShutter id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1436,11 +1436,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SequenceNumber:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SequenceNumber id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1454,11 +1454,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:OpticalZoomCode:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OpticalZoomCode id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1472,11 +1472,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraTemperature:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1490,11 +1490,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashGuideNumber:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashGuideNumber id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1508,11 +1508,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AFPointsInFocus:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1526,11 +1526,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashExposureComp:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureComp id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1544,11 +1544,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoExposureBracketing:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoExposureBracketing id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1562,11 +1562,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AEBBracketValue:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBBracketValue id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1580,11 +1580,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ControlMode:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ControlMode id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1598,11 +1598,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceUpper:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1616,11 +1616,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceLower:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1634,11 +1634,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FNumber:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1652,11 +1652,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureTime:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1670,11 +1670,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV2:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV2 id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1688,11 +1688,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BulbDuration:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BulbDuration id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1706,11 +1706,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraType:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraType id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1724,11 +1724,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoRotate:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoRotate id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1742,11 +1742,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:NDFilter:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NDFilter id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1760,11 +1760,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SelfTimer2:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer2 id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1778,11 +1778,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashOutput:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashOutput id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1796,10 +1796,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '0' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1813,10 +1813,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '0' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -1839,11 +1839,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:NumAFPoints:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NumAFPoints id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1857,11 +1857,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:ValidAFPoints:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ValidAFPoints id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1875,11 +1875,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:CanonImageWidth:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageWidth id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1893,11 +1893,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:CanonImageHeight:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageHeight id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1911,11 +1911,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFImageWidth:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageWidth id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1929,11 +1929,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFImageHeight:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageHeight id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1947,11 +1947,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaWidth:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaWidth id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1965,11 +1965,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaHeight:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaHeight id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1983,11 +1983,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaXPositions:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaXPositions id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2001,11 +2001,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaYPositions:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaYPositions id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2019,11 +2019,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFPointsInFocus:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2037,11 +2037,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:PrimaryAFPoint:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrimaryAFPoint id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2055,11 +2055,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ThumbnailImageValidArea:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ThumbnailImageValidArea id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2073,11 +2073,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonImageType:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageType id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2091,11 +2091,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFirmwareVersion:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFirmwareVersion id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2109,11 +2109,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:FileNumber:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileNumber id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2127,11 +2127,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:OwnerName:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OwnerName id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2145,11 +2145,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonModelID:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonModelID id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2163,10 +2163,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '0' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2180,10 +2180,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '24' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2197,10 +2197,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '25' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2240,11 +2240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2258,11 +2258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2276,11 +2276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2294,11 +2294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2312,11 +2312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2330,7 +2330,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -2339,11 +2339,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2357,11 +2357,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2375,11 +2375,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:RelatedImageWidth:4097' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RelatedImageWidth id: '4097' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2393,11 +2393,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:RelatedImageHeight:4098' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RelatedImageHeight id: '4098' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2411,11 +2411,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2429,11 +2429,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2447,11 +2447,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2465,11 +2465,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2483,11 +2483,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2501,11 +2501,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2519,11 +2519,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2537,11 +2537,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2555,11 +2555,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2573,11 +2573,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2591,7 +2591,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -2600,11 +2600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2618,11 +2618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2636,11 +2636,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2654,11 +2654,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2688,7 +2688,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -2706,7 +2706,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -2724,7 +2724,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -2742,7 +2742,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -2760,7 +2760,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -2779,26 +2779,26 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1' - message: 'Could not access value for item ''SRAWQuality'' in ''CanonCameraSettings'', overflow' + message: "Could not access value for item 'SRAWQuality' in 'CanonCameraSettings', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13' - message: 'Could not access value for item ''LensSerialNumber'' in ''CanonCameraInfo'', overflow' + message: "Could not access value for item 'LensSerialNumber' in 'CanonCameraInfo', overflow" NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - message: 'Unknown item 0/0x0 in ''Canon''' + message: "Unknown item 0/0x0 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - message: 'Unknown item 0/0x0 in ''Canon''' + message: "Unknown item 0/0x0 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - message: 'Unknown item 0/0x0 in ''Canon''' + message: "Unknown item 0/0x0 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:24' - message: 'Unknown item 24/0x18 in ''Canon''' + message: "Unknown item 24/0x18 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - message: 'Unknown item 25/0x19 in ''Canon''' + message: "Unknown item 25/0x19 in 'Canon'" gdInfo: 0: 640 1: 480 @@ -2809,7 +2809,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: canon-powershot-s60.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 42616 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml b/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml index ea826c091..75109943a 100644 --- a/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml @@ -90,15 +90,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -116,7 +116,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -125,21 +125,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -148,11 +148,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -166,11 +166,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -184,11 +184,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -202,11 +202,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -220,11 +220,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -238,11 +238,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -256,11 +256,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -274,11 +274,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Artist:315' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Artist id: '315' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -292,11 +292,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -310,11 +310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Copyright:33432' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Copyright id: '33432' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -328,7 +328,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -337,11 +337,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -355,11 +355,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -373,11 +373,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -391,11 +391,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -409,11 +409,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensitivityType:34864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensitivityType id: '34864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -427,11 +427,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:RecommendedExposureIndex:34866' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecommendedExposureIndex id: '34866' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -445,11 +445,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -463,11 +463,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -481,11 +481,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -499,11 +499,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -517,11 +517,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -535,11 +535,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -553,11 +553,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -571,11 +571,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -589,11 +589,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -607,11 +607,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -625,7 +625,7 @@ elements: - node: makerNote path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: Canon id: '37500' @@ -660,11 +660,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MacroMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -678,11 +678,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SelfTimer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -696,11 +696,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Quality:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Quality id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -714,11 +714,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonFlashMode:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashMode id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -732,11 +732,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ContinuousDrive:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousDrive id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -750,11 +750,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusMode:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusMode id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -768,11 +768,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:RecordMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecordMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -786,11 +786,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonImageSize:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageSize id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -804,11 +804,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:EasyMode:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: EasyMode id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -822,11 +822,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DigitalZoom:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoom id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -840,11 +840,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Contrast:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -858,11 +858,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Saturation:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -876,11 +876,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Sharpness:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -894,11 +894,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CameraISO:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraISO id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -912,11 +912,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MeteringMode:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -930,11 +930,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusRange:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusRange id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -948,11 +948,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AFPoint:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPoint id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -966,11 +966,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonExposureMode:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonExposureMode id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -984,11 +984,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:LensType:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1002,11 +1002,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxFocalLength:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1020,11 +1020,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinFocalLength:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1038,11 +1038,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocalUnits:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalUnits id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1056,11 +1056,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxAperture:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxAperture id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1074,11 +1074,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinAperture:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinAperture id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1092,11 +1092,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashActivity:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashActivity id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1110,11 +1110,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashBits id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1128,11 +1128,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusContinuous:32' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusContinuous id: '32' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1146,11 +1146,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AESetting:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AESetting id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1164,11 +1164,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ImageStabilization:34' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageStabilization id: '34' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1182,11 +1182,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DisplayAperture:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DisplayAperture id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1200,11 +1200,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomSourceWidth:36' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomSourceWidth id: '36' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1218,11 +1218,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomTargetWidth:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomTargetWidth id: '37' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1236,11 +1236,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SpotMeteringMode:39' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpotMeteringMode id: '39' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1254,11 +1254,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:PhotoEffect:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotoEffect id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1272,11 +1272,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ManualFlashOutput:41' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualFlashOutput id: '41' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1290,11 +1290,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ColorTone:42' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTone id: '42' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1308,11 +1308,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SRAWQuality:46' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SRAWQuality id: '46' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1335,11 +1335,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalType:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalType id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1353,11 +1353,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalLength:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1371,11 +1371,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneXSize:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXSize id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1389,11 +1389,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneYSize:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYSize id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1407,11 +1407,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFlashInfo:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashInfo id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1451,11 +1451,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoISO:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoISO id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1469,11 +1469,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BaseISO:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BaseISO id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1487,11 +1487,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1505,11 +1505,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetAperture:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetAperture id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1523,11 +1523,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetExposureTime:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetExposureTime id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1541,11 +1541,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureCompensation:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1559,11 +1559,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:WhiteBalance:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1577,11 +1577,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SlowShutter:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SlowShutter id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1595,11 +1595,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SequenceNumber:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SequenceNumber id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1613,11 +1613,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:OpticalZoomCode:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OpticalZoomCode id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1631,11 +1631,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraTemperature:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1649,11 +1649,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashGuideNumber:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashGuideNumber id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1667,11 +1667,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AFPointsInFocus:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1685,11 +1685,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashExposureComp:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureComp id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1703,11 +1703,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoExposureBracketing:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoExposureBracketing id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1721,11 +1721,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AEBBracketValue:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBBracketValue id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1739,11 +1739,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ControlMode:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ControlMode id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1757,11 +1757,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceUpper:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1775,11 +1775,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceLower:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1793,11 +1793,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FNumber:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1811,11 +1811,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureTime:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1829,11 +1829,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV2:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV2 id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1847,11 +1847,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BulbDuration:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BulbDuration id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1865,11 +1865,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraType:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraType id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1883,11 +1883,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoRotate:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoRotate id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1901,11 +1901,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:NDFilter:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NDFilter id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1919,11 +1919,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SelfTimer2:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer2 id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1937,11 +1937,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashOutput:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashOutput id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1955,11 +1955,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonImageType:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageType id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1973,11 +1973,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFirmwareVersion:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFirmwareVersion id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1991,11 +1991,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:OwnerName:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OwnerName id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2035,11 +2035,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FNumber:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2053,11 +2053,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ExposureTime:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2071,11 +2071,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ISO:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2089,11 +2089,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:CameraTemperature:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2107,11 +2107,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FocalLength:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2125,11 +2125,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:CameraOrientation:132' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraOrientation id: '132' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2143,11 +2143,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FocusDistanceUpper:147' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '147' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2161,11 +2161,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FocusDistanceLower:149' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '149' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2179,11 +2179,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ColorTemperature:199' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTemperature id: '199' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2197,11 +2197,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:LensType:358' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '358' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2215,11 +2215,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:MinFocalLength:360' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '360' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2233,11 +2233,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:MaxFocalLength:362' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '362' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2251,11 +2251,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FirmwareVersion:606' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FirmwareVersion id: '606' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2269,11 +2269,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FileIndex:691' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileIndex id: '691' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2287,11 +2287,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:DirectoryIndex:703' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DirectoryIndex id: '703' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2305,11 +2305,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonModelID:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonModelID id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2323,11 +2323,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ThumbnailImageValidArea:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ThumbnailImageValidArea id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2341,10 +2341,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '25' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2385,11 +2385,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2403,11 +2403,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:NumAFPoints:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NumAFPoints id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2421,11 +2421,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:ValidAFPoints:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ValidAFPoints id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2439,11 +2439,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:CanonImageWidth:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageWidth id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2457,11 +2457,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:CanonImageHeight:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageHeight id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2475,11 +2475,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFImageWidth:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageWidth id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2493,11 +2493,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFImageHeight:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageHeight id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2511,11 +2511,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaWidths:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaWidths id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2529,11 +2529,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaHeights:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaHeights id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2547,11 +2547,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaXPositions:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaXPositions id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2565,11 +2565,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaYPositions:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaYPositions id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2583,11 +2583,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFPointsInFocus:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2601,11 +2601,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFPointsSelected:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsSelected id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2619,11 +2619,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:PrimaryAFPoint:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrimaryAFPoint id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2637,10 +2637,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '15' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2654,10 +2654,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2697,11 +2697,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonTimeInfo:53/tag:TimeZone:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TimeZone id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2715,11 +2715,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonTimeInfo:53/tag:TimeZoneCity:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TimeZoneCity id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2733,11 +2733,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonTimeInfo:53/tag:DaylightSavings:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DaylightSavings id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2777,11 +2777,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FileNumber:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileNumber id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2795,11 +2795,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketMode:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketMode id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2813,11 +2813,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketValue:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketValue id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2831,11 +2831,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketShotNumber:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketShotNumber id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2849,11 +2849,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgQuality:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgQuality id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2867,11 +2867,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgSize:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgSize id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2885,11 +2885,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:LongExposureNoiseReduction2:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LongExposureNoiseReduction2 id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2903,11 +2903,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2921,11 +2921,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketValueAB:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketValueAB id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2939,11 +2939,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketValueGM:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketValueGM id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2957,11 +2957,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FilterEffect:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FilterEffect id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2975,11 +2975,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:ToningEffect:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToningEffect id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2993,11 +2993,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:MacroMagnification:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMagnification id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3011,11 +3011,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:LiveViewShooting:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LiveViewShooting id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3029,11 +3029,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FocusDistanceUpper:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3047,11 +3047,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FocusDistanceLower:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3065,11 +3065,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FlashExposureLock:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureLock id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3083,11 +3083,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:LensModel:149' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: LensModel id: '149' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3101,11 +3101,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:InternalSerialNumber:150' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InternalSerialNumber id: '150' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3119,11 +3119,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:DustRemovalData:151' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DustRemovalData id: '151' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3146,11 +3146,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropLeftMargin:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropLeftMargin id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3164,11 +3164,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropRightMargin:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropRightMargin id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3182,11 +3182,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropTopMargin:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropTopMargin id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3200,11 +3200,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropBottomMargin:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropBottomMargin id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3236,11 +3236,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ExposureLevelIncrements:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureLevelIncrements id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3254,11 +3254,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ISOSpeedIncrements:258' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISOSpeedIncrements id: '258' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3272,11 +3272,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:AEBAutoCancel:260' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBAutoCancel id: '260' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3290,11 +3290,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:AEBSequence:261' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBSequence id: '261' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3308,11 +3308,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:AEBShotCount:262' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBShotCount id: '262' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3326,11 +3326,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:SafetyShift:264' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SafetyShift id: '264' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3353,11 +3353,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AIServoTrackingSensitivity:1282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AIServoTrackingSensitivity id: '1282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3371,11 +3371,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AccelerationTracking:1304' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AccelerationTracking id: '1304' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3389,11 +3389,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AIServoFirstImagePriority:1305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AIServoFirstImagePriority id: '1305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3407,11 +3407,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AIServoSecondImagePriority:1306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AIServoSecondImagePriority id: '1306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3425,11 +3425,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFAssistBeam:1294' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAssistBeam id: '1294' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3443,11 +3443,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:LensDriveNoAF:1285' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensDriveNoAF id: '1285' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3461,11 +3461,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:SelectAFAreaSelectMode:1298' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelectAFAreaSelectMode id: '1298' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3479,11 +3479,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFAreaSelectMethod:1307' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaSelectMethod id: '1307' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3497,11 +3497,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:OrientationLinkedAFPoint:1302' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OrientationLinkedAFPoint id: '1302' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3515,11 +3515,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:ManualAFPointSelectPattern:1299' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualAFPointSelectPattern id: '1299' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3533,11 +3533,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFPointDisplayDuringFocus:1292' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointDisplayDuringFocus id: '1292' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3551,11 +3551,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:VFDisplayIllumination:1296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: VFDisplayIllumination id: '1296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3569,11 +3569,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFMicroadjustment:1287' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroadjustment id: '1287' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3596,11 +3596,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:DialDirectionTvAv:1798' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DialDirectionTvAv id: '1798' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3614,11 +3614,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:MultiFunctionLock:1807' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MultiFunctionLock id: '1807' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3632,11 +3632,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:ViewfinderWarnings:1034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ViewfinderWarnings id: '1034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3650,11 +3650,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:CustomControls:1804' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomControls id: '1804' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3677,11 +3677,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:AspectRatio:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AspectRatio id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3695,11 +3695,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageWidth:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageWidth id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3713,11 +3713,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageHeight:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageHeight id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3731,11 +3731,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageLeft:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageLeft id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3749,11 +3749,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageTop:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageTop id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3794,11 +3794,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:ToneCurve:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToneCurve id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3812,11 +3812,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:Sharpness:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3830,11 +3830,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SharpnessFrequency:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SharpnessFrequency id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3848,11 +3848,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SensorRedLevel:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorRedLevel id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3866,11 +3866,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SensorBlueLevel:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorBlueLevel id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3884,11 +3884,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalanceRed:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalanceRed id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3902,11 +3902,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalanceBlue:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalanceBlue id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3920,11 +3920,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalance:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3938,11 +3938,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:ColorTemperature:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTemperature id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3956,11 +3956,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:PictureStyle:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyle id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3974,11 +3974,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:DigitalGain:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalGain id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3992,11 +3992,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WBShiftAB:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBShiftAB id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4010,11 +4010,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WBShiftGM:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBShiftGM id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4055,11 +4055,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:MeasuredRGGB:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredRGGB id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4073,10 +4073,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '2' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4090,11 +4090,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ColorSpace:180' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '180' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4108,11 +4108,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:VRDOffset:208' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: VRDOffset id: '208' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4153,11 +4153,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorWidth:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorWidth id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4171,11 +4171,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorHeight:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorHeight id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4189,10 +4189,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '3' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4206,10 +4206,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '4' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4223,11 +4223,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorLeftBorder:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorLeftBorder id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4241,11 +4241,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorTopBorder:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorTopBorder id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4259,11 +4259,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorRightBorder:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorRightBorder id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4277,11 +4277,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorBottomBorder:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorBottomBorder id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4295,11 +4295,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskLeftBorder:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskLeftBorder id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4313,11 +4313,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskTopBorder:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskTopBorder id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4331,11 +4331,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskRightBorder:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskRightBorder id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4349,11 +4349,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskBottomBorder:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskBottomBorder id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4367,10 +4367,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '13' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4384,10 +4384,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '14' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4401,10 +4401,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '15' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4418,10 +4418,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4461,11 +4461,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorDataVersion:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorDataVersion id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4479,11 +4479,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsAsShot:63' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsAsShot id: '63' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4497,11 +4497,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempAsShot:67' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempAsShot id: '67' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4515,11 +4515,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsAuto:68' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsAuto id: '68' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4533,11 +4533,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempAuto:72' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempAuto id: '72' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4551,11 +4551,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsMeasured:73' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsMeasured id: '73' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4569,11 +4569,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempMeasured:77' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempMeasured id: '77' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4587,11 +4587,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown:78' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown id: '78' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4605,11 +4605,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown:82' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown id: '82' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4623,11 +4623,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown2:83' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown2 id: '83' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4641,11 +4641,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown2:87' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown2 id: '87' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4659,11 +4659,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown3:88' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown3 id: '88' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4677,11 +4677,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown3:92' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown3 id: '92' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4695,11 +4695,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown4:93' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown4 id: '93' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4713,11 +4713,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown4:97' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown4 id: '97' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4731,11 +4731,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown5:98' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown5 id: '98' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4749,11 +4749,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown5:102' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown5 id: '102' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4767,11 +4767,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown6:103' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown6 id: '103' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4785,11 +4785,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown6:107' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown6 id: '107' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4803,11 +4803,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown7:108' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown7 id: '108' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4821,11 +4821,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown7:112' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown7 id: '112' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4839,11 +4839,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown8:113' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown8 id: '113' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4857,11 +4857,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown8:117' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown8 id: '117' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4875,11 +4875,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown9:118' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown9 id: '118' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4893,11 +4893,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown9:122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown9 id: '122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4911,11 +4911,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown10:123' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown10 id: '123' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4929,11 +4929,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown10:127' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown10 id: '127' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4947,11 +4947,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsDaylight:128' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsDaylight id: '128' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4965,11 +4965,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempDaylight:132' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempDaylight id: '132' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4983,11 +4983,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsShade:133' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsShade id: '133' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5001,11 +5001,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempShade:137' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempShade id: '137' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5019,11 +5019,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsCloudy:138' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsCloudy id: '138' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5037,11 +5037,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempCloudy:142' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempCloudy id: '142' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5055,11 +5055,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsTungsten:143' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsTungsten id: '143' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5073,11 +5073,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempTungsten:147' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempTungsten id: '147' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5091,11 +5091,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsFluorescent:148' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsFluorescent id: '148' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5109,11 +5109,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempFluorescent:152' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempFluorescent id: '152' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5127,11 +5127,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsKelvin:153' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsKelvin id: '153' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5145,11 +5145,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempKelvin:157' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempKelvin id: '157' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5163,11 +5163,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsFlash:158' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsFlash id: '158' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5181,11 +5181,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempFlash:162' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempFlash id: '162' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5199,11 +5199,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown11:163' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown11 id: '163' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5217,11 +5217,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown11:167' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown11 id: '167' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5235,11 +5235,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown12:168' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown12 id: '168' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5253,11 +5253,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown12:172' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown12 id: '172' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5271,11 +5271,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown13:173' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown13 id: '173' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5289,11 +5289,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown13:177' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown13 id: '177' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5307,11 +5307,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown14:178' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown14 id: '178' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5325,11 +5325,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown14:182' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown14 id: '182' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5343,11 +5343,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown15:183' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown15 id: '183' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5361,11 +5361,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown15:187' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown15 id: '187' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5379,11 +5379,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown16:188' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown16 id: '188' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5397,11 +5397,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown16:192' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown16 id: '192' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5415,11 +5415,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown17:193' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown17 id: '193' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5433,11 +5433,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown17:197' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown17 id: '197' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5451,11 +5451,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown18:198' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown18 id: '198' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5469,11 +5469,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown18:202' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown18 id: '202' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5487,11 +5487,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown19:203' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown19 id: '203' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5505,11 +5505,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown19:207' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown19 id: '207' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5523,11 +5523,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown20:208' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown20 id: '208' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5541,11 +5541,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown20:212' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown20 id: '212' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5559,11 +5559,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:AverageBlackLevel:276' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AverageBlackLevel id: '276' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5577,11 +5577,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:RawMeasuredRGGB:429' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawMeasuredRGGB id: '429' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5595,11 +5595,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:PerChannelBlackLevel:504' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PerChannelBlackLevel id: '504' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5613,11 +5613,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:NormalWhiteLevel:508' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NormalWhiteLevel id: '508' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5631,11 +5631,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:SpecularWhiteLevel:509' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpecularWhiteLevel id: '509' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5649,11 +5649,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:LinearityUpperMargin:510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LinearityUpperMargin id: '510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5667,11 +5667,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:RawMeasuredRGGB:619' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawMeasuredRGGB id: '619' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5685,11 +5685,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:PerChannelBlackLevel:728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PerChannelBlackLevel id: '728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5703,11 +5703,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:NormalWhiteLevel:732' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NormalWhiteLevel id: '732' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5721,11 +5721,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:SpecularWhiteLevel:733' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpecularWhiteLevel id: '733' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5739,11 +5739,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:LinearityUpperMargin:734' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LinearityUpperMargin id: '734' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5757,11 +5757,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:PictureStyleUserDef:16392' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyleUserDef id: '16392' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5775,11 +5775,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:PictureStylePC:16393' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStylePC id: '16393' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5793,11 +5793,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CustomPictureStyleFileName:16400' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomPictureStyleFileName id: '16400' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5811,10 +5811,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16401' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16401' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5828,10 +5828,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16402' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16402' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5889,11 +5889,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAFMicroAdj:16403/tag:AFMicroAdjMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroAdjMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5907,11 +5907,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAFMicroAdj:16403/tag:AFMicroAdjValue:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroAdjValue id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5925,11 +5925,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonVignettingCorr:16405' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonVignettingCorr id: '16405' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5987,11 +5987,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonVignettingCorr2:16406/tag:PeripheralLightingSetting:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PeripheralLightingSetting id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6005,11 +6005,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonVignettingCorr2:16406/tag:ChromaticAberrationSetting:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ChromaticAberrationSetting id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6049,11 +6049,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:PeripheralIlluminationCorr:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PeripheralIlluminationCorr id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6067,11 +6067,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:AutoLightingOptimizer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoLightingOptimizer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6085,11 +6085,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:HighlightTonePriority:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: HighlightTonePriority id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6103,11 +6103,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:LongExposureNoiseReduction:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LongExposureNoiseReduction id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6121,11 +6121,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:HighISONoiseReduction:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: HighISONoiseReduction id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6139,11 +6139,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonLensInfo:16409' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonLensInfo id: '16409' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6201,11 +6201,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAmbience:16416/tag:AmbienceSelection:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AmbienceSelection id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6245,11 +6245,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonMultiExp:16417/tag:MultiExposure:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MultiExposure id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6263,11 +6263,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonMultiExp:16417/tag:MultiExposureControl:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MultiExposureControl id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6281,11 +6281,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonMultiExp:16417/tag:MultiExposureShots:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MultiExposureShots id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6334,11 +6334,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GrainyBWFilter id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6361,11 +6361,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SoftFocusFilter id: '513' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6388,11 +6388,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToyCameraFilter id: '769' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6415,11 +6415,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MiniatureFilter id: '1025' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6433,11 +6433,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MiniatureFilterOrientation id: '1026' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6451,11 +6451,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MiniatureFilterPosition id: '1027' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6469,11 +6469,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MiniatureFilterParameter id: '1028' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6496,11 +6496,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FisheyeFilter id: '1281' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6523,11 +6523,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PaintingFilter id: '1537' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6550,11 +6550,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WatercolorFilter id: '1793' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6568,11 +6568,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonRawBurstModeRoll:16421' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonRawBurstModeRoll id: '16421' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6586,10 +6586,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16423' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16423' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6603,11 +6603,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6621,11 +6621,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTime:37520' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTime id: '37520' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6639,11 +6639,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6657,11 +6657,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6675,11 +6675,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6693,11 +6693,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6711,11 +6711,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6729,11 +6729,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6747,7 +6747,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -6756,11 +6756,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6774,11 +6774,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6792,11 +6792,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6810,11 +6810,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6828,11 +6828,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6846,11 +6846,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6864,11 +6864,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6882,11 +6882,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6900,11 +6900,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6918,11 +6918,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OwnerName:42032' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OwnerName id: '42032' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6936,11 +6936,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SerialNumber:42033' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SerialNumber id: '42033' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6954,11 +6954,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensInfo:42034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensInfo id: '42034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6972,11 +6972,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensModel:42036' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensModel id: '42036' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6990,11 +6990,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensSerialNumber:42037' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensSerialNumber id: '42037' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7008,7 +7008,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -7017,11 +7017,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSVersionID id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7035,7 +7035,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -7044,11 +7044,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7062,11 +7062,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7080,11 +7080,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7098,11 +7098,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7132,7 +7132,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -7150,7 +7150,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -7168,7 +7168,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -7186,7 +7186,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -7204,7 +7204,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -7222,7 +7222,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -7289,7 +7289,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: canon_eos_70d_29.jpg - FileDateTime: 1690031131 + FileDateTime: 1639835048 FileSize: 7643244 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml b/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml index 34af75b74..0869376a9 100644 --- a/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml @@ -121,15 +121,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -147,7 +147,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -156,21 +156,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -179,11 +179,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -197,11 +197,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -215,11 +215,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -233,11 +233,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -251,11 +251,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -269,11 +269,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -287,11 +287,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -305,11 +305,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -323,7 +323,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -332,11 +332,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -350,11 +350,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -368,11 +368,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -386,11 +386,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -404,11 +404,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensitivityType:34864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensitivityType id: '34864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -422,11 +422,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:RecommendedExposureIndex:34866' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecommendedExposureIndex id: '34866' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -440,11 +440,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -458,11 +458,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -476,11 +476,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -494,11 +494,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTime:36880' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTime id: '36880' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -512,11 +512,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTimeOriginal:36881' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTimeOriginal id: '36881' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -530,11 +530,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTimeDigitized:36882' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTimeDigitized id: '36882' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -548,11 +548,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -566,11 +566,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -584,11 +584,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -602,11 +602,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -620,11 +620,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -638,11 +638,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -656,11 +656,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -674,11 +674,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -692,7 +692,7 @@ elements: - node: makerNote path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: Canon id: '37500' @@ -727,11 +727,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MacroMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -745,11 +745,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SelfTimer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -763,11 +763,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Quality:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Quality id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -781,11 +781,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonFlashMode:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashMode id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -799,11 +799,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ContinuousDrive:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousDrive id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -817,11 +817,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusMode:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusMode id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -835,11 +835,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:RecordMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecordMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -853,11 +853,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonImageSize:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageSize id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -871,11 +871,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:EasyMode:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: EasyMode id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -889,11 +889,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DigitalZoom:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoom id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -907,11 +907,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Contrast:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -925,11 +925,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Saturation:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -943,11 +943,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Sharpness:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -961,11 +961,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CameraISO:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraISO id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -979,11 +979,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MeteringMode:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -997,11 +997,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusRange:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusRange id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1015,11 +1015,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AFPoint:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPoint id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1033,11 +1033,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonExposureMode:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonExposureMode id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1051,11 +1051,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:LensType:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1069,11 +1069,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxFocalLength:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1087,11 +1087,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinFocalLength:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1105,11 +1105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocalUnits:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalUnits id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1123,11 +1123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxAperture:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxAperture id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1141,11 +1141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinAperture:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinAperture id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1159,11 +1159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashActivity:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashActivity id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1177,11 +1177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashBits id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1195,11 +1195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusContinuous:32' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusContinuous id: '32' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1213,11 +1213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AESetting:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AESetting id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1231,11 +1231,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ImageStabilization:34' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageStabilization id: '34' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1249,11 +1249,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DisplayAperture:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DisplayAperture id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1267,11 +1267,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomSourceWidth:36' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomSourceWidth id: '36' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1285,11 +1285,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomTargetWidth:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomTargetWidth id: '37' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1303,11 +1303,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SpotMeteringMode:39' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpotMeteringMode id: '39' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1321,11 +1321,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:PhotoEffect:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotoEffect id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1339,11 +1339,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ManualFlashOutput:41' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualFlashOutput id: '41' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1357,11 +1357,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ColorTone:42' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTone id: '42' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1375,11 +1375,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SRAWQuality:46' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SRAWQuality id: '46' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1402,11 +1402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalType:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalType id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1420,11 +1420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalLength:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1438,11 +1438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneXSize:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXSize id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1456,11 +1456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneYSize:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYSize id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1474,11 +1474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFlashInfo:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashInfo id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1518,11 +1518,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoISO:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoISO id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1536,11 +1536,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BaseISO:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BaseISO id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1554,11 +1554,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1572,11 +1572,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetAperture:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetAperture id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1590,11 +1590,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetExposureTime:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetExposureTime id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1608,11 +1608,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureCompensation:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1626,11 +1626,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:WhiteBalance:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1644,11 +1644,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SlowShutter:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SlowShutter id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1662,11 +1662,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SequenceNumber:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SequenceNumber id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1680,11 +1680,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:OpticalZoomCode:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OpticalZoomCode id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1698,11 +1698,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraTemperature:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1716,11 +1716,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashGuideNumber:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashGuideNumber id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1734,11 +1734,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AFPointsInFocus:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1752,11 +1752,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashExposureComp:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureComp id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1770,11 +1770,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoExposureBracketing:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoExposureBracketing id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1788,11 +1788,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AEBBracketValue:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBBracketValue id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1806,11 +1806,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ControlMode:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ControlMode id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1824,11 +1824,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceUpper:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1842,11 +1842,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceLower:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1860,11 +1860,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FNumber:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1878,11 +1878,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureTime:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1896,11 +1896,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV2:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV2 id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1914,11 +1914,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BulbDuration:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BulbDuration id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1932,11 +1932,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraType:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraType id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1950,11 +1950,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoRotate:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoRotate id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1968,11 +1968,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:NDFilter:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NDFilter id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1986,11 +1986,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SelfTimer2:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer2 id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2004,11 +2004,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashOutput:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashOutput id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2022,11 +2022,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonImageType:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageType id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2040,11 +2040,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFirmwareVersion:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFirmwareVersion id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2058,11 +2058,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:OwnerName:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OwnerName id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2102,11 +2102,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:LensSerialNumber:363' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensSerialNumber id: '363' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2120,11 +2120,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonModelID:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonModelID id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2138,11 +2138,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ThumbnailImageValidArea:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ThumbnailImageValidArea id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2156,10 +2156,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '25' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2200,11 +2200,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2218,11 +2218,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:NumAFPoints:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NumAFPoints id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2236,11 +2236,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:ValidAFPoints:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ValidAFPoints id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2254,11 +2254,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:CanonImageWidth:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageWidth id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2272,11 +2272,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:CanonImageHeight:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageHeight id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2290,11 +2290,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFImageWidth:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageWidth id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2308,11 +2308,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFImageHeight:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageHeight id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2326,11 +2326,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaWidths:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaWidths id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2344,11 +2344,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaHeights:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaHeights id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2362,11 +2362,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaXPositions:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaXPositions id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2380,11 +2380,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaYPositions:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaYPositions id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2398,11 +2398,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFPointsInFocus:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2416,11 +2416,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFPointsSelected:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsSelected id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2434,11 +2434,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:PrimaryAFPoint:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrimaryAFPoint id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2452,10 +2452,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '15' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2469,10 +2469,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2486,10 +2486,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '17' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2503,10 +2503,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '18' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2520,10 +2520,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '19' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2537,10 +2537,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2554,10 +2554,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '21' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2571,10 +2571,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '22' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2588,10 +2588,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '23' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2605,11 +2605,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ImageUniqueID:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageUniqueID id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2623,10 +2623,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:50' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '50' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2640,10 +2640,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:51' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '51' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2683,11 +2683,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonTimeInfo:53/tag:TimeZone:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TimeZone id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2701,11 +2701,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonTimeInfo:53/tag:TimeZoneCity:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TimeZoneCity id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2719,11 +2719,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonTimeInfo:53/tag:DaylightSavings:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DaylightSavings id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2737,11 +2737,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:BatteryType:56' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BatteryType id: '56' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2755,10 +2755,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:61' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '61' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2772,10 +2772,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:63' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '63' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2815,11 +2815,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FileNumber:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileNumber id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2833,11 +2833,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketMode:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketMode id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2851,11 +2851,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketValue:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketValue id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2869,11 +2869,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketShotNumber:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketShotNumber id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2887,11 +2887,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgQuality:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgQuality id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2905,11 +2905,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgSize:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgSize id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2923,11 +2923,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:LongExposureNoiseReduction2:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LongExposureNoiseReduction2 id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2941,11 +2941,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2959,11 +2959,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketValueAB:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketValueAB id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2977,11 +2977,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketValueGM:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketValueGM id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2995,11 +2995,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FilterEffect:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FilterEffect id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3013,11 +3013,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:ToningEffect:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToningEffect id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3031,11 +3031,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:MacroMagnification:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMagnification id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3049,11 +3049,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:LiveViewShooting:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LiveViewShooting id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3067,11 +3067,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FocusDistanceUpper:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3085,11 +3085,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FocusDistanceLower:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3103,11 +3103,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FlashExposureLock:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureLock id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3121,11 +3121,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:LensModel:149' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensModel id: '149' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3139,11 +3139,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:InternalSerialNumber:150' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InternalSerialNumber id: '150' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3157,11 +3157,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:DustRemovalData:151' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DustRemovalData id: '151' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3184,11 +3184,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropLeftMargin:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropLeftMargin id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3202,11 +3202,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropRightMargin:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropRightMargin id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3220,11 +3220,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropTopMargin:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropTopMargin id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3238,11 +3238,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropBottomMargin:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropBottomMargin id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3274,11 +3274,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ExposureLevelIncrements:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureLevelIncrements id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3292,11 +3292,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ISOSpeedIncrements:258' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISOSpeedIncrements id: '258' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3310,11 +3310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ISOSpeedRange:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISOSpeedRange id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3328,11 +3328,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:SafetyShift:264' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SafetyShift id: '264' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3346,11 +3346,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ExposureCompAutoCancel:275' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompAutoCancel id: '275' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3373,11 +3373,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFPointDisplayDuringFocus:1292' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointDisplayDuringFocus id: '1292' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3391,11 +3391,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFAreaSelectMethod:1307' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaSelectMethod id: '1307' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3409,11 +3409,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AutoAFPointColorTracking:1308' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoAFPointColorTracking id: '1308' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3427,11 +3427,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:VFDisplayIllumination:1309' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: VFDisplayIllumination id: '1309' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3445,11 +3445,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:MirrorLockup:1551' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MirrorLockup id: '1551' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3472,11 +3472,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:ViewfinderWarnings:1034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ViewfinderWarnings id: '1034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3490,11 +3490,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:CustomControls:1804' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomControls id: '1804' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3508,11 +3508,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:LCDDisplayAtPowerOn:2065' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LCDDisplayAtPowerOn id: '2065' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3526,11 +3526,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:RetractLensOnPowerOff:2068' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RetractLensOnPowerOff id: '2068' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3553,11 +3553,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:AspectRatio:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AspectRatio id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3571,11 +3571,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageWidth:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageWidth id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3589,11 +3589,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageHeight:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageHeight id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3607,11 +3607,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageLeft:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageLeft id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3625,11 +3625,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageTop:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageTop id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3670,11 +3670,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:ToneCurve:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToneCurve id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3688,11 +3688,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:Sharpness:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3706,11 +3706,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SharpnessFrequency:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SharpnessFrequency id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3724,11 +3724,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SensorRedLevel:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorRedLevel id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3742,11 +3742,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SensorBlueLevel:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorBlueLevel id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3760,11 +3760,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalanceRed:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalanceRed id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3778,11 +3778,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalanceBlue:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalanceBlue id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3796,11 +3796,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalance:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3814,11 +3814,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:ColorTemperature:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTemperature id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3832,11 +3832,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:PictureStyle:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyle id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3850,11 +3850,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:DigitalGain:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalGain id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3868,11 +3868,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WBShiftAB:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBShiftAB id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3886,11 +3886,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WBShiftGM:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBShiftGM id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3904,10 +3904,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '14' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -3921,10 +3921,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '15' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -3938,10 +3938,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -3955,10 +3955,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '17' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -3999,11 +3999,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:MeasuredRGGB:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredRGGB id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4017,10 +4017,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '2' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4034,11 +4034,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ColorSpace:180' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '180' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4052,11 +4052,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:VRDOffset:208' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: VRDOffset id: '208' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4097,11 +4097,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorWidth:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorWidth id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4115,11 +4115,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorHeight:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorHeight id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4133,10 +4133,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '3' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4150,10 +4150,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '4' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4167,11 +4167,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorLeftBorder:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorLeftBorder id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4185,11 +4185,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorTopBorder:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorTopBorder id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4203,11 +4203,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorRightBorder:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorRightBorder id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4221,11 +4221,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorBottomBorder:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorBottomBorder id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4239,11 +4239,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskLeftBorder:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskLeftBorder id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4257,11 +4257,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskTopBorder:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskTopBorder id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4275,11 +4275,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskRightBorder:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskRightBorder id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4293,11 +4293,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskBottomBorder:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskBottomBorder id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4311,10 +4311,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '13' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4328,10 +4328,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '14' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4345,10 +4345,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '15' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4362,10 +4362,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4405,11 +4405,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorDataVersion:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorDataVersion id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4423,11 +4423,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsAsShot:71' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsAsShot id: '71' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4441,11 +4441,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempAsShot:75' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempAsShot id: '75' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4459,11 +4459,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsAuto:76' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsAuto id: '76' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4477,11 +4477,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempAuto:80' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempAuto id: '80' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4495,11 +4495,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsMeasured:81' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsMeasured id: '81' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4513,11 +4513,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempMeasured:85' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempMeasured id: '85' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4531,11 +4531,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown:86' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown id: '86' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4549,11 +4549,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown:90' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown id: '90' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4567,11 +4567,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown2:91' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown2 id: '91' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4585,11 +4585,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown2:95' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown2 id: '95' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4603,11 +4603,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown3:96' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown3 id: '96' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4621,11 +4621,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown3:100' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown3 id: '100' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4639,11 +4639,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown4:101' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown4 id: '101' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4657,11 +4657,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown4:105' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown4 id: '105' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4675,11 +4675,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown5:106' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown5 id: '106' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4693,11 +4693,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown5:110' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown5 id: '110' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4711,11 +4711,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown6:111' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown6 id: '111' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4729,11 +4729,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown6:115' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown6 id: '115' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4747,11 +4747,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown7:116' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown7 id: '116' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4765,11 +4765,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown7:120' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown7 id: '120' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4783,11 +4783,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown8:121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown8 id: '121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4801,11 +4801,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown8:125' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown8 id: '125' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4819,11 +4819,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown9:126' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown9 id: '126' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4837,11 +4837,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown9:130' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown9 id: '130' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4855,11 +4855,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown10:131' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown10 id: '131' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4873,11 +4873,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown10:135' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown10 id: '135' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4891,11 +4891,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsDaylight:136' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsDaylight id: '136' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4909,11 +4909,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempDaylight:140' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempDaylight id: '140' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4927,11 +4927,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsShade:141' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsShade id: '141' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4945,11 +4945,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempShade:145' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempShade id: '145' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4963,11 +4963,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsCloudy:146' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsCloudy id: '146' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4981,11 +4981,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempCloudy:150' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempCloudy id: '150' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4999,11 +4999,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsTungsten:151' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsTungsten id: '151' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5017,11 +5017,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempTungsten:155' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempTungsten id: '155' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5035,11 +5035,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsFluorescent:156' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsFluorescent id: '156' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5053,11 +5053,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempFluorescent:160' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempFluorescent id: '160' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5071,11 +5071,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsKelvin:161' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsKelvin id: '161' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5089,11 +5089,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempKelvin:165' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempKelvin id: '165' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5107,11 +5107,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsFlash:166' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsFlash id: '166' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5125,11 +5125,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempFlash:170' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempFlash id: '170' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5143,11 +5143,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown11:171' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown11 id: '171' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5161,11 +5161,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown11:175' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown11 id: '175' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5179,11 +5179,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown12:176' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown12 id: '176' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5197,11 +5197,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown12:180' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown12 id: '180' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5215,11 +5215,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown13:181' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown13 id: '181' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5233,11 +5233,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown13:185' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown13 id: '185' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5251,11 +5251,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown14:186' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown14 id: '186' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5269,11 +5269,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown14:190' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown14 id: '190' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5287,11 +5287,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown15:191' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown15 id: '191' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5305,11 +5305,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown15:195' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown15 id: '195' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5323,11 +5323,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown16:196' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown16 id: '196' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5341,11 +5341,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown16:200' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown16 id: '200' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5359,11 +5359,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown17:201' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown17 id: '201' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5377,11 +5377,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown17:205' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown17 id: '205' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5395,11 +5395,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown18:206' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown18 id: '206' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5413,11 +5413,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown18:210' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown18 id: '210' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5431,11 +5431,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown19:211' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown19 id: '211' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5449,11 +5449,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown19:215' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown19 id: '215' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5467,11 +5467,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown20:216' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown20 id: '216' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5485,11 +5485,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown20:220' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown20 id: '220' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5503,11 +5503,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown21:221' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown21 id: '221' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5521,11 +5521,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown21:225' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown21 id: '225' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5539,11 +5539,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown22:226' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown22 id: '226' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5557,11 +5557,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown22:230' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown22 id: '230' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5575,11 +5575,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown23:231' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown23 id: '231' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5593,11 +5593,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown23:235' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown23 id: '235' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5611,11 +5611,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown24:236' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown24 id: '236' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5629,11 +5629,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown24:240' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown24 id: '240' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5647,11 +5647,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown25:241' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown25 id: '241' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5665,11 +5665,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown25:245' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown25 id: '245' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5683,11 +5683,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown26:246' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown26 id: '246' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5701,11 +5701,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown26:250' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown26 id: '250' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5719,11 +5719,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown27:251' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown27 id: '251' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5737,11 +5737,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown27:255' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown27 id: '255' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5755,11 +5755,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown28:256' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown28 id: '256' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5773,11 +5773,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown28:260' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown28 id: '260' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5791,11 +5791,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsUnknown29:261' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsUnknown29 id: '261' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5809,11 +5809,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorTempUnknown29:265' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTempUnknown29 id: '265' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5827,11 +5827,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:PerChannelBlackLevel:329' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PerChannelBlackLevel id: '329' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5845,11 +5845,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:NormalWhiteLevel:796' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NormalWhiteLevel id: '796' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5863,11 +5863,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:SpecularWhiteLevel:797' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpecularWhiteLevel id: '797' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5881,11 +5881,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:LinearityUpperMargin:798' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LinearityUpperMargin id: '798' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5899,11 +5899,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:PictureStyleUserDef:16392' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyleUserDef id: '16392' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5917,11 +5917,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:PictureStylePC:16393' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStylePC id: '16393' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5935,11 +5935,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CustomPictureStyleFileName:16400' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomPictureStyleFileName id: '16400' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5953,10 +5953,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16401' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16401' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5970,10 +5970,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16402' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16402' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6031,11 +6031,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAFMicroAdj:16403/tag:AFMicroAdjMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroAdjMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6049,11 +6049,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAFMicroAdj:16403/tag:AFMicroAdjValue:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroAdjValue id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6067,11 +6067,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonVignettingCorr:16405' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonVignettingCorr id: '16405' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6129,11 +6129,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonVignettingCorr2:16406/tag:PeripheralLightingSetting:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PeripheralLightingSetting id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6147,11 +6147,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonVignettingCorr2:16406/tag:ChromaticAberrationSetting:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ChromaticAberrationSetting id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6191,11 +6191,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:PeripheralIlluminationCorr:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PeripheralIlluminationCorr id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6209,11 +6209,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:AutoLightingOptimizer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoLightingOptimizer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6227,11 +6227,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:HighlightTonePriority:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: HighlightTonePriority id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6245,11 +6245,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:LongExposureNoiseReduction:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LongExposureNoiseReduction id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6263,11 +6263,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408/tag:HighISONoiseReduction:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: HighISONoiseReduction id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6281,11 +6281,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonLensInfo:16409' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonLensInfo id: '16409' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6343,11 +6343,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAmbience:16416/tag:AmbienceSelection:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AmbienceSelection id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6396,11 +6396,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:1/tag:GrainyBWFilter:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GrainyBWFilter id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6423,11 +6423,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:2/tag:SoftFocusFilter:513' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SoftFocusFilter id: '513' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6450,11 +6450,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:3/tag:ToyCameraFilter:769' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToyCameraFilter id: '769' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6477,11 +6477,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilter:1025' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MiniatureFilter id: '1025' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6495,11 +6495,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterOrientation:1026' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MiniatureFilterOrientation id: '1026' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6513,11 +6513,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterPosition:1027' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MiniatureFilterPosition id: '1027' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6531,11 +6531,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:4/tag:MiniatureFilterParameter:1028' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MiniatureFilterParameter id: '1028' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6558,11 +6558,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:5/tag:FisheyeFilter:1281' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FisheyeFilter id: '1281' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6585,11 +6585,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:6/tag:PaintingFilter:1537' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PaintingFilter id: '1537' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6612,11 +6612,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/filterInfo:CanonFilterInfo:16420/filter:7/tag:WatercolorFilter:1793' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WatercolorFilter id: '1793' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6630,11 +6630,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonRawBurstModeRoll:16421' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonRawBurstModeRoll id: '16421' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6648,10 +6648,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16423' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16423' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6665,10 +6665,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16428' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16428' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6682,10 +6682,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16435' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16435' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6699,10 +6699,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16441' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16441' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6716,10 +6716,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16444' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16444' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6733,10 +6733,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16445' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16445' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6750,10 +6750,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16457' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16457' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -6767,11 +6767,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTime:37520' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTime id: '37520' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6785,11 +6785,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6803,11 +6803,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6821,11 +6821,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6839,11 +6839,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6857,11 +6857,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6875,11 +6875,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6893,7 +6893,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -6902,11 +6902,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6920,11 +6920,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6938,11 +6938,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6956,11 +6956,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6974,11 +6974,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -6992,11 +6992,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7010,11 +7010,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7028,11 +7028,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7046,11 +7046,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7064,11 +7064,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OwnerName:42032' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OwnerName id: '42032' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7082,11 +7082,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SerialNumber:42033' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SerialNumber id: '42033' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7100,11 +7100,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensInfo:42034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensInfo id: '42034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7118,11 +7118,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensModel:42036' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensModel id: '42036' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7136,11 +7136,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensSerialNumber:42037' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensSerialNumber id: '42037' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7154,7 +7154,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -7163,11 +7163,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSVersionID id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7181,7 +7181,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -7190,11 +7190,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7208,11 +7208,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7226,11 +7226,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7244,11 +7244,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -7278,7 +7278,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -7296,7 +7296,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP13:237' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP13 id: '237' @@ -7314,7 +7314,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP2:226' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP2 id: '226' @@ -7332,7 +7332,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -7350,7 +7350,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -7368,7 +7368,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -7386,7 +7386,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -7404,7 +7404,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -7510,7 +7510,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: canon_eos_850d_08.jpg - FileDateTime: 1690031131 + FileDateTime: 1639835048 FileSize: 8746090 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/fujifilm_x_a5.jpg.dump.yml b/tests/media-dumps/image/camera/fujifilm_x_a5.jpg.dump.yml index b8333e4fb..10714647d 100644 --- a/tests/media-dumps/image/camera/fujifilm_x_a5.jpg.dump.yml +++ b/tests/media-dumps/image/camera/fujifilm_x_a5.jpg.dump.yml @@ -15,15 +15,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -41,7 +41,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -59,7 +59,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -68,21 +68,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -91,11 +91,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -109,11 +109,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -127,11 +127,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -145,11 +145,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -163,11 +163,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -181,11 +181,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -199,11 +199,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -217,11 +217,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -235,11 +235,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -253,11 +253,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Copyright:33432' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Copyright id: '33432' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -271,7 +271,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -280,11 +280,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -298,11 +298,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -316,11 +316,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -334,11 +334,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -352,11 +352,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensitivityType:34864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensitivityType id: '34864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -370,11 +370,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -388,11 +388,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -406,11 +406,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -424,11 +424,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -442,11 +442,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -460,11 +460,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -478,11 +478,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:BrightnessValue:37379' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BrightnessValue id: '37379' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -496,11 +496,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -514,11 +514,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -532,11 +532,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -550,11 +550,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -568,11 +568,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -586,11 +586,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -604,11 +604,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -622,11 +622,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -640,11 +640,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -658,11 +658,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -676,11 +676,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -694,11 +694,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -712,11 +712,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -730,11 +730,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -748,11 +748,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -766,11 +766,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -784,11 +784,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -802,11 +802,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -820,11 +820,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -838,11 +838,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -856,11 +856,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -874,11 +874,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -892,11 +892,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -910,11 +910,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectDistanceRange:41996' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectDistanceRange id: '41996' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -928,11 +928,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensInfo:42034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensInfo id: '42034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -946,11 +946,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensMake:42035' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensMake id: '42035' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -964,11 +964,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensModel:42036' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensModel id: '42036' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -982,11 +982,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensSerialNumber:42037' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensSerialNumber id: '42037' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1000,7 +1000,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -1009,11 +1009,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSVersionID id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1027,11 +1027,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitudeRef:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitudeRef id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1045,11 +1045,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitude:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitude id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1063,11 +1063,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitudeRef:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitudeRef id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1081,11 +1081,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitude:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitude id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1099,11 +1099,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitudeRef:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitudeRef id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1117,11 +1117,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitude:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitude id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1135,11 +1135,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSTimeStamp:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSTimeStamp id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1153,11 +1153,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSSpeedRef:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSSpeedRef id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1171,11 +1171,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSSpeed:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSSpeed id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1189,11 +1189,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSMapDatum:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSMapDatum id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1207,11 +1207,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSDateStamp:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSDateStamp id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1225,11 +1225,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrintIM:50341' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrintIM id: '50341' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1243,7 +1243,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -1252,11 +1252,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1270,11 +1270,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1288,11 +1288,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1306,11 +1306,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1324,11 +1324,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1358,7 +1358,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1376,7 +1376,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1394,7 +1394,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1412,7 +1412,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1430,7 +1430,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1448,7 +1448,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1466,7 +1466,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1484,7 +1484,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1502,7 +1502,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1528,7 +1528,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: fujifilm_x_a5.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 23108 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/konica-minolta-dimage-a2.jpg.dump.yml b/tests/media-dumps/image/camera/konica-minolta-dimage-a2.jpg.dump.yml index 3c4af2c29..c1cb8b1c8 100644 --- a/tests/media-dumps/image/camera/konica-minolta-dimage-a2.jpg.dump.yml +++ b/tests/media-dumps/image/camera/konica-minolta-dimage-a2.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,11 +231,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -249,11 +249,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Artist:315' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Artist id: '315' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -267,11 +267,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -285,11 +285,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Copyright:33432' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Copyright id: '33432' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -303,7 +303,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:BrightnessValue:37379' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BrightnessValue id: '37379' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectArea:37396' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectArea id: '37396' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,11 +636,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -654,11 +654,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -672,11 +672,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -690,7 +690,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -699,11 +699,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -717,11 +717,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -735,11 +735,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -753,11 +753,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -771,11 +771,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -789,11 +789,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -807,11 +807,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -825,11 +825,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -843,11 +843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:GainControl:41991' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GainControl id: '41991' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -861,11 +861,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -879,11 +879,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -897,11 +897,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -915,11 +915,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectDistanceRange:41996' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectDistanceRange id: '41996' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -933,7 +933,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -942,11 +942,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSVersionID id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -960,11 +960,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitudeRef:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitudeRef id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -978,11 +978,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitude:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitude id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -996,11 +996,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitudeRef:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitudeRef id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1014,11 +1014,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitude:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitude id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1032,11 +1032,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitudeRef:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitudeRef id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1050,11 +1050,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitude:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitude id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1068,11 +1068,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrintIM:50341' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrintIM id: '50341' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1086,7 +1086,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -1095,11 +1095,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1113,11 +1113,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1131,11 +1131,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1149,11 +1149,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1167,11 +1167,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1185,11 +1185,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1219,7 +1219,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP13:237' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP13 id: '237' @@ -1237,7 +1237,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1255,7 +1255,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1273,7 +1273,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1291,7 +1291,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1309,7 +1309,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1327,7 +1327,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1345,7 +1345,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1363,7 +1363,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1381,7 +1381,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1407,7 +1407,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: konica-minolta-dimage-a2.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 209855 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/leica-d-lux.jpg.dump.yml b/tests/media-dumps/image/camera/leica-d-lux.jpg.dump.yml index 7f3ec6870..130ace04b 100644 --- a/tests/media-dumps/image/camera/leica-d-lux.jpg.dump.yml +++ b/tests/media-dumps/image/camera/leica-d-lux.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -46,21 +46,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -69,11 +69,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,7 +231,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -240,11 +240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,7 +636,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -645,11 +645,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -663,11 +663,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -681,11 +681,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -699,11 +699,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -717,11 +717,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -735,11 +735,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CFAPattern:41730' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CFAPattern id: '41730' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -753,11 +753,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -771,11 +771,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -789,11 +789,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -807,11 +807,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -825,11 +825,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -843,11 +843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -861,11 +861,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:GainControl:41991' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GainControl id: '41991' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -879,11 +879,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -897,11 +897,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -915,11 +915,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -933,11 +933,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectDistanceRange:41996' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectDistanceRange id: '41996' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -951,11 +951,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrintIM:50341' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrintIM id: '50341' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -969,7 +969,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -978,11 +978,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -996,11 +996,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1014,11 +1014,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1032,11 +1032,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1050,11 +1050,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1084,7 +1084,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1102,7 +1102,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1120,7 +1120,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1138,7 +1138,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DRI:221' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DRI id: '221' @@ -1156,7 +1156,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1174,7 +1174,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1200,7 +1200,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: leica-d-lux.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 70095 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/nikon-coolscan-iv.jpg.dump.yml b/tests/media-dumps/image/camera/nikon-coolscan-iv.jpg.dump.yml index afe651528..b79199ac6 100644 --- a/tests/media-dumps/image/camera/nikon-coolscan-iv.jpg.dump.yml +++ b/tests/media-dumps/image/camera/nikon-coolscan-iv.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,7 +195,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -204,11 +204,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -222,11 +222,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -240,11 +240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,7 +330,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -338,7 +338,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP2:226' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP2 id: '226' @@ -356,7 +356,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -374,7 +374,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -392,7 +392,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -410,7 +410,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -428,7 +428,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -454,7 +454,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: nikon-coolscan-iv.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 69524 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/nikon-d50.JPG.dump.yml b/tests/media-dumps/image/camera/nikon-d50.JPG.dump.yml index 443d42b41..da20b077f 100644 --- a/tests/media-dumps/image/camera/nikon-d50.JPG.dump.yml +++ b/tests/media-dumps/image/camera/nikon-d50.JPG.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -46,21 +46,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -69,11 +69,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,7 +231,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -240,11 +240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTime:37520' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTime id: '37520' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,11 +636,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -654,7 +654,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -663,11 +663,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -681,11 +681,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -699,11 +699,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -717,11 +717,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -735,11 +735,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -753,11 +753,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CFAPattern:41730' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CFAPattern id: '41730' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -771,11 +771,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -789,11 +789,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -807,11 +807,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -825,11 +825,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -843,11 +843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -861,11 +861,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -879,11 +879,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:GainControl:41991' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GainControl id: '41991' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -897,11 +897,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -915,11 +915,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -933,11 +933,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -951,11 +951,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectDistanceRange:41996' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectDistanceRange id: '41996' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -969,7 +969,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -978,11 +978,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -996,11 +996,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1014,11 +1014,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1032,11 +1032,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1050,11 +1050,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1084,7 +1084,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1102,7 +1102,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1120,7 +1120,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1138,7 +1138,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1156,7 +1156,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1182,7 +1182,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: nikon-d50.JPG - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 1276372 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/nikon-e5000.jpg.dump.yml b/tests/media-dumps/image/camera/nikon-e5000.jpg.dump.yml index 2e61fce70..534d2836e 100644 --- a/tests/media-dumps/image/camera/nikon-e5000.jpg.dump.yml +++ b/tests/media-dumps/image/camera/nikon-e5000.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,11 +231,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -249,7 +249,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,11 +636,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -654,7 +654,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -662,7 +662,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -671,11 +671,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -689,11 +689,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -707,11 +707,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -725,11 +725,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -759,7 +759,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP13:237' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP13 id: '237' @@ -777,7 +777,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP14:238' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP14 id: '238' @@ -795,7 +795,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -813,7 +813,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -831,7 +831,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DRI:221' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DRI id: '221' @@ -849,7 +849,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -867,7 +867,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -885,7 +885,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -931,7 +931,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: nikon-e5000.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 317985 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/nikon-e950.jpg.dump.yml b/tests/media-dumps/image/camera/nikon-e950.jpg.dump.yml index 77e791f44..bd7ad726e 100644 --- a/tests/media-dumps/image/camera/nikon-e950.jpg.dump.yml +++ b/tests/media-dumps/image/camera/nikon-e950.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,11 +231,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -249,11 +249,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -267,7 +267,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,11 +636,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -654,7 +654,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -663,11 +663,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -681,11 +681,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -699,11 +699,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -717,11 +717,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -735,7 +735,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -744,11 +744,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -762,11 +762,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -780,11 +780,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -798,11 +798,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -832,7 +832,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP13:237' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP13 id: '237' @@ -850,7 +850,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP14:238' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP14 id: '238' @@ -868,7 +868,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -886,7 +886,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -904,7 +904,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DRI:221' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DRI id: '221' @@ -922,7 +922,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -940,7 +940,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -958,7 +958,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -984,7 +984,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: nikon-e950.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 351451 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/olympus-c5050z.jpg.dump.yml b/tests/media-dumps/image/camera/olympus-c5050z.jpg.dump.yml index ee92bed23..a6d42c9a3 100644 --- a/tests/media-dumps/image/camera/olympus-c5050z.jpg.dump.yml +++ b/tests/media-dumps/image/camera/olympus-c5050z.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -46,21 +46,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -69,11 +69,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,11 +231,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -249,7 +249,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,7 +636,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -645,11 +645,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -663,11 +663,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -681,11 +681,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -699,11 +699,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -717,11 +717,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -735,11 +735,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -753,11 +753,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -771,11 +771,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -789,11 +789,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -807,11 +807,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:GainControl:41991' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GainControl id: '41991' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -825,11 +825,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -843,11 +843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -861,11 +861,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -879,11 +879,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrintIM:50341' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrintIM id: '50341' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -897,7 +897,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -906,11 +906,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -924,11 +924,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -942,11 +942,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -960,11 +960,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -994,7 +994,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1012,7 +1012,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1030,7 +1030,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1048,7 +1048,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1066,7 +1066,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1092,7 +1092,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: olympus-c5050z.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 53704 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/olympus-c50z.jpg.dump.yml b/tests/media-dumps/image/camera/olympus-c50z.jpg.dump.yml index e058c66eb..17f0a189e 100644 --- a/tests/media-dumps/image/camera/olympus-c50z.jpg.dump.yml +++ b/tests/media-dumps/image/camera/olympus-c50z.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,11 +231,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -249,11 +249,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -267,7 +267,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,7 +636,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -645,11 +645,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -663,11 +663,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -681,11 +681,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -699,11 +699,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -717,11 +717,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -735,11 +735,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -753,11 +753,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -771,11 +771,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -789,11 +789,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:GainControl:41991' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GainControl id: '41991' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -807,11 +807,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -825,11 +825,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -843,11 +843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -861,11 +861,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrintIM:50341' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrintIM id: '50341' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -879,7 +879,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -888,11 +888,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -906,11 +906,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -924,11 +924,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -942,11 +942,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -976,7 +976,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -994,7 +994,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1012,7 +1012,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1030,7 +1030,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1048,7 +1048,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1066,7 +1066,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1084,7 +1084,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1102,7 +1102,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1120,7 +1120,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1146,7 +1146,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: olympus-c50z.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 60482 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/olympus-c765uz.jpg.dump.yml b/tests/media-dumps/image/camera/olympus-c765uz.jpg.dump.yml index 113dcf2c1..b4372625c 100644 --- a/tests/media-dumps/image/camera/olympus-c765uz.jpg.dump.yml +++ b/tests/media-dumps/image/camera/olympus-c765uz.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,11 +231,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -249,11 +249,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -267,7 +267,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,11 +636,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -654,7 +654,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -663,11 +663,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -681,11 +681,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -699,11 +699,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -717,11 +717,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -735,11 +735,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -753,11 +753,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -771,11 +771,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -789,11 +789,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DigitalZoomRatio:41988' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoomRatio id: '41988' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -807,11 +807,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -825,11 +825,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:GainControl:41991' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GainControl id: '41991' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -843,11 +843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -861,11 +861,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -879,11 +879,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -897,11 +897,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrintIM:50341' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrintIM id: '50341' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -915,7 +915,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -924,11 +924,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -942,11 +942,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -960,11 +960,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -978,11 +978,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1012,7 +1012,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1030,7 +1030,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1048,7 +1048,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1066,7 +1066,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1084,7 +1084,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1102,7 +1102,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1120,7 +1120,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1138,7 +1138,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1156,7 +1156,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1182,7 +1182,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: olympus-c765uz.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 60380 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/pentax-istDS.jpg.dump.yml b/tests/media-dumps/image/camera/pentax-istDS.jpg.dump.yml index c989f86d4..f05c4e33b 100644 --- a/tests/media-dumps/image/camera/pentax-istDS.jpg.dump.yml +++ b/tests/media-dumps/image/camera/pentax-istDS.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -46,14 +46,14 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: @@ -77,7 +77,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -86,11 +86,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -104,11 +104,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -122,11 +122,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -140,11 +140,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -158,11 +158,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -176,11 +176,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -194,11 +194,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -212,11 +212,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -230,11 +230,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:WhitePoint:318' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhitePoint id: '318' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -248,11 +248,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrimaryChromaticities:319' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrimaryChromaticities id: '319' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -266,11 +266,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrCoefficients:529' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrCoefficients id: '529' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -284,11 +284,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -302,7 +302,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -311,11 +311,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -329,11 +329,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -347,11 +347,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -365,11 +365,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -383,11 +383,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -401,11 +401,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -419,11 +419,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -437,11 +437,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -455,11 +455,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -473,11 +473,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -491,11 +491,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -509,11 +509,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -527,11 +527,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -545,11 +545,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -563,11 +563,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -581,11 +581,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -599,11 +599,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -617,7 +617,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -626,11 +626,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -644,11 +644,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -662,11 +662,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -680,11 +680,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -698,11 +698,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -716,11 +716,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -734,11 +734,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -752,11 +752,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -770,11 +770,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -788,11 +788,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -806,11 +806,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Contrast:41992' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '41992' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -824,11 +824,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Saturation:41993' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '41993' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -842,11 +842,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Sharpness:41994' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '41994' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -860,11 +860,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubjectDistanceRange:41996' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubjectDistanceRange id: '41996' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -878,11 +878,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Gamma:42240' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Gamma id: '42240' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -896,11 +896,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrintIM:50341' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrintIM id: '50341' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -914,7 +914,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -923,11 +923,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -941,11 +941,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -959,11 +959,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -977,11 +977,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1011,7 +1011,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1029,7 +1029,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DRI:221' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DRI id: '221' @@ -1047,7 +1047,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1065,7 +1065,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1083,7 +1083,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1101,7 +1101,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1127,7 +1127,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: pentax-istDS.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 173014 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/sony-dsc-v1.jpg.dump.yml b/tests/media-dumps/image/camera/sony-dsc-v1.jpg.dump.yml index d84c02252..9d91ceae2 100644 --- a/tests/media-dumps/image/camera/sony-dsc-v1.jpg.dump.yml +++ b/tests/media-dumps/image/camera/sony-dsc-v1.jpg.dump.yml @@ -33,15 +33,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -59,7 +59,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -68,21 +68,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -91,11 +91,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -109,11 +109,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -127,11 +127,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -145,11 +145,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -163,11 +163,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -181,11 +181,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -199,11 +199,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -217,11 +217,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -235,11 +235,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -253,7 +253,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -262,11 +262,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -280,11 +280,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -298,11 +298,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -316,11 +316,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -334,11 +334,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -352,11 +352,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -370,11 +370,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -388,11 +388,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -406,11 +406,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -424,11 +424,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -442,11 +442,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -460,11 +460,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -478,11 +478,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LightSource:37384' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LightSource id: '37384' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -496,11 +496,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -514,11 +514,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -532,11 +532,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -550,11 +550,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -568,11 +568,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -586,11 +586,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -604,11 +604,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -622,7 +622,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -631,11 +631,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -649,11 +649,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -667,11 +667,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -685,11 +685,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneType:41729' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneType id: '41729' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -703,11 +703,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -721,11 +721,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -739,11 +739,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -757,11 +757,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -775,11 +775,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:PrintIM:50341' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrintIM id: '50341' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -793,7 +793,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -802,11 +802,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -820,11 +820,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -838,11 +838,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -856,11 +856,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -874,11 +874,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -892,11 +892,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -910,11 +910,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -928,11 +928,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -962,7 +962,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -980,7 +980,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -998,7 +998,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1016,7 +1016,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1034,7 +1034,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1060,7 +1060,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: sony-dsc-v1.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 60824 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/exiftool/Canon.jpg.dump.yml b/tests/media-dumps/image/exiftool/Canon.jpg.dump.yml index 8780169d0..55e26faff 100644 --- a/tests/media-dumps/image/exiftool/Canon.jpg.dump.yml +++ b/tests/media-dumps/image/exiftool/Canon.jpg.dump.yml @@ -35,15 +35,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -61,7 +61,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -70,21 +70,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -93,11 +93,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -111,11 +111,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -129,11 +129,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -147,11 +147,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -165,11 +165,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -183,11 +183,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -201,11 +201,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -219,11 +219,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -237,7 +237,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -246,11 +246,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -264,11 +264,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -282,11 +282,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -300,11 +300,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -318,11 +318,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -336,11 +336,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -354,11 +354,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -372,11 +372,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CompressedBitsPerPixel:37122' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CompressedBitsPerPixel id: '37122' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -390,11 +390,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -408,11 +408,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -426,11 +426,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -444,11 +444,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -462,11 +462,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -480,11 +480,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -498,11 +498,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -516,7 +516,7 @@ elements: - node: makerNote path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: Canon id: '37500' @@ -551,11 +551,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MacroMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -569,11 +569,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SelfTimer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -587,11 +587,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Quality:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Quality id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -605,11 +605,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonFlashMode:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashMode id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -623,11 +623,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ContinuousDrive:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousDrive id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -641,11 +641,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusMode:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusMode id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -659,11 +659,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:RecordMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecordMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -677,11 +677,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonImageSize:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageSize id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -695,11 +695,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:EasyMode:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: EasyMode id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -713,11 +713,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DigitalZoom:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoom id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -731,11 +731,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Contrast:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -749,11 +749,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Saturation:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -767,11 +767,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Sharpness:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -785,11 +785,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CameraISO:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraISO id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -803,11 +803,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MeteringMode:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -821,11 +821,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusRange:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusRange id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -839,11 +839,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AFPoint:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPoint id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -857,11 +857,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonExposureMode:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonExposureMode id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -875,11 +875,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:LensType:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -893,11 +893,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxFocalLength:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -911,11 +911,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinFocalLength:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -929,11 +929,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocalUnits:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalUnits id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -947,11 +947,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxAperture:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxAperture id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -965,11 +965,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinAperture:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinAperture id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -983,11 +983,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashActivity:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashActivity id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1001,11 +1001,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashBits id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1019,11 +1019,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusContinuous:32' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusContinuous id: '32' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1037,11 +1037,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AESetting:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AESetting id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1055,11 +1055,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ImageStabilization:34' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageStabilization id: '34' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1073,11 +1073,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DisplayAperture:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DisplayAperture id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1091,11 +1091,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomSourceWidth:36' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomSourceWidth id: '36' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1109,11 +1109,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomTargetWidth:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomTargetWidth id: '37' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1127,11 +1127,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SpotMeteringMode:39' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpotMeteringMode id: '39' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1145,11 +1145,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:PhotoEffect:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotoEffect id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1163,11 +1163,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ManualFlashOutput:41' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualFlashOutput id: '41' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1181,11 +1181,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ColorTone:42' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTone id: '42' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1208,11 +1208,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalType:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalType id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1226,11 +1226,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalLength:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1244,11 +1244,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneXSize:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXSize id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1262,11 +1262,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneYSize:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYSize id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1280,11 +1280,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFlashInfo:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashInfo id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1324,11 +1324,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoISO:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoISO id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1342,11 +1342,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BaseISO:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BaseISO id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1360,11 +1360,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1378,11 +1378,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetAperture:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetAperture id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1396,11 +1396,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetExposureTime:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetExposureTime id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1414,11 +1414,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureCompensation:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1432,11 +1432,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:WhiteBalance:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1450,11 +1450,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SlowShutter:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SlowShutter id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1468,11 +1468,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SequenceNumber:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SequenceNumber id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1486,11 +1486,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:OpticalZoomCode:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OpticalZoomCode id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1504,11 +1504,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraTemperature:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1522,11 +1522,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashGuideNumber:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashGuideNumber id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1540,11 +1540,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AFPointsInFocus:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1558,11 +1558,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashExposureComp:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureComp id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1576,11 +1576,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoExposureBracketing:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoExposureBracketing id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1594,11 +1594,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AEBBracketValue:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBBracketValue id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1612,11 +1612,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ControlMode:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ControlMode id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1630,11 +1630,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceUpper:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1648,11 +1648,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceLower:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1666,11 +1666,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FNumber:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1684,11 +1684,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureTime:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1702,11 +1702,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV2:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV2 id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1720,11 +1720,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BulbDuration:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BulbDuration id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1738,11 +1738,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraType:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraType id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1756,11 +1756,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoRotate:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoRotate id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1774,11 +1774,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:NDFilter:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NDFilter id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1792,11 +1792,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SelfTimer2:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer2 id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1836,11 +1836,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FileNumber:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileNumber id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1854,11 +1854,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketMode:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketMode id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1872,11 +1872,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketValue:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketValue id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1890,11 +1890,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketShotNumber:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketShotNumber id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1908,11 +1908,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgQuality:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgQuality id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1926,11 +1926,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgSize:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgSize id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1944,11 +1944,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:LongExposureNoiseReduction2:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LongExposureNoiseReduction2 id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1962,11 +1962,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonImageType:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageType id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1980,11 +1980,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFirmwareVersion:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFirmwareVersion id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1998,11 +1998,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:SerialNumber:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SerialNumber id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2016,11 +2016,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:SerialNumberFormat:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SerialNumberFormat id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2034,11 +2034,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:FileNumber:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileNumber id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2052,11 +2052,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:OwnerName:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OwnerName id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2070,11 +2070,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonModelID:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonModelID id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2088,11 +2088,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFileLength:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFileLength id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2132,11 +2132,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:LensSerialNumber:363' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensSerialNumber id: '363' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2150,10 +2150,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '0' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2167,10 +2167,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:192' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '192' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2184,10 +2184,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:193' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '193' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2228,11 +2228,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:MeasuredRGGB:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredRGGB id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2246,10 +2246,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:168' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '168' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2289,11 +2289,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBLevelsAuto:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsAuto id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2307,11 +2307,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBLevelsDaylight:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsDaylight id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2325,11 +2325,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBLevelsShade:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsShade id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2343,11 +2343,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBLevelsCloudy:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsCloudy id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2361,11 +2361,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBLevelsTungsten:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsTungsten id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2379,11 +2379,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBLevelsFluorescent:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsFluorescent id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2397,11 +2397,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBLevelsFlash:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsFlash id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2415,11 +2415,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBLevelsCustom:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsCustom id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2433,11 +2433,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBLevelsKelvin:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBLevelsKelvin id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2451,11 +2451,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorBalance:169/tag:WB_RGGBBlackLevels:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WB_RGGBBlackLevels id: '37' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2469,11 +2469,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ColorTemperature:174' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTemperature id: '174' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2487,11 +2487,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ColorSpace:180' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '180' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2514,11 +2514,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:NumAFPoints:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NumAFPoints id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2532,11 +2532,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:ValidAFPoints:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ValidAFPoints id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2550,11 +2550,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:CanonImageWidth:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageWidth id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2568,11 +2568,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:CanonImageHeight:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageHeight id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2586,11 +2586,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFImageWidth:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageWidth id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2604,11 +2604,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFImageHeight:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageHeight id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2622,11 +2622,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaWidth:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaWidth id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2640,11 +2640,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaHeight:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaHeight id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2658,11 +2658,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaXPositions:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaXPositions id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2676,11 +2676,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFAreaYPositions:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaYPositions id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2694,11 +2694,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:AFPointsInFocus:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2712,11 +2712,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo:18/tag:PrimaryAFPoint:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrimaryAFPoint id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2730,11 +2730,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ThumbnailImageValidArea:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ThumbnailImageValidArea id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2748,10 +2748,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:181' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '181' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2765,10 +2765,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '0' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2782,11 +2782,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2800,11 +2800,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2818,11 +2818,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2836,11 +2836,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2854,11 +2854,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2872,7 +2872,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -2881,11 +2881,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2899,11 +2899,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2917,11 +2917,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:RelatedImageWidth:4097' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RelatedImageWidth id: '4097' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2935,11 +2935,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:RelatedImageHeight:4098' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RelatedImageHeight id: '4098' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2953,11 +2953,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2971,11 +2971,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2989,11 +2989,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3007,11 +3007,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensingMethod:41495' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensingMethod id: '41495' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3025,11 +3025,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FileSource:41728' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileSource id: '41728' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3043,11 +3043,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3061,11 +3061,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3079,11 +3079,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3097,11 +3097,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3115,7 +3115,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -3133,7 +3133,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -3151,7 +3151,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -3169,7 +3169,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -3187,7 +3187,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -3206,59 +3206,59 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1' - message: 'Could not access value for item ''SRAWQuality'' in ''CanonCameraSettings'', overflow' + message: "Could not access value for item 'SRAWQuality' in 'CanonCameraSettings', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4' - message: 'Could not access value for item ''FlashOutput'' in ''CanonShotInfo'', overflow' + message: "Could not access value for item 'FlashOutput' in 'CanonShotInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''WBBracketMode'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'WBBracketMode' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''WBBracketValueAB'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'WBBracketValueAB' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''WBBracketValueGM'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'WBBracketValueGM' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''FilterEffect'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'FilterEffect' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''ToningEffect'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'ToningEffect' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''MacroMagnification'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'MacroMagnification' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''LiveViewShooting'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'LiveViewShooting' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''FocusDistanceUpper'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'FocusDistanceUpper' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''FocusDistanceLower'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'FocusDistanceLower' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' - message: 'Could not access value for item ''FlashExposureLock'' in ''CanonFileInfo'', overflow' + message: "Could not access value for item 'FlashExposureLock' in 'CanonFileInfo', overflow" NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - message: 'Unknown item 0/0x0 in ''Canon''' + message: "Unknown item 0/0x0 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:192' - message: 'Unknown item 192/0xC0 in ''Canon''' + message: "Unknown item 192/0xC0 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:193' - message: 'Unknown item 193/0xC1 in ''Canon''' + message: "Unknown item 193/0xC1 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:168' - message: 'Unknown item 168/0xA8 in ''Canon''' + message: "Unknown item 168/0xA8 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:181' - message: 'Unknown item 181/0xB5 in ''Canon''' + message: "Unknown item 181/0xB5 in 'Canon'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' - message: 'Unknown item 0/0x0 in ''Canon''' + message: "Unknown item 0/0x0 in 'Canon'" gdInfo: 0: 8 1: 8 @@ -3269,7 +3269,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: Canon.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 2697 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml b/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml index d545b9200..65681cef5 100644 --- a/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml +++ b/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml @@ -45,15 +45,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -71,7 +71,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -80,21 +80,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -103,11 +103,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -121,11 +121,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -139,11 +139,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -157,11 +157,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -175,11 +175,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -193,11 +193,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -211,11 +211,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -229,11 +229,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -247,7 +247,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -256,11 +256,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -274,11 +274,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -292,11 +292,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -310,11 +310,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -328,11 +328,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -346,11 +346,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -364,11 +364,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -382,11 +382,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ComponentsConfiguration:37121' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ComponentsConfiguration id: '37121' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -400,11 +400,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -418,11 +418,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -436,11 +436,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -454,11 +454,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -472,11 +472,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -490,11 +490,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -508,7 +508,7 @@ elements: - node: makerNote path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: Canon id: '37500' @@ -543,11 +543,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MacroMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -561,11 +561,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SelfTimer:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -579,11 +579,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Quality:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Quality id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -597,11 +597,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonFlashMode:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashMode id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -615,11 +615,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ContinuousDrive:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousDrive id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -633,11 +633,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusMode:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusMode id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -651,11 +651,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:RecordMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecordMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -669,11 +669,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonImageSize:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageSize id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -687,11 +687,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:EasyMode:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: EasyMode id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -705,11 +705,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DigitalZoom:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalZoom id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -723,11 +723,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Contrast:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Contrast id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -741,11 +741,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Saturation:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Saturation id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -759,11 +759,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:Sharpness:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -777,11 +777,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CameraISO:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraISO id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -795,11 +795,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MeteringMode:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -813,11 +813,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusRange:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusRange id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -831,11 +831,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AFPoint:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPoint id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -849,11 +849,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:CanonExposureMode:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonExposureMode id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -867,11 +867,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:LensType:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -885,11 +885,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxFocalLength:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -903,11 +903,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinFocalLength:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -921,11 +921,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocalUnits:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalUnits id: '25' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -939,11 +939,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MaxAperture:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxAperture id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -957,11 +957,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:MinAperture:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinAperture id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -975,11 +975,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashActivity:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashActivity id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -993,11 +993,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashBits id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1011,11 +1011,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusContinuous:32' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusContinuous id: '32' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1029,11 +1029,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:AESetting:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AESetting id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1047,11 +1047,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ImageStabilization:34' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageStabilization id: '34' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1065,11 +1065,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:DisplayAperture:35' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DisplayAperture id: '35' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1083,11 +1083,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomSourceWidth:36' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomSourceWidth id: '36' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1101,11 +1101,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ZoomTargetWidth:37' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ZoomTargetWidth id: '37' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1119,11 +1119,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SpotMeteringMode:39' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpotMeteringMode id: '39' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1137,11 +1137,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:PhotoEffect:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotoEffect id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1155,11 +1155,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ManualFlashOutput:41' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualFlashOutput id: '41' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1173,11 +1173,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:ColorTone:42' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTone id: '42' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1191,11 +1191,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:SRAWQuality:46' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SRAWQuality id: '46' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1218,11 +1218,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalType:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalType id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1236,11 +1236,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalLength:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1254,11 +1254,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneXSize:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXSize id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1272,11 +1272,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonFocalLength:2/tag:FocalPlaneYSize:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYSize id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1290,11 +1290,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFlashInfo:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFlashInfo id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1334,11 +1334,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoISO:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoISO id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1352,11 +1352,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BaseISO:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BaseISO id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1370,11 +1370,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1388,11 +1388,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetAperture:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetAperture id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1406,11 +1406,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:TargetExposureTime:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TargetExposureTime id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1424,11 +1424,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureCompensation:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1442,11 +1442,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:WhiteBalance:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1460,11 +1460,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SlowShutter:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SlowShutter id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1478,11 +1478,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SequenceNumber:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SequenceNumber id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1496,11 +1496,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:OpticalZoomCode:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OpticalZoomCode id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1514,11 +1514,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraTemperature:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1532,11 +1532,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashGuideNumber:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashGuideNumber id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1550,11 +1550,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AFPointsInFocus:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1568,11 +1568,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashExposureComp:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashExposureComp id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1586,11 +1586,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoExposureBracketing:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoExposureBracketing id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1604,11 +1604,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AEBBracketValue:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBBracketValue id: '17' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1622,11 +1622,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ControlMode:18' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ControlMode id: '18' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1640,11 +1640,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceUpper:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1658,11 +1658,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FocusDistanceLower:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1676,11 +1676,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FNumber:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1694,11 +1694,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:ExposureTime:22' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '22' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1712,11 +1712,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:MeasuredEV2:23' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredEV2 id: '23' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1730,11 +1730,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:BulbDuration:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BulbDuration id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1748,11 +1748,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:CameraType:26' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraType id: '26' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1766,11 +1766,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:AutoRotate:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AutoRotate id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1784,11 +1784,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:NDFilter:28' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NDFilter id: '28' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1802,11 +1802,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:SelfTimer2:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelfTimer2 id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1820,11 +1820,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonShotInfo:4/tag:FlashOutput:33' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashOutput id: '33' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1838,11 +1838,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonImageType:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageType id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1856,11 +1856,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonFirmwareVersion:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonFirmwareVersion id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1874,11 +1874,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:OwnerName:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OwnerName id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1892,11 +1892,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:SerialNumber:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SerialNumber id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1936,11 +1936,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FNumber:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1954,11 +1954,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ExposureTime:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1972,11 +1972,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ISO:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1990,11 +1990,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:CameraTemperature:24' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraTemperature id: '24' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2008,11 +2008,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:MacroMagnification:27' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMagnification id: '27' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2026,11 +2026,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FocalLength:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2044,11 +2044,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:CameraOrientation:48' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CameraOrientation id: '48' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2062,11 +2062,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FocusDistanceUpper:67' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '67' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2080,11 +2080,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FocusDistanceLower:69' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '69' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2098,11 +2098,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:WhiteBalance:94' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '94' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2116,11 +2116,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ColorTemperature:98' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTemperature id: '98' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2134,11 +2134,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:PictureStyle:134' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyle id: '134' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2152,11 +2152,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:LensType:273' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensType id: '273' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2170,11 +2170,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:MinFocalLength:275' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MinFocalLength id: '275' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2188,11 +2188,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:MaxFocalLength:277' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxFocalLength id: '277' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2206,11 +2206,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FirmwareVersion:310' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FirmwareVersion id: '310' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2224,11 +2224,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:FileIndex:370' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileIndex id: '370' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2242,11 +2242,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:ShutterCount:374' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterCount id: '374' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2260,11 +2260,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:DirectoryIndex:382' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DirectoryIndex id: '382' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2278,11 +2278,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:TimeStamp1:1114' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TimeStamp1 id: '1114' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2296,11 +2296,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13/tag:TimeStamp:1118' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TimeStamp id: '1118' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2314,11 +2314,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CanonModelID:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonModelID id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2332,11 +2332,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ThumbnailImageValidArea:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ThumbnailImageValidArea id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2350,11 +2350,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:SerialNumberFormat:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SerialNumberFormat id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2368,10 +2368,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '25' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2412,11 +2412,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2430,11 +2430,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:NumAFPoints:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: NumAFPoints id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2448,11 +2448,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:ValidAFPoints:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ValidAFPoints id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2466,11 +2466,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:CanonImageWidth:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageWidth id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2484,11 +2484,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:CanonImageHeight:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CanonImageHeight id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2502,11 +2502,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFImageWidth:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageWidth id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2520,11 +2520,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFImageHeight:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFImageHeight id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2538,11 +2538,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaWidths:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaWidths id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2556,11 +2556,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaHeights:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaHeights id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2574,11 +2574,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaXPositions:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaXPositions id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2592,11 +2592,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFAreaYPositions:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAreaYPositions id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2610,11 +2610,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFPointsInFocus:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsInFocus id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2628,11 +2628,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:AFPointsSelected:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointsSelected id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2646,11 +2646,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:PrimaryAFPoint:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PrimaryAFPoint id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2664,10 +2664,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '15' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2681,10 +2681,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2698,10 +2698,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAFInfo2:38/tag:17' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '17' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -2715,11 +2715,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ImageUniqueID:40' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageUniqueID id: '40' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2733,11 +2733,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:OriginalDecisionDataOffset:131' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OriginalDecisionDataOffset id: '131' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2777,11 +2777,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FileNumber:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FileNumber id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2795,11 +2795,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketMode:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketMode id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2813,11 +2813,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketValue:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketValue id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2831,11 +2831,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:BracketShotNumber:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BracketShotNumber id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2849,11 +2849,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgQuality:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgQuality id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2867,11 +2867,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:RawJpgSize:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawJpgSize id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2885,11 +2885,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:LongExposureNoiseReduction2:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LongExposureNoiseReduction2 id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2903,11 +2903,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketMode:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketMode id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2921,11 +2921,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketValueAB:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketValueAB id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2939,11 +2939,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:WBBracketValueGM:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBBracketValueGM id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2957,11 +2957,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FilterEffect:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FilterEffect id: '14' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2975,11 +2975,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:ToningEffect:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToningEffect id: '15' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -2993,11 +2993,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:MacroMagnification:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MacroMagnification id: '16' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3011,11 +3011,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:LiveViewShooting:19' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LiveViewShooting id: '19' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3029,11 +3029,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FocusDistanceUpper:20' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceUpper id: '20' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3047,11 +3047,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FocusDistanceLower:21' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusDistanceLower id: '21' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3065,11 +3065,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:LensModel:149' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensModel id: '149' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3083,11 +3083,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:InternalSerialNumber:150' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InternalSerialNumber id: '150' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3101,11 +3101,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:DustRemovalData:151' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DustRemovalData id: '151' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3128,11 +3128,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropLeftMargin:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropLeftMargin id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3146,11 +3146,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropRightMargin:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropRightMargin id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3164,11 +3164,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropTopMargin:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropTopMargin id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3182,11 +3182,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCropInfo:152/tag:CropBottomMargin:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CropBottomMargin id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3218,11 +3218,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ExposureLevelIncrements:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureLevelIncrements id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3236,11 +3236,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ISOSpeedIncrements:258' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISOSpeedIncrements id: '258' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3254,11 +3254,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ISOSpeedRange:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISOSpeedRange id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3272,11 +3272,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:AEBAutoCancel:260' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBAutoCancel id: '260' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3290,11 +3290,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:AEBSequence:261' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBSequence id: '261' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3308,11 +3308,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:AEBShotCount:262' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AEBShotCount id: '262' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3326,11 +3326,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:SpotMeterLinkToAFPoint:263' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SpotMeterLinkToAFPoint id: '263' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3344,11 +3344,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:SafetyShift:264' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SafetyShift id: '264' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3362,11 +3362,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:UsableShootingModes:265' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UsableShootingModes id: '265' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3380,11 +3380,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:UsableMeteringModes:266' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UsableMeteringModes id: '266' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3398,11 +3398,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ExposureModeInManual:267' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureModeInManual id: '267' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3416,11 +3416,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ShutterSpeedRange:268' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedRange id: '268' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3434,11 +3434,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ApertureRange:269' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureRange id: '269' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3452,11 +3452,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:ApplyShootingMeteringMode:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApplyShootingMeteringMode id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3470,11 +3470,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:FlashSyncSpeedAv:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashSyncSpeedAv id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3497,11 +3497,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:LongExposureNoiseReduction:513' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LongExposureNoiseReduction id: '513' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3515,11 +3515,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:HighISONoiseReduction:514' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: HighISONoiseReduction id: '514' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3533,11 +3533,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:HighlightTonePriority:515' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: HighlightTonePriority id: '515' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3551,11 +3551,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:ETTLII:772' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ETTLII id: '772' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3569,11 +3569,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:ShutterCurtainSync:773' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterCurtainSync id: '773' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3587,11 +3587,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:FlashFiring:774' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashFiring id: '774' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3605,11 +3605,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:ViewInfoDuringExposure:1031' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ViewInfoDuringExposure id: '1031' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3623,11 +3623,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:LCDIlluminationDuringBulb:1032' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LCDIlluminationDuringBulb id: '1032' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3641,11 +3641,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:ImageFlashExposureDisplay:2/tag:InfoButtonWhenShooting:1033' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InfoButtonWhenShooting id: '1033' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3668,11 +3668,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:USMLensElectronicMF:1281' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: USMLensElectronicMF id: '1281' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3686,11 +3686,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AIServoTrackingSensitivity:1282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AIServoTrackingSensitivity id: '1282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3704,11 +3704,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AIServoImagePriority:1283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AIServoImagePriority id: '1283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3722,11 +3722,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AIServoTrackingMethod:1284' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AIServoTrackingMethod id: '1284' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3740,11 +3740,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:LensDriveNoAF:1285' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensDriveNoAF id: '1285' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3758,11 +3758,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:LensAFStopButton:1286' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensAFStopButton id: '1286' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3776,11 +3776,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFMicroadjustment:1287' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroadjustment id: '1287' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3794,11 +3794,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFPointAreaExpansion:1288' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointAreaExpansion id: '1288' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3812,11 +3812,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:SelectableAFPoint:1289' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SelectableAFPoint id: '1289' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3830,11 +3830,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:SwitchToRegisteredAFPoint:1290' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SwitchToRegisteredAFPoint id: '1290' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3848,11 +3848,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFPointAutoSelection:1291' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointAutoSelection id: '1291' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3866,11 +3866,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFPointDisplayDuringFocus:1292' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointDisplayDuringFocus id: '1292' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3884,11 +3884,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFPointBrightness:1293' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFPointBrightness id: '1293' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3902,11 +3902,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFAssistBeam:1294' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFAssistBeam id: '1294' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3920,11 +3920,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:MirrorLockup:1551' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MirrorLockup id: '1551' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3938,11 +3938,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:ContinuousShootingSpeed:1552' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousShootingSpeed id: '1552' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3956,11 +3956,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:ContinuousShotLimit:1553' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ContinuousShotLimit id: '1553' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -3983,11 +3983,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:Shutter-AELock:1793' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Shutter-AELock id: '1793' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4001,11 +4001,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:AFOnAELockButtonSwitch:1794' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFOnAELockButtonSwitch id: '1794' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4019,11 +4019,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:QuickControlDialInMeter:1795' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: QuickControlDialInMeter id: '1795' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4037,11 +4037,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:SetButtonWhenShooting:1796' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SetButtonWhenShooting id: '1796' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4055,11 +4055,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:ManualTv:1797' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ManualTv id: '1797' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4073,11 +4073,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:DialDirectionTvAv:1798' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DialDirectionTvAv id: '1798' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4091,11 +4091,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:AvSettingWithoutLens:1799' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AvSettingWithoutLens id: '1799' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4109,11 +4109,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:WBMediaImageSizeSetting:1800' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBMediaImageSizeSetting id: '1800' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4127,11 +4127,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:LockMicrophoneButton:1801' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LockMicrophoneButton id: '1801' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4145,11 +4145,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:ButtonFunctionControlOff:1802' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ButtonFunctionControlOff id: '1802' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4163,11 +4163,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:FocusingScreen:2059' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocusingScreen id: '2059' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4181,11 +4181,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:TimerLength:2060' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: TimerLength id: '2060' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4199,11 +4199,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:ShortReleaseTimeLag:2061' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShortReleaseTimeLag id: '2061' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4217,11 +4217,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:AddAspectRatioInfo:2062' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AddAspectRatioInfo id: '2062' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4235,11 +4235,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:AddOriginalDecisionData:2063' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AddOriginalDecisionData id: '2063' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4253,11 +4253,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:LiveViewExposureSimulation:2064' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LiveViewExposureSimulation id: '2064' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4280,11 +4280,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:AspectRatio:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AspectRatio id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4298,11 +4298,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageWidth:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageWidth id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4316,11 +4316,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageHeight:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageHeight id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4334,11 +4334,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageLeft:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageLeft id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4352,11 +4352,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonAspectInfo:154/tag:CroppedImageTop:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CroppedImageTop id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4397,11 +4397,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:ToneCurve:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ToneCurve id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4415,11 +4415,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:Sharpness:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Sharpness id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4433,11 +4433,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SharpnessFrequency:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SharpnessFrequency id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4451,11 +4451,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SensorRedLevel:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorRedLevel id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4469,11 +4469,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:SensorBlueLevel:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorBlueLevel id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4487,11 +4487,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalanceRed:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalanceRed id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4505,11 +4505,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalanceBlue:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalanceBlue id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4523,11 +4523,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WhiteBalance:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4541,11 +4541,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:ColorTemperature:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorTemperature id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4559,11 +4559,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:PictureStyle:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyle id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4577,11 +4577,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:DigitalGain:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DigitalGain id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4595,11 +4595,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WBShiftAB:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBShiftAB id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4613,11 +4613,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonProcessing:160/tag:WBShiftGM:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WBShiftGM id: '13' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4658,11 +4658,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:MeasuredRGGB:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeasuredRGGB id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4676,10 +4676,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonMeasuredColor:170/tag:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '2' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4693,11 +4693,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:ColorSpace:180' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '180' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4711,11 +4711,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:VRDOffset:208' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: VRDOffset id: '208' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4756,11 +4756,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorWidth:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorWidth id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4774,11 +4774,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorHeight:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorHeight id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4792,10 +4792,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '3' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4809,10 +4809,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '4' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4826,11 +4826,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorLeftBorder:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorLeftBorder id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4844,11 +4844,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorTopBorder:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorTopBorder id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4862,11 +4862,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorRightBorder:7' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorRightBorder id: '7' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4880,11 +4880,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:SensorBottomBorder:8' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensorBottomBorder id: '8' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4898,11 +4898,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskLeftBorder:9' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskLeftBorder id: '9' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4916,11 +4916,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskTopBorder:10' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskTopBorder id: '10' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4934,11 +4934,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskRightBorder:11' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskRightBorder id: '11' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4952,11 +4952,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:BlackMaskBottomBorder:12' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BlackMaskBottomBorder id: '12' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -4970,10 +4970,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:13' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '13' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -4987,10 +4987,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:14' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '14' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5004,10 +5004,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:15' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '15' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5021,10 +5021,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonSensorInfo:224/tag:16' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5064,11 +5064,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:ColorDataVersion:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorDataVersion id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5082,11 +5082,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:AverageBlackLevel:231' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AverageBlackLevel id: '231' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5100,11 +5100,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:RawMeasuredRGGB:640' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RawMeasuredRGGB id: '640' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5118,11 +5118,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:PictureStyleUserDef:16392' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStyleUserDef id: '16392' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5136,11 +5136,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:PictureStylePC:16393' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PictureStylePC id: '16393' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5154,11 +5154,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:CustomPictureStyleFileName:16400' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomPictureStyleFileName id: '16400' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5172,10 +5172,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16401' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16401' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5189,10 +5189,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16402' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16402' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5250,11 +5250,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAFMicroAdj:16403/tag:AFMicroAdjMode:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroAdjMode id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5268,11 +5268,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonAFMicroAdj:16403/tag:AFMicroAdjValue:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: AFMicroAdjValue id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5286,10 +5286,10 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:16404' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '16404' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -5303,11 +5303,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5321,11 +5321,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTime:37520' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTime id: '37520' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5339,11 +5339,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5357,11 +5357,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5375,11 +5375,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5393,11 +5393,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5411,11 +5411,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5429,11 +5429,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5447,7 +5447,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: InteropIFD id: '40965' @@ -5456,11 +5456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropIndex:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropIndex id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5474,11 +5474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/ifd:InteropIFD:40965/tag:InteropVersion:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: InteropVersion id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5492,11 +5492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5510,11 +5510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5528,11 +5528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5546,11 +5546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5564,11 +5564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5582,11 +5582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5600,11 +5600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5618,7 +5618,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -5627,11 +5627,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSVersionID id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5645,7 +5645,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -5654,11 +5654,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5672,11 +5672,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5690,11 +5690,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5708,11 +5708,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -5726,7 +5726,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -5744,7 +5744,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -5762,7 +5762,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -5780,7 +5780,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -5798,7 +5798,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -5899,7 +5899,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: Canon1DmkIII.jpg - FileDateTime: 1690031131 + FileDateTime: 1639835048 FileSize: 8337 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/gh-16.jpg.dump.yml b/tests/media-dumps/image/gh-16.jpg.dump.yml index 2a91c7f02..f9e247934 100644 --- a/tests/media-dumps/image/gh-16.jpg.dump.yml +++ b/tests/media-dumps/image/gh-16.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XPSubject:40095' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XPSubject id: '40095' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,7 +105,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:COM:254' - class: FileEye\MediaProbe\Block\JpegSegmentCom + class: FileEye\MediaProbe\Block\Jpeg\SegmentCom valid: true name: COM id: '254' @@ -123,7 +123,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -141,7 +141,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -159,7 +159,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -177,7 +177,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -195,7 +195,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -213,7 +213,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -231,7 +231,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -249,7 +249,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -267,7 +267,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -293,7 +293,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: gh-16.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 119734 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/gh-21.jpg.dump.yml b/tests/media-dumps/image/gh-21.jpg.dump.yml index b4c362cba..cd5ba24cf 100644 --- a/tests/media-dumps/image/gh-21.jpg.dump.yml +++ b/tests/media-dumps/image/gh-21.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XPSubject:40095' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XPSubject id: '40095' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,7 +105,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:COM:254' - class: FileEye\MediaProbe\Block\JpegSegmentCom + class: FileEye\MediaProbe\Block\Jpeg\SegmentCom valid: true name: COM id: '254' @@ -123,7 +123,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -141,7 +141,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -159,7 +159,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -177,7 +177,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -195,7 +195,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -213,7 +213,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -231,7 +231,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -249,7 +249,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -267,7 +267,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -293,7 +293,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: gh-21.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 119734 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/gh-77.jpg.dump.yml b/tests/media-dumps/image/gh-77.jpg.dump.yml index 4e43a5d13..8180d88c8 100644 --- a/tests/media-dumps/image/gh-77.jpg.dump.yml +++ b/tests/media-dumps/image/gh-77.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP13:237' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP13 id: '237' @@ -73,7 +73,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -82,21 +82,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ImageDescription:270' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: ImageDescription id: '270' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,11 +231,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -249,11 +249,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Artist:315' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: Artist id: '315' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -267,11 +267,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:Copyright:33432' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: Copyright id: '33432' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -285,7 +285,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,11 +330,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -348,11 +348,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -366,11 +366,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SensitivityType:34864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SensitivityType id: '34864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -384,11 +384,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:RecommendedExposureIndex:34866' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RecommendedExposureIndex id: '34866' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -402,11 +402,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -420,11 +420,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -438,11 +438,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -456,11 +456,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -474,11 +474,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -492,11 +492,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -510,11 +510,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -528,11 +528,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -546,11 +546,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -564,11 +564,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -582,11 +582,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -600,11 +600,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -618,11 +618,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneXResolution:41486' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneXResolution id: '41486' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -636,11 +636,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneYResolution:41487' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneYResolution id: '41487' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -654,11 +654,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalPlaneResolutionUnit:41488' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalPlaneResolutionUnit id: '41488' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -672,11 +672,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CustomRendered:41985' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CustomRendered id: '41985' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -690,11 +690,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -708,11 +708,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -726,11 +726,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -744,11 +744,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OwnerName:42032' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: OwnerName id: '42032' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -762,11 +762,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SerialNumber:42033' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: SerialNumber id: '42033' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -780,11 +780,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensInfo:42034' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: LensInfo id: '42034' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -798,11 +798,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensModel:42036' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: LensModel id: '42036' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -816,11 +816,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:LensSerialNumber:42037' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: false name: LensSerialNumber id: '42037' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -834,7 +834,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -843,11 +843,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -861,11 +861,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -879,11 +879,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -897,11 +897,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -931,7 +931,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -949,7 +949,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP13:237' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP13 id: '237' @@ -967,7 +967,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -985,7 +985,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -1003,7 +1003,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -1021,7 +1021,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1039,7 +1039,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1057,7 +1057,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1075,7 +1075,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -1093,7 +1093,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -1111,7 +1111,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -1130,7 +1130,7 @@ log: WARNING: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:RecommendedExposureIndex:34866' - message: 'Found Short data format, expected Long for item ''RecommendedExposureIndex'' in ''ExifIFD''' + message: "Found Short data format, expected Long for item 'RecommendedExposureIndex' in 'ExifIFD'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' message: 'Decrementing thumbnail size to 5315 bytes' @@ -1178,7 +1178,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: gh-77.jpg - FileDateTime: 1644612165 + FileDateTime: 1639835048 FileSize: 826602 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/no-exif.jpg.dump.yml b/tests/media-dumps/image/no-exif.jpg.dump.yml index cb14d13c5..309844fd7 100644 --- a/tests/media-dumps/image/no-exif.jpg.dump.yml +++ b/tests/media-dumps/image/no-exif.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:COM:254' - class: FileEye\MediaProbe\Block\JpegSegmentCom + class: FileEye\MediaProbe\Block\Jpeg\SegmentCom valid: true name: COM id: '254' @@ -73,7 +73,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -91,7 +91,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -109,7 +109,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF0:192' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF0 id: '192' @@ -127,7 +127,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -145,7 +145,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -163,7 +163,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -181,7 +181,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -199,7 +199,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -217,7 +217,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -243,7 +243,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: no-exif.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 4348 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/pel-157.tiff.dump.yml b/tests/media-dumps/image/pel-157.tiff.dump.yml index 6e623a074..834238e27 100644 --- a/tests/media-dumps/image/pel-157.tiff.dump.yml +++ b/tests/media-dumps/image/pel-157.tiff.dump.yml @@ -17,9 +17,9 @@ elements: - node: tiff path: /media/tiff - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true - id: Tiff + id: image/tiff collection: Tiff\Tiff elements: - @@ -42,7 +42,7 @@ elements: - node: ifd path: '/media/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -51,11 +51,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:SubfileType:254' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubfileType id: '254' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -69,11 +69,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ImageWidth:256' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageWidth id: '256' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ImageHeight:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageHeight id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:BitsPerSample:258' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BitsPerSample id: '258' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:PhotometricInterpretation:262' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotometricInterpretation id: '262' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Make:271' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Make id: '271' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,11 +177,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Model:272' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Model id: '272' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -195,11 +195,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:PreviewImageStart:273' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PreviewImageStart id: '273' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -213,11 +213,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -231,11 +231,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:SamplesPerPixel:277' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SamplesPerPixel id: '277' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -249,11 +249,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:RowsPerStrip:278' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RowsPerStrip id: '278' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -267,11 +267,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:PreviewImageLength:279' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PreviewImageLength id: '279' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -285,11 +285,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -303,11 +303,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -321,11 +321,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:PlanarConfiguration:284' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PlanarConfiguration id: '284' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -339,11 +339,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -357,11 +357,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Software:305' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Software id: '305' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -375,11 +375,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -393,11 +393,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Predictor:317' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Predictor id: '317' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -411,11 +411,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ExtraSamples:338' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExtraSamples id: '338' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -429,11 +429,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:YCbCrPositioning:531' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YCbCrPositioning id: '531' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -447,11 +447,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ApplicationNotes:700' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApplicationNotes id: '700' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -465,10 +465,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20507' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20507' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -482,10 +482,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20512' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20512' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -499,10 +499,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20513' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20513' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -516,10 +516,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20515' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20515' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -533,10 +533,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20521' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -550,10 +550,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20525' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20525' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -567,10 +567,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20526' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20526' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -584,10 +584,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20528' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20528' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -601,10 +601,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20624' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20624' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -618,10 +618,10 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:20625' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true id: '20625' - collection: UnknownTag + collection: Tiff\UnknownTag elements: - node: entry @@ -635,11 +635,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -653,11 +653,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -671,7 +671,7 @@ elements: - node: ifd path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -680,11 +680,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureTime:33434' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureTime id: '33434' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -698,11 +698,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FNumber:33437' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FNumber id: '33437' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -716,11 +716,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -734,11 +734,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -752,11 +752,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -770,11 +770,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -788,11 +788,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -806,11 +806,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -824,11 +824,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -842,11 +842,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:BrightnessValue:37379' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BrightnessValue id: '37379' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -860,11 +860,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -878,11 +878,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -896,11 +896,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -914,11 +914,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -932,11 +932,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -950,11 +950,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeOriginal:37521' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeOriginal id: '37521' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -968,11 +968,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:SubSecTimeDigitized:37522' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SubSecTimeDigitized id: '37522' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -986,11 +986,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1004,11 +1004,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1022,11 +1022,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:Padding:59932' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Padding id: '59932' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1040,11 +1040,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ExposureProgram:34850' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureProgram id: '34850' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1058,7 +1058,7 @@ elements: - node: ifd path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: GPS id: '34853' @@ -1067,11 +1067,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSVersionID id: '0' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1085,11 +1085,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitudeRef:1' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitudeRef id: '1' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1103,11 +1103,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLatitude:2' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLatitude id: '2' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1121,11 +1121,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitudeRef:3' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitudeRef id: '3' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1139,11 +1139,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSLongitude:4' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSLongitude id: '4' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1157,11 +1157,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitudeRef:5' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitudeRef id: '5' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1175,11 +1175,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSAltitude:6' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSAltitude id: '6' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1193,11 +1193,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSDateStamp:29' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: GPSDateStamp id: '29' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1211,11 +1211,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ISO:34855' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ISO id: '34855' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1229,11 +1229,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1247,11 +1247,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1265,11 +1265,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1283,11 +1283,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ShutterSpeedValue:37377' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ShutterSpeedValue id: '37377' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1301,11 +1301,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ApertureValue:37378' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApertureValue id: '37378' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1319,11 +1319,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:BrightnessValue:37379' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BrightnessValue id: '37379' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1337,11 +1337,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ExposureCompensation:37380' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureCompensation id: '37380' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1355,11 +1355,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:MaxApertureValue:37381' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MaxApertureValue id: '37381' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1373,11 +1373,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:MeteringMode:37383' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MeteringMode id: '37383' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1391,11 +1391,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Flash:37385' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Flash id: '37385' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1409,11 +1409,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:FocalLength:37386' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLength id: '37386' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1427,11 +1427,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:MakerNote:37500' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: MakerNote id: '37500' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1445,11 +1445,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:UserComment:37510' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: UserComment id: '37510' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1463,11 +1463,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1481,11 +1481,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1499,11 +1499,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ExifImageWidth:40962' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageWidth id: '40962' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1517,11 +1517,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ExifImageHeight:40963' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifImageHeight id: '40963' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1535,11 +1535,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ExposureMode:41986' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExposureMode id: '41986' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1553,11 +1553,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:WhiteBalance:41987' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: WhiteBalance id: '41987' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1571,11 +1571,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:FocalLengthIn35mmFormat:41989' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FocalLengthIn35mmFormat id: '41989' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1589,11 +1589,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:SceneCaptureType:41990' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SceneCaptureType id: '41990' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1607,11 +1607,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Padding:59932' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Padding id: '59932' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1625,11 +1625,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:OffsetSchema:59933' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetSchema id: '59933' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -1644,53 +1644,53 @@ log: WARNING: - path: '/media/tiff/ifd:IFD0:0/tag:ExtraSamples:338' - message: 'Found Short data format, expected Undefined for item ''ExtraSamples'' in ''IFD0''' + message: "Found Short data format, expected Undefined for item 'ExtraSamples' in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:BrightnessValue:37379' - message: 'Found Rational data format, expected SignedRational for item ''BrightnessValue'' in ''ExifIFD''' + message: "Found Rational data format, expected SignedRational for item 'BrightnessValue' in 'ExifIFD'" - path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - message: 'Found Undefined data format, expected Byte for item ''GPSVersionID'' in ''GPS''' + message: "Found Undefined data format, expected Byte for item 'GPSVersionID' in 'GPS'" - path: '/media/tiff/ifd:IFD0:0/tag:ExifImageWidth:40962' - message: 'Found Long data format, expected Short for item ''ExifImageWidth'' in ''IFD0''' + message: "Found Long data format, expected Short for item 'ExifImageWidth' in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:ExifImageHeight:40963' - message: 'Found Long data format, expected Short for item ''ExifImageHeight'' in ''IFD0''' + message: "Found Long data format, expected Short for item 'ExifImageHeight' in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:FocalLengthIn35mmFormat:41989' - message: 'Found Long data format, expected Short for item ''FocalLengthIn35mmFormat'' in ''IFD0''' + message: "Found Long data format, expected Short for item 'FocalLengthIn35mmFormat' in 'IFD0'" NOTICE: - path: '/media/tiff/ifd:IFD0:0/tag:20507' - message: 'Unknown item 20507/0x501B in ''IFD0''' + message: "Unknown item 20507/0x501B in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:20512' - message: 'Unknown item 20512/0x5020 in ''IFD0''' + message: "Unknown item 20512/0x5020 in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:20513' - message: 'Unknown item 20513/0x5021 in ''IFD0''' + message: "Unknown item 20513/0x5021 in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:20515' - message: 'Unknown item 20515/0x5023 in ''IFD0''' + message: "Unknown item 20515/0x5023 in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:20521' - message: 'Unknown item 20521/0x5029 in ''IFD0''' + message: "Unknown item 20521/0x5029 in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:20525' - message: 'Unknown item 20525/0x502D in ''IFD0''' + message: "Unknown item 20525/0x502D in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:20526' - message: 'Unknown item 20526/0x502E in ''IFD0''' + message: "Unknown item 20526/0x502E in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:20528' - message: 'Unknown item 20528/0x5030 in ''IFD0''' + message: "Unknown item 20528/0x5030 in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:20624' - message: 'Unknown item 20624/0x5090 in ''IFD0''' + message: "Unknown item 20624/0x5090 in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:20625' - message: 'Unknown item 20625/0x5091 in ''IFD0''' + message: "Unknown item 20625/0x5091 in 'IFD0'" gdInfo: 0: 3264 1: 1836 @@ -1699,7 +1699,7 @@ gdInfo: mime: image/tiff exifReadData: FileName: pel-157.tiff - FileDateTime: 1644443574 + FileDateTime: 1688833322 FileSize: 4239700 FileType: 7 MimeType: image/tiff diff --git a/tests/media-dumps/image/sample-1.tiff.dump.yml b/tests/media-dumps/image/sample-1.tiff.dump.yml index 065e69c11..fe89b03ab 100644 --- a/tests/media-dumps/image/sample-1.tiff.dump.yml +++ b/tests/media-dumps/image/sample-1.tiff.dump.yml @@ -18,9 +18,9 @@ elements: - node: tiff path: /media/tiff - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true - id: Tiff + id: image/tiff collection: Tiff\Tiff elements: - @@ -43,7 +43,7 @@ elements: - node: ifd path: '/media/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -52,11 +52,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ImageWidth:256' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageWidth id: '256' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -70,11 +70,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ImageHeight:257' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ImageHeight id: '257' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -88,11 +88,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:BitsPerSample:258' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: BitsPerSample id: '258' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -106,11 +106,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -124,11 +124,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:PhotometricInterpretation:262' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PhotometricInterpretation id: '262' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -142,11 +142,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:PreviewImageStart:273' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PreviewImageStart id: '273' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -160,11 +160,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Orientation:274' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Orientation id: '274' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -178,11 +178,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:SamplesPerPixel:277' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SamplesPerPixel id: '277' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -196,11 +196,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:RowsPerStrip:278' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RowsPerStrip id: '278' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -214,11 +214,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:PreviewImageLength:279' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PreviewImageLength id: '279' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -232,11 +232,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:PlanarConfiguration:284' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: PlanarConfiguration id: '284' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -250,11 +250,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:Predictor:317' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Predictor id: '317' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -268,11 +268,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ExtraSamples:338' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExtraSamples id: '338' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -286,11 +286,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:SampleFormat:339' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: SampleFormat id: '339' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -304,11 +304,11 @@ elements: - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ApplicationNotes:700' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ApplicationNotes id: '700' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -323,10 +323,10 @@ log: WARNING: - path: '/media/tiff/ifd:IFD0:0/tag:ExtraSamples:338' - message: 'Found Short data format, expected Undefined for item ''ExtraSamples'' in ''IFD0''' + message: "Found Short data format, expected Undefined for item 'ExtraSamples' in 'IFD0'" - path: '/media/tiff/ifd:IFD0:0/tag:SampleFormat:339' - message: 'Found Short data format, expected Undefined for item ''SampleFormat'' in ''IFD0''' + message: "Found Short data format, expected Undefined for item 'SampleFormat' in 'IFD0'" gdInfo: 0: 174 1: 38 @@ -335,7 +335,7 @@ gdInfo: mime: image/tiff exifReadData: FileName: sample-1.tiff - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 6925 FileType: 8 MimeType: image/tiff diff --git a/tests/media-dumps/image/test-tags-1.jpg.dump.yml b/tests/media-dumps/image/test-tags-1.jpg.dump.yml index c30968912..8703af65e 100644 --- a/tests/media-dumps/image/test-tags-1.jpg.dump.yml +++ b/tests/media-dumps/image/test-tags-1.jpg.dump.yml @@ -11,15 +11,15 @@ elements: - node: jpeg path: /media/jpeg - class: FileEye\MediaProbe\Block\Jpeg + class: FileEye\MediaProbe\Block\Jpeg\Jpeg valid: true - id: Jpeg + id: image/jpeg collection: Jpeg\Jpeg elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOI:216' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOI id: '216' @@ -37,7 +37,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP0:224' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: APP0 id: '224' @@ -55,7 +55,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -64,21 +64,21 @@ elements: - node: exif path: '/media/jpeg/jpegSegment:APP1:225/exif' - class: FileEye\MediaProbe\Block\Exif\Exif + class: FileEye\MediaProbe\Block\Jpeg\Exif valid: true - collection: Exif\Exif + collection: Jpeg\Exif elements: - node: tiff path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff' - class: FileEye\MediaProbe\Block\Tiff + class: FileEye\MediaProbe\Block\Tiff\Tiff valid: true collection: Tiff\Tiff elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD0 id: '0' @@ -87,11 +87,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -105,11 +105,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -123,11 +123,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -141,11 +141,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:ModifyDate:306' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ModifyDate id: '306' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -159,11 +159,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/tag:RatingPercent:18249' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: RatingPercent id: '18249' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -177,7 +177,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: ExifIFD id: '34665' @@ -186,11 +186,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ExifVersion:36864' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ExifVersion id: '36864' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -204,11 +204,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:DateTimeOriginal:36867' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: DateTimeOriginal id: '36867' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -222,11 +222,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:CreateDate:36868' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: CreateDate id: '36868' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -240,11 +240,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTime:36880' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTime id: '36880' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -258,11 +258,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTimeOriginal:36881' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTimeOriginal id: '36881' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -276,11 +276,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:OffsetTimeDigitized:36882' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: OffsetTimeDigitized id: '36882' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -294,11 +294,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:FlashpixVersion:40960' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: FlashpixVersion id: '40960' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -312,11 +312,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:ColorSpace:40961' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ColorSpace id: '40961' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -330,7 +330,7 @@ elements: - node: ifd path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1' - class: FileEye\MediaProbe\Block\Exif\Ifd + class: FileEye\MediaProbe\Block\Tiff\Ifd valid: true name: IFD1 id: '1' @@ -339,11 +339,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:Compression:259' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: Compression id: '259' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -357,11 +357,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:XResolution:282' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: XResolution id: '282' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -375,11 +375,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:YResolution:283' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: YResolution id: '283' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -393,11 +393,11 @@ elements: - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD1:1/tag:ResolutionUnit:296' - class: FileEye\MediaProbe\Block\Tag + class: FileEye\MediaProbe\Block\Tiff\Tag valid: true name: ResolutionUnit id: '296' - collection: Tag + collection: Tiff\Tag elements: - node: entry @@ -427,7 +427,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:COM:254' - class: FileEye\MediaProbe\Block\JpegSegmentCom + class: FileEye\MediaProbe\Block\Jpeg\SegmentCom valid: true name: COM id: '254' @@ -445,7 +445,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:APP1:225' - class: FileEye\MediaProbe\Block\JpegSegmentApp1 + class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 valid: true name: APP1 id: '225' @@ -463,7 +463,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -481,7 +481,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DQT:219' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DQT id: '219' @@ -499,7 +499,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOF2:194' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: SOF2 id: '194' @@ -517,7 +517,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -535,7 +535,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:DHT:196' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: DHT id: '196' @@ -553,7 +553,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:SOS:218' - class: FileEye\MediaProbe\Block\JpegSegmentSos + class: FileEye\MediaProbe\Block\Jpeg\SegmentSos valid: true name: SOS id: '218' @@ -571,7 +571,7 @@ elements: - node: jpegSegment path: '/media/jpeg/jpegSegment:EOI:217' - class: FileEye\MediaProbe\Block\JpegSegment + class: FileEye\MediaProbe\Block\Jpeg\Segment valid: true name: EOI id: '217' @@ -597,7 +597,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: test-tags-1.jpg - FileDateTime: 1644443574 + FileDateTime: 1639835048 FileSize: 4385 FileType: 2 MimeType: image/jpeg From 25e5a5273bc53833e8eb5616685bb3fd358054e8 Mon Sep 17 00:00:00 2001 From: mondrake Date: Sun, 11 Feb 2024 16:11:40 +0100 Subject: [PATCH 07/10] Dev 240211 (#81) --- .github/workflows/tests.yml | 4 +- composer.json | 11 +++- specs/Jpeg/Exif.yaml | 2 + specs/Jpeg/Segment.yaml | 2 + specs/Jpeg/SegmentApp1.yaml | 2 + specs/Jpeg/SegmentCom.yaml | 2 + specs/Jpeg/SegmentSos.yaml | 2 + .../Exif/Vendor/Canon/FilterInfoIndex.php | 16 ++--- src/Block/Jpeg/Exif.php | 46 --------------- src/Block/Jpeg/Segment.php | 12 ---- src/Block/Jpeg/SegmentApp1.php | 23 -------- src/Block/Jpeg/SegmentCom.php | 13 ----- src/Block/Jpeg/SegmentSos.php | 49 ---------------- src/Collection/Jpeg/Exif.php | 2 + src/Collection/Jpeg/Segment.php | 2 + src/Collection/Jpeg/SegmentApp1.php | 2 + src/Collection/Jpeg/SegmentCom.php | 2 + src/Collection/Jpeg/SegmentSos.php | 2 + src/ItemDefinition.php | 39 +++++++++---- src/Media.php | 3 +- src/Parser/Jpeg/Exif.php | 56 ++++++++++++++++++ src/Parser/Jpeg/Segment.php | 20 +++++++ src/Parser/Jpeg/SegmentApp1.php | 31 ++++++++++ src/Parser/Jpeg/SegmentCom.php | 21 +++++++ src/Parser/Jpeg/SegmentSos.php | 58 +++++++++++++++++++ src/Parser/ParserBase.php | 8 ++- src/Parser/Tiff/Tiff.php | 1 - 27 files changed, 260 insertions(+), 171 deletions(-) create mode 100644 src/Parser/Jpeg/Exif.php create mode 100644 src/Parser/Jpeg/Segment.php create mode 100644 src/Parser/Jpeg/SegmentApp1.php create mode 100644 src/Parser/Jpeg/SegmentCom.php create mode 100644 src/Parser/Jpeg/SegmentSos.php diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a4e773359..302f75ce0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,9 +15,9 @@ jobs: fail-fast: false matrix: php-version: -# - "8.1" + - "8.1" - "8.2" -# - "8.3" + - "8.3" steps: - name: Install PHP diff --git a/composer.json b/composer.json index 14cf692e7..3412f489e 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,9 @@ "symfony/var-dumper": "^6 | ^7", "symfony/yaml": "^6 | ^7", "bramus/monolog-colored-line-formatter": "^3", - "phpstan/phpstan": "^1.10" + "phpstan/phpstan": "^1.10", + "phpstan/extension-installer": "^1.3", + "phpstan/phpstan-deprecation-rules": "^1.1" }, "autoload": { "psr-4": { @@ -41,5 +43,10 @@ "FileEye\\MediaProbe\\Test\\": "tests/" } }, - "bin": ["bin/fileeye-mediaprobe"] + "bin": ["bin/fileeye-mediaprobe"], + "config": { + "allow-plugins": { + "phpstan/extension-installer": true + } + } } diff --git a/specs/Jpeg/Exif.yaml b/specs/Jpeg/Exif.yaml index 59a9e862e..9b3826830 100644 --- a/specs/Jpeg/Exif.yaml +++ b/specs/Jpeg/Exif.yaml @@ -1,6 +1,8 @@ collection: Jpeg\Exif title: 'JPEG Exif data' class: FileEye\MediaProbe\Block\Jpeg\Exif +parser: FileEye\MediaProbe\Parser\Jpeg\Exif +writer: FileEye\MediaProbe\Writer\Jpeg\Exif DOMNode: exif items: Tiff: diff --git a/specs/Jpeg/Segment.yaml b/specs/Jpeg/Segment.yaml index 072be861b..000f10f3b 100644 --- a/specs/Jpeg/Segment.yaml +++ b/specs/Jpeg/Segment.yaml @@ -1,5 +1,7 @@ collection: Jpeg\Segment title: Generic JPEG data segment class: FileEye\MediaProbe\Block\Jpeg\Segment +parser: FileEye\MediaProbe\Parser\Jpeg\Segment +writer: FileEye\MediaProbe\Writer\Jpeg\Segment DOMNode: jpegSegment items: {} diff --git a/specs/Jpeg/SegmentApp1.yaml b/specs/Jpeg/SegmentApp1.yaml index 89ede9e20..a79436cfe 100644 --- a/specs/Jpeg/SegmentApp1.yaml +++ b/specs/Jpeg/SegmentApp1.yaml @@ -3,6 +3,8 @@ name: APP1 title: 'JPEG Application segment 1' payload: variable class: FileEye\MediaProbe\Block\Jpeg\SegmentApp1 +parser: FileEye\MediaProbe\Parser\Jpeg\SegmentApp1 +writer: FileEye\MediaProbe\Writer\Jpeg\SegmentApp1 DOMNode: jpegSegment items: Exif: diff --git a/specs/Jpeg/SegmentCom.yaml b/specs/Jpeg/SegmentCom.yaml index e1ce52afb..ca01168a1 100644 --- a/specs/Jpeg/SegmentCom.yaml +++ b/specs/Jpeg/SegmentCom.yaml @@ -3,5 +3,7 @@ name: COM title: 'JPEG Comment' payload: variable class: FileEye\MediaProbe\Block\Jpeg\SegmentCom +parser: FileEye\MediaProbe\Parser\Jpeg\SegmentCom +writer: FileEye\MediaProbe\Writer\Jpeg\SegmentCom DOMNode: jpegSegment items: {} diff --git a/specs/Jpeg/SegmentSos.yaml b/specs/Jpeg/SegmentSos.yaml index 44adb511c..3c8b5be7f 100644 --- a/specs/Jpeg/SegmentSos.yaml +++ b/specs/Jpeg/SegmentSos.yaml @@ -3,5 +3,7 @@ name: SOS title: 'JPEG Start of scan' payload: scan class: FileEye\MediaProbe\Block\Jpeg\SegmentSos +parser: FileEye\MediaProbe\Parser\Jpeg\SegmentSos +writer: FileEye\MediaProbe\Writer\Jpeg\SegmentSos DOMNode: jpegSegment items: {} diff --git a/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php b/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php index f9c9b27f8..7d0b4f12c 100644 --- a/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php +++ b/src/Block/Exif/Vendor/Canon/FilterInfoIndex.php @@ -57,13 +57,15 @@ protected function doParseData(DataElement $data): void $filter_size = $data->getLong($offset + 4); $this ->addBlock( - new ItemDefinition(CollectionFactory::get('ExifMakerNotes\Canon\Filter'), - DataFormat::BYTE, - $filter_size, - $offset, - 0, - $i - )) + new ItemDefinition( + CollectionFactory::get('ExifMakerNotes\Canon\Filter'), + DataFormat::BYTE, + $filter_size, + $offset, + 0, + $i + ) + ) ->parseData(new DataWindow($data, $offset, $filter_size + 4)); $offset += 4 + $filter_size; } diff --git a/src/Block/Jpeg/Exif.php b/src/Block/Jpeg/Exif.php index 823c7c060..654fb7a4f 100644 --- a/src/Block/Jpeg/Exif.php +++ b/src/Block/Jpeg/Exif.php @@ -3,12 +3,6 @@ namespace FileEye\MediaProbe\Block\Jpeg; use FileEye\MediaProbe\Model\BlockBase; -use FileEye\MediaProbe\Collection\CollectionFactory; -use FileEye\MediaProbe\Data\DataElement; -use FileEye\MediaProbe\Data\DataWindow; -use FileEye\MediaProbe\Entry\Core\Undefined; -use FileEye\MediaProbe\ItemDefinition; -use FileEye\MediaProbe\MediaProbe; use FileEye\MediaProbe\Utility\ConvertBytes; /** @@ -27,28 +21,6 @@ class Exif extends BlockBase // @todo xxx the trailing bytes may not be zeros const EXIF_HEADER = "Exif\0\0"; - /** - * {@inheritdoc} - */ - protected function doParseData(DataElement $data): void - { - assert($this->debugInfo(['dataElement' => $data])); - - $tiff = new ItemDefinition( - collection: CollectionFactory::get('Tiff\Tiff'), - ); - $tiffParser = $tiff->collection->getPropertyValue('parser'); - - if ($tiffParser::getTiffSegmentByteOrder($data, strlen(self::EXIF_HEADER)) !== null) { - $this->addBlock($tiff)->parseData($data, strlen(self::EXIF_HEADER), $data->getSize() - strlen(self::EXIF_HEADER)); - } else { - // We store the data as normal JPEG content if it could not be - // parsed as Tiff data. - $entry = new Undefined($this, [$data->getBytes()]); - $this->error("TIFF header not found. Parsed {text}", ['text' => $entry->toString()]); - } - } - /** * {@inheritdoc} */ @@ -56,22 +28,4 @@ public function toBytes(int $byte_order = ConvertBytes::LITTLE_ENDIAN, int $offs { return self::EXIF_HEADER . $this->getElement('*')->toBytes(); } - - /** - * Determines if the data is an EXIF segment. - */ - public static function isExifSegment(DataElement $dataElement, $offset = 0): bool - { - // There must be at least 6 bytes for the Exif header. - if ($dataElement->getSize() - $offset < strlen(self::EXIF_HEADER)) { - return false; - } - - // Verify the Exif header. - if ($dataElement->getBytes($offset, strlen(self::EXIF_HEADER)) === self::EXIF_HEADER) { - return true; - } - - return false; - } } diff --git a/src/Block/Jpeg/Segment.php b/src/Block/Jpeg/Segment.php index 1bfbe0c20..133669023 100644 --- a/src/Block/Jpeg/Segment.php +++ b/src/Block/Jpeg/Segment.php @@ -2,9 +2,6 @@ namespace FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Data\DataElement; -use FileEye\MediaProbe\Entry\Core\Undefined; - /** * Class representing a generic JPEG data segment. * @@ -12,13 +9,4 @@ */ class Segment extends SegmentBase { - /** - * {@inheritdoc} - */ - protected function doParseData(DataElement $data): void - { - assert($this->debugInfo(['dataElement' => $data])); - // Adds the segment data as an Undefined entry. - new Undefined($this, $data); - } } diff --git a/src/Block/Jpeg/SegmentApp1.php b/src/Block/Jpeg/SegmentApp1.php index edcb2983e..6cb48624b 100644 --- a/src/Block/Jpeg/SegmentApp1.php +++ b/src/Block/Jpeg/SegmentApp1.php @@ -2,11 +2,6 @@ namespace FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\Jpeg\Exif; -use FileEye\MediaProbe\Collection\CollectionFactory; -use FileEye\MediaProbe\Data\DataElement; -use FileEye\MediaProbe\Entry\Core\Undefined; -use FileEye\MediaProbe\ItemDefinition; use FileEye\MediaProbe\Utility\ConvertBytes; /** @@ -14,24 +9,6 @@ */ class SegmentApp1 extends SegmentBase { - /** - * {@inheritdoc} - */ - protected function doParseData(DataElement $data): void - { - assert($this->debugInfo(['dataElement' => $data])); - // If we have an Exif table, parse it. - if (Exif::isExifSegment($data, 4)) { - $exif = new ItemDefinition(CollectionFactory::get('Jpeg\Exif')); - $this->addBlock($exif)->parseData($data, 4, $data->getSize() - 4); - } else { - // We store the data as normal JPEG content if it could not be - // parsed as Exif data. - $entry = new Undefined($this, $data); - $entry->debug("Not an Exif segment. Parsed {text}", ['text' => $entry->toString()]); - } - } - /** * {@inheritdoc} */ diff --git a/src/Block/Jpeg/SegmentCom.php b/src/Block/Jpeg/SegmentCom.php index 8c3e164bc..dd9b39bbf 100644 --- a/src/Block/Jpeg/SegmentCom.php +++ b/src/Block/Jpeg/SegmentCom.php @@ -2,9 +2,6 @@ namespace FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Data\DataElement; -use FileEye\MediaProbe\Data\DataWindow; -use FileEye\MediaProbe\Entry\Core\Char; use FileEye\MediaProbe\Utility\ConvertBytes; /** @@ -12,16 +9,6 @@ */ class SegmentCom extends SegmentBase { - /** - * {@inheritdoc} - */ - protected function doParseData(DataElement $data): void - { - assert($this->debugInfo(['dataElement' => $data])); - // Adds the segment data as a Char string. - new Char($this, new DataWindow($data, 4)); - } - /** * {@inheritdoc} */ diff --git a/src/Block/Jpeg/SegmentSos.php b/src/Block/Jpeg/SegmentSos.php index 0e291dc27..0cfe072c4 100644 --- a/src/Block/Jpeg/SegmentSos.php +++ b/src/Block/Jpeg/SegmentSos.php @@ -2,14 +2,6 @@ namespace FileEye\MediaProbe\Block\Jpeg; -use FileEye\MediaProbe\Block\RawData; -use FileEye\MediaProbe\Collection\CollectionFactory; -use FileEye\MediaProbe\Data\DataElement; -use FileEye\MediaProbe\Data\DataWindow; -use FileEye\MediaProbe\Entry\Core\Undefined; -use FileEye\MediaProbe\ItemDefinition; -use FileEye\MediaProbe\Data\DataFormat; - /** * Class representing a JPEG SOS segment. */ @@ -19,45 +11,4 @@ class SegmentSos extends SegmentBase * JPEG EOI marker. */ const JPEG_EOI = 0xD9; - - /** - * {@inheritdoc} - */ - protected function doParseData(DataElement $data): void - { - assert($this->debugInfo(['dataElement' => $data])); - // This segment is last before End Of Image, and its length needs to be - // determined by finding the EOI marker backwards from the end of data. - // Some images have some trailing (garbage?) following the EOI marker, - // which we store in a RawData object. - $scan_size = $data->getSize(); - while ($data->getByte($scan_size - 2) !== Jpeg::JPEG_DELIMITER || $data->getByte($scan_size - 1) != self::JPEG_EOI) { - $scan_size --; - } - $scan_size -= 2; - - // Load data in an Undefined entry. - $data_window = new DataWindow($data, 0, $scan_size); - new Undefined($this, $data_window); - - // Append the EOI. - $end_offset = $scan_size; - $eoi = new ItemDefinition( - $this->getParentElement()->getCollection()->getItemCollection(self::JPEG_EOI) - ); - $this->getParentElement()->addBlock($eoi)->parseData($data, $end_offset, 2); - $end_offset += 2; - - // Now check to see if there are any trailing data. - if ($end_offset < $data->getSize()) { - $raw_size = $data->getSize() - $end_offset; - $this->warning('Found trailing content after EOI: {size} bytes', ['size' => $raw_size]); - // There is no JPEG marker for trailing garbage, so we just collect - // the data in a RawData object. - $trail_definition = new ItemDefinition(CollectionFactory::get('RawData'), DataFormat::BYTE, $raw_size); - $trail_data_window = new DataWindow($data, $end_offset, $raw_size); - $trail = new RawData($trail_definition, $this->getParentElement()); - $trail->parseData($trail_data_window); - } - } } diff --git a/src/Collection/Jpeg/Exif.php b/src/Collection/Jpeg/Exif.php index ef7593b9d..2c3db34fd 100644 --- a/src/Collection/Jpeg/Exif.php +++ b/src/Collection/Jpeg/Exif.php @@ -15,6 +15,8 @@ class Exif extends CollectionBase { protected static $map = array ( 'title' => 'JPEG Exif data', 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\Exif', + 'parser' => 'FileEye\\MediaProbe\\Parser\\Jpeg\\Exif', + 'writer' => 'FileEye\\MediaProbe\\Writer\\Jpeg\\Exif', 'DOMNode' => 'exif', 'id' => 'Jpeg\\Exif', 'items' => diff --git a/src/Collection/Jpeg/Segment.php b/src/Collection/Jpeg/Segment.php index 81312ceba..e6dca801b 100644 --- a/src/Collection/Jpeg/Segment.php +++ b/src/Collection/Jpeg/Segment.php @@ -15,6 +15,8 @@ class Segment extends CollectionBase { protected static $map = array ( 'title' => 'Generic JPEG data segment', 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\Segment', + 'parser' => 'FileEye\\MediaProbe\\Parser\\Jpeg\\Segment', + 'writer' => 'FileEye\\MediaProbe\\Writer\\Jpeg\\Segment', 'DOMNode' => 'jpegSegment', 'id' => 'Jpeg\\Segment', ); diff --git a/src/Collection/Jpeg/SegmentApp1.php b/src/Collection/Jpeg/SegmentApp1.php index 1ecc609b1..ec9cf310a 100644 --- a/src/Collection/Jpeg/SegmentApp1.php +++ b/src/Collection/Jpeg/SegmentApp1.php @@ -17,6 +17,8 @@ class SegmentApp1 extends CollectionBase { 'title' => 'JPEG Application segment 1', 'payload' => 'variable', 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\SegmentApp1', + 'parser' => 'FileEye\\MediaProbe\\Parser\\Jpeg\\SegmentApp1', + 'writer' => 'FileEye\\MediaProbe\\Writer\\Jpeg\\SegmentApp1', 'DOMNode' => 'jpegSegment', 'id' => 'Jpeg\\SegmentApp1', 'items' => diff --git a/src/Collection/Jpeg/SegmentCom.php b/src/Collection/Jpeg/SegmentCom.php index 4d2c88d9f..f6413959f 100644 --- a/src/Collection/Jpeg/SegmentCom.php +++ b/src/Collection/Jpeg/SegmentCom.php @@ -17,6 +17,8 @@ class SegmentCom extends CollectionBase { 'title' => 'JPEG Comment', 'payload' => 'variable', 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\SegmentCom', + 'parser' => 'FileEye\\MediaProbe\\Parser\\Jpeg\\SegmentCom', + 'writer' => 'FileEye\\MediaProbe\\Writer\\Jpeg\\SegmentCom', 'DOMNode' => 'jpegSegment', 'id' => 'Jpeg\\SegmentCom', ); diff --git a/src/Collection/Jpeg/SegmentSos.php b/src/Collection/Jpeg/SegmentSos.php index 7fec4249a..eb00b4925 100644 --- a/src/Collection/Jpeg/SegmentSos.php +++ b/src/Collection/Jpeg/SegmentSos.php @@ -17,6 +17,8 @@ class SegmentSos extends CollectionBase { 'title' => 'JPEG Start of scan', 'payload' => 'scan', 'class' => 'FileEye\\MediaProbe\\Block\\Jpeg\\SegmentSos', + 'parser' => 'FileEye\\MediaProbe\\Parser\\Jpeg\\SegmentSos', + 'writer' => 'FileEye\\MediaProbe\\Writer\\Jpeg\\SegmentSos', 'DOMNode' => 'jpegSegment', 'id' => 'Jpeg\\SegmentSos', ); diff --git a/src/ItemDefinition.php b/src/ItemDefinition.php index cfa415bb4..b2bebf800 100644 --- a/src/ItemDefinition.php +++ b/src/ItemDefinition.php @@ -26,40 +26,57 @@ class ItemDefinition */ public function __construct( public readonly CollectionInterface $collection, - protected int $format = DataFormat::BYTE, - protected int $valuesCount = 1, - protected int $dataOffset = 0, - protected int $itemDefinitionOffset = 0, - protected int $sequence = 0, - ) - { + public readonly int $format = DataFormat::BYTE, + public readonly int $valuesCount = 1, + public readonly int $dataOffset = 0, + public readonly int $itemDefinitionOffset = 0, + public readonly int $sequence = 0, + ) { } + /** + * @deprecated + */ public function getCollection(): CollectionInterface { return $this->collection; } + /** + * @deprecated + */ public function getFormat(): int { return $this->format; } + /** + * @deprecated + */ public function getValuesCount(): int { return $this->valuesCount; } + /** + * @deprecated + */ public function getDataOffset(): int { return $this->dataOffset; } + /** + * @deprecated + */ public function getItemDefinitionOffset(): int { return $this->itemDefinitionOffset; } + /** + * @deprecated + */ public function getSequence(): int { return $this->sequence; @@ -70,7 +87,7 @@ public function getSequence(): int */ public function getSize(): int { - return DataFormat::getSize($this->getFormat()) * $this->getValuesCount(); + return DataFormat::getSize($this->format) * $this->valuesCount; } /** @@ -82,7 +99,7 @@ public function getEntryClass(): string // Return the specific entry class if defined, or fall back to // default class for the format. if (!$entry_class = $this->collection->getPropertyValue('entryClass')) { - if (empty($this->getFormat())) { + if (empty($this->format)) { throw new MediaProbeException( 'No format can be derived for item: %s (%s)', $this->collection->getPropertyValue('item') ?? 'n/a', @@ -90,10 +107,10 @@ public function getEntryClass(): string ); } - if (!$entry_class = DataFormat::getClass($this->getFormat())) { + if (!$entry_class = DataFormat::getClass($this->format)) { throw new MediaProbeException( 'Unsupported format %d for item: %s (%s)', - $this->getFormat(), + $this->format, $this->collection->getPropertyValue('item') ?? 'n/a', $this->collection->getPropertyValue('name') ?? 'n/a' ); diff --git a/src/Media.php b/src/Media.php index db0fc1a00..fee535d65 100644 --- a/src/Media.php +++ b/src/Media.php @@ -64,8 +64,7 @@ class Media extends RootBlockBase public function __construct( protected ?LoggerInterface $externalLogger, ?string $failLevel, - ) - { + ) { $media = new ItemDefinition(CollectionFactory::get('Media')); parent::__construct($media); $this->logger = (new Logger('mediaprobe')) diff --git a/src/Parser/Jpeg/Exif.php b/src/Parser/Jpeg/Exif.php new file mode 100644 index 000000000..32d0ae171 --- /dev/null +++ b/src/Parser/Jpeg/Exif.php @@ -0,0 +1,56 @@ +block->debugInfo(['dataElement' => $data])); + + $tiff = new ItemDefinition( + collection: CollectionFactory::get('Tiff\Tiff'), + ); + $tiffParser = $tiff->collection->getPropertyValue('parser'); + + if ($tiffParser::getTiffSegmentByteOrder($data, strlen(ExifBlock::EXIF_HEADER)) !== null) { + $this->block->addBlock($tiff)->parseData($data, strlen(ExifBlock::EXIF_HEADER), $data->getSize() - strlen(ExifBlock::EXIF_HEADER)); + } else { + // We store the data as normal JPEG content if it could not be + // parsed as Tiff data. + $entry = new Undefined($this->block, [$data->getBytes()]); + $this->block->error("TIFF header not found. Parsed {text}", ['text' => $entry->toString()]); + } + } + + /** + * Determines if the data is an EXIF segment. + */ + public static function isExifSegment(DataElement $dataElement, $offset = 0): bool + { + // There must be at least 6 bytes for the Exif header. + if ($dataElement->getSize() - $offset < strlen(ExifBlock::EXIF_HEADER)) { + return false; + } + + // Verify the Exif header. + if ($dataElement->getBytes($offset, strlen(ExifBlock::EXIF_HEADER)) === ExifBlock::EXIF_HEADER) { + return true; + } + + return false; + } +} diff --git a/src/Parser/Jpeg/Segment.php b/src/Parser/Jpeg/Segment.php new file mode 100644 index 000000000..06fbc1d64 --- /dev/null +++ b/src/Parser/Jpeg/Segment.php @@ -0,0 +1,20 @@ +block->debugInfo(['dataElement' => $data])); + // Adds the segment data as an Undefined entry. + new Undefined($this->block, $data); + } +} diff --git a/src/Parser/Jpeg/SegmentApp1.php b/src/Parser/Jpeg/SegmentApp1.php new file mode 100644 index 000000000..17eeeefcb --- /dev/null +++ b/src/Parser/Jpeg/SegmentApp1.php @@ -0,0 +1,31 @@ +block->debugInfo(['dataElement' => $data])); + // If we have an Exif table, parse it. + // @todo use parser and not class call driectly + if (Exif::isExifSegment($data, 4)) { + $exif = new ItemDefinition(CollectionFactory::get('Jpeg\Exif')); + $this->block->addBlock($exif)->parseData($data, 4, $data->getSize() - 4); + } else { + // We store the data as normal JPEG content if it could not be + // parsed as Exif data. + $entry = new Undefined($this->block, $data); + $entry->debug("Not an Exif segment. Parsed {text}", ['text' => $entry->toString()]); + } + } +} diff --git a/src/Parser/Jpeg/SegmentCom.php b/src/Parser/Jpeg/SegmentCom.php new file mode 100644 index 000000000..d75c9e060 --- /dev/null +++ b/src/Parser/Jpeg/SegmentCom.php @@ -0,0 +1,21 @@ +block->debugInfo(['dataElement' => $data])); + // Adds the segment data as a Char string. + new Char($this->block, new DataWindow($data, 4)); + } +} diff --git a/src/Parser/Jpeg/SegmentSos.php b/src/Parser/Jpeg/SegmentSos.php new file mode 100644 index 000000000..5fa9411ac --- /dev/null +++ b/src/Parser/Jpeg/SegmentSos.php @@ -0,0 +1,58 @@ +block->debugInfo(['dataElement' => $data])); + // This segment is last before End Of Image, and its length needs to be + // determined by finding the EOI marker backwards from the end of data. + // Some images have some trailing (garbage?) following the EOI marker, + // which we store in a RawData object. + $scan_size = $data->getSize(); + while ($data->getByte($scan_size - 2) !== JpegBlock::JPEG_DELIMITER || $data->getByte($scan_size - 1) != SegmentSosBlock::JPEG_EOI) { + $scan_size --; + } + $scan_size -= 2; + + // Load data in an Undefined entry. + $data_window = new DataWindow($data, 0, $scan_size); + new Undefined($this->block, $data_window); + + // Append the EOI. + $end_offset = $scan_size; + $eoi = new ItemDefinition( + $this->block->getParentElement()->getCollection()->getItemCollection(SegmentSosBlock::JPEG_EOI) + ); + $this->block->getParentElement()->addBlock($eoi)->parseData($data, $end_offset, 2); + $end_offset += 2; + + // Now check to see if there are any trailing data. + if ($end_offset < $data->getSize()) { + $raw_size = $data->getSize() - $end_offset; + $this->block->warning('Found trailing content after EOI: {size} bytes', ['size' => $raw_size]); + // There is no JPEG marker for trailing garbage, so we just collect + // the data in a RawData object. + $trail_definition = new ItemDefinition(CollectionFactory::get('RawData'), DataFormat::BYTE, $raw_size); + $trail_data_window = new DataWindow($data, $end_offset, $raw_size); + $trail = new RawData($trail_definition, $this->block->getParentElement()); + $trail->parseData($trail_data_window); + } + } +} diff --git a/src/Parser/ParserBase.php b/src/Parser/ParserBase.php index c1c484351..fe7a6f8ba 100644 --- a/src/Parser/ParserBase.php +++ b/src/Parser/ParserBase.php @@ -2,13 +2,15 @@ namespace FileEye\MediaProbe\Parser; +use FileEye\MediaProbe\Data\DataElement; use FileEye\MediaProbe\Model\BlockInterface; -class ParserBase +abstract class ParserBase { public function __construct( protected readonly BlockInterface $block, - ) - { + ) { } + + abstract public function parseData(DataElement $data): void; } diff --git a/src/Parser/Tiff/Tiff.php b/src/Parser/Tiff/Tiff.php index 30bec330a..1ec3a8952 100644 --- a/src/Parser/Tiff/Tiff.php +++ b/src/Parser/Tiff/Tiff.php @@ -139,5 +139,4 @@ public static function getTiffSegmentByteOrder(DataElement $dataElement, int $of return $order; } - } From 6c0977191c7aa2ab52cb49dab4e565d737339d64 Mon Sep 17 00:00:00 2001 From: mondrake Date: Sun, 26 Jan 2025 11:02:45 +0100 Subject: [PATCH 08/10] fix phpunit deprecations (#82) --- .github/workflows/tests.yml | 8 ++++---- composer.json | 16 +++++++-------- phpunit.xml | 41 ++++++++++++++++++------------------- tests/MediaFilesTest.php | 20 +++++------------- tests/ReadWriteTest.php | 8 ++------ tests/SpecTest.php | 4 ++-- 6 files changed, 41 insertions(+), 56 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bebbe3beb..2850cfff7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,9 +15,9 @@ jobs: fail-fast: false matrix: php-version: - - "8.1" - "8.2" - "8.3" + - "8.4" steps: - name: Install PHP @@ -63,7 +63,7 @@ jobs: # php examples/dump-media.php -d tests/media-samples/image/broken/pel-176-RPT200076_03.jpg - name: Run test suite - continue-on-error: true +# continue-on-error: true run: vendor/bin/phpunit --color=always --testdox --display-deprecations --display-phpunit-deprecations ./tests # - name: Code style test @@ -84,5 +84,5 @@ jobs: # - name: "Install PHPStan" # run: "composer require --dev phpstan/phpstan:^1.2 --ansi" - - name: "Run a static analysis with phpstan/phpstan" - run: vendor/bin/phpstan analyze +# - name: "Run a static analysis with phpstan/phpstan" +# run: vendor/bin/phpstan analyze diff --git a/composer.json b/composer.json index 37a26e4fe..be0235e87 100644 --- a/composer.json +++ b/composer.json @@ -16,18 +16,18 @@ "monolog/monolog": "^3", "shanethehat/pretty-xml": "*", "sibche/plist": "*", - "symfony/stopwatch": "^7" + "symfony/stopwatch": "^7.2" }, "require-dev" : { "ext-exif": "*", - "phpunit/phpunit": "^10 | ^11", + "phpunit/phpunit": "^11", "squizlabs/php_codesniffer": "*", - "symfony/console": "^7", - "symfony/finder": "^7", - "symfony/filesystem": "^7", - "symfony/process": "^7", - "symfony/var-dumper": "^7", - "symfony/yaml": "^7", + "symfony/console": "^7.2", + "symfony/finder": "^7.2", + "symfony/filesystem": "^7.2", + "symfony/process": "^7.2", + "symfony/var-dumper": "^7.2", + "symfony/yaml": "^7.2", "bramus/monolog-colored-line-formatter": "^3", "phpstan/phpstan": "^2", "phpstan/extension-installer": "*", diff --git a/phpunit.xml b/phpunit.xml index ffb438c27..475fc03f0 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,26 +1,25 @@ - - - - ./tests/ - - - - - - ./src/ - - ./src/Command/ - ./src/Collection/ - - - + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" + cacheDirectory=".phpunit.cache" + backupStaticProperties="false"> + + + ./tests/ + + + + + + ./src/ + + + ./src/Command/ + ./src/Collection/ + + diff --git a/tests/MediaFilesTest.php b/tests/MediaFilesTest.php index 1abc6090b..d2a717c80 100644 --- a/tests/MediaFilesTest.php +++ b/tests/MediaFilesTest.php @@ -8,6 +8,7 @@ use FileEye\MediaProbe\Data\DataFormat; use FileEye\MediaProbe\Media; use FileEye\MediaProbe\MediaProbe; +use PHPUnit\Framework\Attributes\DataProvider; use Symfony\Component\Finder\Finder; use Symfony\Component\Yaml\Yaml; @@ -20,9 +21,6 @@ class MediaFilesTest extends MediaProbeTestCaseBase protected ?\DOMDocument $exiftoolDump; protected ?\DOMDocument $exiftoolRawDump; - /** - * {@inheritdoc} - */ public function tearDown(): void { $this->testDump = null; @@ -43,9 +41,7 @@ public static function mediaFileProvider() return $result; } - /** - * @dataProvider mediaFileProvider - */ + #[DataProvider('mediaFileProvider')] public function testParseFromFile($mediaDumpFile) { $this->testDump = Yaml::parse($mediaDumpFile->getContents()); @@ -75,9 +71,7 @@ public function testParseFromFile($mediaDumpFile) } } - /** - * @dataProvider mediaFileProvider - */ + #[DataProvider('mediaFileProvider')] public function testParse($mediaDumpFile) { $this->testDump = Yaml::parse($mediaDumpFile->getContents()); @@ -108,9 +102,7 @@ public function testParse($mediaDumpFile) } } - /** - * @dataProvider mediaFileProvider - */ + #[DataProvider('mediaFileProvider')] public function testRewriteThroughGd($mediaDumpFile) { $this->testDump = Yaml::parse($mediaDumpFile->getContents()); @@ -145,9 +137,7 @@ public function testRewriteThroughGd($mediaDumpFile) imagedestroy($gd_resource); } - /** - * @dataProvider mediaFileProvider - */ + #[DataProvider('mediaFileProvider')] public function testRewrite($mediaDumpFile) { $this->testDump = Yaml::parse($mediaDumpFile->getContents()); diff --git a/tests/ReadWriteTest.php b/tests/ReadWriteTest.php index 7081f30e1..dba160265 100644 --- a/tests/ReadWriteTest.php +++ b/tests/ReadWriteTest.php @@ -21,12 +21,10 @@ use FileEye\MediaProbe\Media; use FileEye\MediaProbe\MediaProbe; use FileEye\MediaProbe\Utility\ConvertBytes; +use PHPUnit\Framework\Attributes\DataProvider; class ReadWriteTest extends MediaProbeTestCaseBase { - /** - * {@inheritdoc} - */ public function tearDown(): void { unlink(dirname(__FILE__) . '/test-output.jpg'); @@ -34,9 +32,7 @@ public function tearDown(): void parent::tearDown(); } - /** - * @dataProvider writeEntryProvider - */ + #[DataProvider('writeEntryProvider')] public function testWriteRead(array $entries) { $media = Media::parseFromFile(dirname(__FILE__) . '/media-samples/image/no-exif.jpg', null, 'error'); diff --git a/tests/SpecTest.php b/tests/SpecTest.php index 52bf639ca..c5eaede94 100644 --- a/tests/SpecTest.php +++ b/tests/SpecTest.php @@ -17,6 +17,7 @@ use FileEye\MediaProbe\MediaProbe; use FileEye\MediaProbe\MediaProbeException; use FileEye\MediaProbe\Utility\ConvertBytes; +use PHPUnit\Framework\Attributes\DataProvider; /** * Test the Spec class. @@ -87,9 +88,8 @@ public function testGetEntryClass() /** * Tests getting decoded TAG text from TAG values. - * - * @dataProvider getTagTextProvider */ + #[DataProvider('getTagTextProvider')] public function testGetTagText($expected_text, $expected_class, $parent_collection_id, $tag_name, string $args, $brief = false) { $stubRoot = $this->getStubRoot(); From 5a22f3cfef4103990f1c52369db228926d51f052 Mon Sep 17 00:00:00 2001 From: mondrake Date: Sun, 26 Jan 2025 11:20:57 +0100 Subject: [PATCH 09/10] fixes --- .../Canon/Exif/Functions2/AEBShotCount.php | 2 +- .../media-dumps/image/bug3017880.jpg.dump.yml | 2 +- .../image/camera/apple-iphone6s.jpg.dump.yml | 110 +++++++-------- .../image/camera/apple-iphone7.JPG.dump.yml | 132 ++++++++--------- .../camera/canon-powershot-s60.jpg.dump.yml | 6 + .../camera/canon_eos_70d_29.jpg.dump.yml | 45 +++++- tests/media-dumps/image/pel-157.tiff.dump.yml | 133 ++++++++++-------- 7 files changed, 224 insertions(+), 206 deletions(-) diff --git a/src/Entry/Vendor/Canon/Exif/Functions2/AEBShotCount.php b/src/Entry/Vendor/Canon/Exif/Functions2/AEBShotCount.php index 61e85aab2..096d0e0cc 100644 --- a/src/Entry/Vendor/Canon/Exif/Functions2/AEBShotCount.php +++ b/src/Entry/Vendor/Canon/Exif/Functions2/AEBShotCount.php @@ -30,6 +30,6 @@ public static function resolveItemCollectionIndex(?int $components_count, Elemen public function toString(array $options = []): string { $val = $this->getValue($options); - return $this->getMappedText(is_array($val) ? implode(' ', $val) : $val); + return $this->getMappedText(is_array($val) ? implode(' ', $val) : $val) ?? ''; } } diff --git a/tests/media-dumps/image/bug3017880.jpg.dump.yml b/tests/media-dumps/image/bug3017880.jpg.dump.yml index 1dfca4db1..b19454bd4 100644 --- a/tests/media-dumps/image/bug3017880.jpg.dump.yml +++ b/tests/media-dumps/image/bug3017880.jpg.dump.yml @@ -185,7 +185,7 @@ gdInfo: mime: image/jpeg exifReadData: FileName: bug3017880.jpg - FileDateTime: 1707676629 + FileDateTime: 1737885056 FileSize: 4900 FileType: 2 MimeType: image/jpeg diff --git a/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml b/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml index 74a50d048..a52345056 100644 --- a/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml +++ b/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml @@ -553,15 +553,16 @@ elements: text: '14 byte(s) of data' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:MakerNoteVersion:1' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: MakerNoteVersion id: '1' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:MakerNoteVersion:1/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -570,15 +571,16 @@ elements: text: '9' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEMatrix:2' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AEMatrix id: '2' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEMatrix:2/entry' class: FileEye\MediaProbe\Entry\Core\Undefined valid: true format: Undefined @@ -611,7 +613,7 @@ elements: format: Char components: 1 bytesHash: 6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b - text: Valid + text: '1' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeValue:value' @@ -668,32 +670,34 @@ elements: text: '0' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEStable:4' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AEStable id: '4' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEStable:4/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong components: 1 bytesHash: b40711a88c7039756fb8a73827eabe2c0fe5a0346ca7e0a104adc0fc764f528d - text: '1' + text: 'Yes' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AETarget:5' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AETarget id: '5' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AETarget:5/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -702,15 +706,16 @@ elements: text: '221' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEAverage:6' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AEAverage id: '6' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEAverage:6/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -719,21 +724,22 @@ elements: text: '223' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AFStable:7' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AFStable id: '7' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AFStable:7/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong components: 1 bytesHash: b40711a88c7039756fb8a73827eabe2c0fe5a0346ca7e0a104adc0fc764f528d - text: '1' + text: 'Yes' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AccelerationVector:8' @@ -806,15 +812,16 @@ elements: text: 283DD1D4-53C7-4C9C-BB23-FDF9F95436D1 - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageCaptureType:20' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ImageCaptureType id: '20' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageCaptureType:20/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -823,15 +830,16 @@ elements: text: '4' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:LivePhotoVideoIndex:23' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: LivePhotoVideoIndex id: '23' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:LivePhotoVideoIndex:23/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -840,15 +848,16 @@ elements: text: '0' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageProcessingFlags:25' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ImageProcessingFlags id: '25' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageProcessingFlags:25/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -857,15 +866,16 @@ elements: text: '0' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:PhotosAppFeatureFlags:31' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: PhotosAppFeatureFlags id: '31' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:PhotosAppFeatureFlags:31/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -1627,43 +1637,17 @@ elements: bytesHash: cde66e78e5419dea74df7cf43d9aa876b8c669d40067992e719cef90ac5f3fe0 text: '2 byte(s) of data' log: - NOTICE: - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' - message: "Unknown item 1/0x1 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' - message: "Unknown item 2/0x2 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' - message: "Unknown item 4/0x4 in 'Apple'" + WARNING: - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' - message: "Unknown item 5/0x5 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' - message: "Unknown item 6/0x6 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' - message: "Unknown item 7/0x7 in 'Apple'" + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:LivePhotoVideoIndex:23' + message: "Found SignedLong data format, expected Undefined for item 'LivePhotoVideoIndex' in 'Apple'" + NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:9' message: "Unknown item 9/0x9 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:14' message: "Unknown item 14/0xE in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' - message: "Unknown item 20/0x14 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' - message: "Unknown item 23/0x17 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' - message: "Unknown item 25/0x19 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' - message: "Unknown item 31/0x1F in 'Apple'" gdInfo: 0: 4032 1: 3024 diff --git a/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml b/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml index 2149b9d49..c7197eab6 100644 --- a/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml +++ b/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml @@ -553,15 +553,16 @@ elements: text: '14 byte(s) of data' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:MakerNoteVersion:1' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: MakerNoteVersion id: '1' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:MakerNoteVersion:1/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -570,15 +571,16 @@ elements: text: '9' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEMatrix:2' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AEMatrix id: '2' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEMatrix:2/entry' class: FileEye\MediaProbe\Entry\Core\Undefined valid: true format: Undefined @@ -611,7 +613,7 @@ elements: format: Char components: 1 bytesHash: 6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b - text: Valid + text: '1' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeValue:value' @@ -668,32 +670,34 @@ elements: text: '0' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEStable:4' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AEStable id: '4' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEStable:4/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong components: 1 bytesHash: b40711a88c7039756fb8a73827eabe2c0fe5a0346ca7e0a104adc0fc764f528d - text: '1' + text: 'Yes' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AETarget:5' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AETarget id: '5' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AETarget:5/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -702,15 +706,16 @@ elements: text: '165' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEAverage:6' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AEAverage id: '6' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AEAverage:6/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -719,21 +724,22 @@ elements: text: '162' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AFStable:7' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: AFStable id: '7' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AFStable:7/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong components: 1 bytesHash: b40711a88c7039756fb8a73827eabe2c0fe5a0346ca7e0a104adc0fc764f528d - text: '1' + text: 'Yes' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AccelerationVector:8' @@ -754,15 +760,16 @@ elements: text: '-0.9991062118278 0.077602872134769 0.11136580706781' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:12' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:FocusDistanceRange:12' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: FocusDistanceRange id: '12' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:12/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:FocusDistanceRange:12/entry' class: FileEye\MediaProbe\Entry\Core\SignedRational valid: true format: SignedRational @@ -840,21 +847,22 @@ elements: text: 6AB558E4-C30A-487F-9443-29F4B3CC1F4E - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageCaptureType:20' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ImageCaptureType id: '20' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageCaptureType:20/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong components: 1 bytesHash: b40711a88c7039756fb8a73827eabe2c0fe5a0346ca7e0a104adc0fc764f528d - text: '1' + text: ProRAW - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:22' @@ -874,15 +882,16 @@ elements: text: Aaonjq1yJePknSSYF/Tu0r00cTL9 - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:LivePhotoVideoIndex:23' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: LivePhotoVideoIndex id: '23' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:LivePhotoVideoIndex:23/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -891,15 +900,16 @@ elements: text: '0' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageProcessingFlags:25' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ImageProcessingFlags id: '25' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageProcessingFlags:25/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -908,15 +918,16 @@ elements: text: '0' - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:26' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:QualityHint:26' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: QualityHint id: '26' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:26/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:QualityHint:26/entry' class: FileEye\MediaProbe\Entry\Core\Ascii valid: true format: Ascii @@ -925,15 +936,16 @@ elements: text: q825s - node: tag - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:PhotosAppFeatureFlags:31' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: PhotosAppFeatureFlags id: '31' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31/entry' + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:PhotosAppFeatureFlags:31/entry' class: FileEye\MediaProbe\Entry\Core\SignedLong valid: true format: SignedLong @@ -1670,28 +1682,11 @@ elements: bytesHash: cde66e78e5419dea74df7cf43d9aa876b8c669d40067992e719cef90ac5f3fe0 text: '2 byte(s) of data' log: - NOTICE: - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:1' - message: "Unknown item 1/0x1 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:2' - message: "Unknown item 2/0x2 in 'Apple'" + WARNING: - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:4' - message: "Unknown item 4/0x4 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:5' - message: "Unknown item 5/0x5 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:6' - message: "Unknown item 6/0x6 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:7' - message: "Unknown item 7/0x7 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:12' - message: "Unknown item 12/0xC in 'Apple'" + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:LivePhotoVideoIndex:23' + message: "Found SignedLong data format, expected Undefined for item 'LivePhotoVideoIndex' in 'Apple'" + NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:13' message: "Unknown item 13/0xD in 'Apple'" @@ -1701,24 +1696,9 @@ log: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:16' message: "Unknown item 16/0x10 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:20' - message: "Unknown item 20/0x14 in 'Apple'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:22' message: "Unknown item 22/0x16 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:23' - message: "Unknown item 23/0x17 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:25' - message: "Unknown item 25/0x19 in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:26' - message: "Unknown item 26/0x1A in 'Apple'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:31' - message: "Unknown item 31/0x1F in 'Apple'" gdInfo: 0: 4032 1: 3024 diff --git a/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml b/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml index 8a823cad5..cfc7c53c8 100644 --- a/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml @@ -2780,9 +2780,15 @@ log: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1' message: "Could not access value for item 'SRAWQuality' in 'CanonCameraSettings', overflow" + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1' + message: "Could not access value for item 'Clarity' in 'CanonCameraSettings', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13' message: "Could not access value for item 'LensSerialNumber' in 'CanonCameraInfo', overflow" + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraInfo:13' + message: "Could not access value for item 'FirmwareVersion' in 'CanonCameraInfo', overflow" NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:0' diff --git a/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml b/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml index 75109943a..d833cadd3 100644 --- a/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml @@ -3062,6 +3062,24 @@ elements: components: 1 bytesHash: 1e6d00abf635c966c404b16b34d3dd30955fe05a6398b4d5e9838daa9a3662f7 text: '13.63 m' + - + node: tag + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:ShutterMode:23' + class: FileEye\MediaProbe\Block\Tiff\Tag + valid: true + name: ShutterMode + id: '23' + collection: Tiff\Tag + elements: + - + node: entry + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:ShutterMode:23/entry' + class: FileEye\MediaProbe\Entry\Core\SignedShort + valid: true + format: SignedShort + components: 1 + bytesHash: 96a296d224f285c67bee93c30f8a309157f0daa35dc5b87e410b78630a09cfc7 + text: Mechanical - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147/tag:FlashExposureLock:25' @@ -3322,7 +3340,7 @@ elements: format: SignedLong components: 2 bytesHash: 35be322d094f9d154a8aba4733b8497f180353bd7ae7b0a15f90b586b549f28b - text: '3 shots' + text: '' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:SafetyShift:264' @@ -3646,7 +3664,7 @@ elements: format: SignedLong components: 1 bytesHash: 9d9f290527a6be626a8f5985b26e19b237b44872b03631811df4416fc1713178 - text: 'Monochrome, WB corrected' + text: '[0], [1]' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:CustomControls:1804' @@ -4475,7 +4493,7 @@ elements: format: SignedShort components: 1 bytesHash: 102b51b9765a56a3e899f7cf0ee38e5251f9c503b357b330a49183eb7b155604 - text: '10 (1DX/5DmkIII/6D/70D/100D/650D/700D/M)' + text: '10 (1DX/5DmkIII/6D/70D/100D/650D/700D/M/M2)' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385/tag:WB_RGGBLevelsAsShot:63' @@ -7239,9 +7257,30 @@ elements: text: '2 byte(s) of data' log: WARNING: + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1' + message: "Could not access value for item 'Clarity' in 'CanonCameraSettings', overflow" + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' + message: "Could not access value for item 'AntiFlicker' in 'CanonFileInfo', overflow" + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonFileInfo:147' + message: "Could not access value for item 'RFLensType' in 'CanonFileInfo', overflow" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:AFMicroadjustment:1287' message: "Found 16 data components, expected 5 for item 'AFMicroadjustment' in 'AutoFocusDrive'" + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonVignettingCorr2:16406' + message: "Could not access value for item 'DistortionCorrectionSetting' in 'CanonVignettingCorr2', overflow" + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonVignettingCorr2:16406' + message: "Could not access value for item 'DigitalLensOptimizerSetting' in 'CanonVignettingCorr2', overflow" + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408' + message: "Could not access value for item 'DigitalLensOptimizer' in 'CanonLightingOpt', overflow" + - + path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonLightingOpt:16408' + message: "Could not access value for item 'DualPixelRaw' in 'CanonLightingOpt', overflow" NOTICE: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/tag:25' diff --git a/tests/media-dumps/image/pel-157.tiff.dump.yml b/tests/media-dumps/image/pel-157.tiff.dump.yml index 834238e27..f26a32e66 100644 --- a/tests/media-dumps/image/pel-157.tiff.dump.yml +++ b/tests/media-dumps/image/pel-157.tiff.dump.yml @@ -65,7 +65,7 @@ elements: format: Long components: 1 bytesHash: df3f619804a92fdb4057192dc43dd748ea778adc52bc498ce80524c014b81119 - text: 'Full-resolution Image' + text: 'Full-resolution image' - node: tag path: '/media/tiff/ifd:IFD0:0/tag:ImageWidth:256' @@ -464,15 +464,16 @@ elements: text: "\r\nG925FXXU6ERF52020-03-27T14:08:39\r\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n " - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20507' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailData:20507' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ThumbnailData id: '20507' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20507/entry' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailData:20507/entry' class: FileEye\MediaProbe\Entry\Core\Byte valid: true format: Byte @@ -481,15 +482,16 @@ elements: text: '255 216 255 196 1 162 0 0 1 5 1 1 1 1 1 1 0 0 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 1 0 3 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 1 2 3 4 5 6 7 8 9 10 11 16 0 2 1 3 3 2 4 3 5 5 4 4 0 0 1 125 1 2 3 0 4 17 5 18 33 49 65 6 19 81 97 7 34 113 20 50 129 145 161 8 35 66 177 193 21 82 209 240 36 51 98 114 130 9 10 22 23 24 25 26 37 38 39 40 41 42 52 53 54 55 56 57 58 67 68 69 70 71 72 73 74 83 84 85 86 87 88 89 90 99 100 101 102 103 104 105 106 115 116 117 118 119 120 121 122 131 132 133 134 135 136 137 138 146 147 148 149 150 151 152 153 154 162 163 164 165 166 167 168 169 170 178 179 180 181 182 183 184 185 186 194 195 196 197 198 199 200 201 202 210 211 212 213 214 215 216 217 218 225 226 227 228 229 230 231 232 233 234 241 242 243 244 245 246 247 248 249 250 17 0 2 1 2 4 4 3 4 7 5 4 4 0 1 2 119 0 1 2 3 17 4 5 33 49 6 18 65 81 7 97 113 19 34 50 129 8 20 66 145 161 177 193 9 35 51 82 240 21 98 114 209 10 22 36 52 225 37 241 23 24 25 26 38 39 40 41 42 53 54 55 56 57 58 67 68 69 70 71 72 73 74 83 84 85 86 87 88 89 90 99 100 101 102 103 104 105 106 115 116 117 118 119 120 121 122 130 131 132 133 134 135 136 137 138 146 147 148 149 150 151 152 153 154 162 163 164 165 166 167 168 169 170 178 179 180 181 182 183 184 185 186 194 195 196 197 198 199 200 201 202 210 211 212 213 214 215 216 217 218 226 227 228 229 230 231 232 233 234 242 243 244 245 246 247 248 249 250 255 219 0 132 0 21 14 16 18 16 13 21 18 17 18 24 22 21 25 31 52 34 31 29 29 31 64 46 48 38 52 76 67 80 79 75 67 73 72 84 94 121 102 84 89 114 90 72 73 105 143 106 114 124 128 135 136 135 81 101 148 159 147 131 157 121 132 135 130 1 22 24 24 31 28 31 62 34 34 62 130 86 73 86 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 130 255 192 0 17 8 1 16 1 224 3 1 33 0 2 17 1 3 17 1 255 218 0 12 3 1 0 2 17 3 17 0 63 0 185 75 90 153 133 37 0 24 163 20 0 148 83 0 160 208 2 81 64 5 20 0 180 80 2 81 64 5 37 0 20 80 32 162 128 16 211 77 0 37 20 192 74 40 0 162 128 18 138 0 74 90 0 40 160 2 138 0 40 160 4 162 128 10 40 0 164 166 1 69 0 37 20 0 82 80 1 69 0 20 148 0 81 64 23 104 168 24 180 80 1 69 0 20 80 2 26 74 96 20 80 1 69 0 20 80 1 69 0 20 148 0 81 64 130 146 128 16 210 80 1 73 76 4 52 80 1 65 160 4 162 128 10 40 0 162 128 10 40 0 162 128 10 74 0 90 40 1 41 41 128 81 64 5 37 0 20 80 1 73 64 5 37 0 20 80 5 234 74 145 134 104 160 5 163 52 0 102 140 208 2 102 146 128 10 90 0 41 40 0 162 128 10 90 0 74 40 1 51 69 2 16 209 64 8 105 166 152 0 162 128 10 74 0 40 160 2 138 0 74 40 0 165 160 2 138 0 74 40 0 162 128 10 40 1 40 160 4 162 152 5 37 0 20 80 2 81 64 9 69 0 20 80 5 234 74 145 133 37 0 45 20 0 81 64 9 69 0 20 162 128 22 144 208 1 69 0 20 80 2 81 64 13 52 10 4 20 148 0 26 105 166 1 69 0 45 37 0 20 148 0 180 148 0 81 64 5 20 0 81 64 5 20 0 148 80 1 69 0 37 20 0 148 83 0 164 160 2 138 0 74 40 1 40 160 2 146 128 47 102 150 164 98 82 80 1 74 40 0 162 128 10 74 0 41 104 0 162 128 10 74 0 51 75 64 9 69 0 37 38 40 16 81 64 8 105 40 0 163 20 192 40 160 4 52 148 0 81 64 5 20 0 81 64 5 20 0 81 64 5 37 0 20 80 2 81 64 5 37 48 10 74 0 40 160 4 162 128 10 74 0 40 160 11 148 84 140 90 40 0 165 160 2 138 64 20 148 192 40 160 2 138 0 74 40 0 162 128 10 40 1 40 160 65 73 64 5 37 0 24 162 128 18 138 96 37 20 0 148 80 1 75 64 9 69 0 20 80 1 69 0 20 148 0 81 64 9 69 48 18 138 0 41 40 0 162 128 18 138 0 41 40 0 162 128 46 209 82 49 104 197 0 20 82 0 162 128 10 41 128 148 80 2 82 208 1 69 0 20 148 0 81 64 5 37 2 10 40 1 40 160 4 160 208 2 81 76 2 146 128 10 40 0 162 128 18 150 128 10 74 0 40 160 2 138 0 74 40 0 164 166 2 81 64 5 20 0 148 80 1 69 0 37 20 0 148 80 5 209 75 82 48 165 164 2 81 64 5 20 0 148 83 0 162 128 18 150 128 10 40 0 162 128 10 74 0 40 160 4 162 129 9 69 0 37 20 0 148 83 0 164 160 2 138 0 40 160 2 146 128 10 40 0 162 128 10 40 1 40 160 2 146 152 9 69 0 20 80 2 81 64 5 20 0 148 80 1 69 0 92 165 169 24 81 72 2 138 0 40 160 4 162 152 5 45 0 37 20 0 184 162 144 5 37 0 20 83 0 162 128 18 146 129 5 37 0 6 146 128 18 138 96 20 148 0 81 64 5 20 0 81 64 9 69 0 20 80 1 69 0 37 20 0 148 83 0 164 160 2 138 0 41 40 0 162 128 10 74 0 40 160 11 184 162 164 97 69 32 10 40 0 162 128 10 41 128 148 180 0 81 72 2 138 0 41 40 0 162 128 10 41 128 148 98 128 12 82 80 32 164 52 0 148 134 128 10 74 96 45 20 0 148 80 1 69 0 37 45 0 37 20 0 81 64 9 69 0 37 20 192 40 160 4 162 128 10 40 0 164 160 2 138 0 74 40 2 237 25 169 24 153 162 128 10 90 0 40 164 1 69 0 20 80 2 209 64 9 69 0 20 148 0 180 80 1 69 0 20 148 0 148 134 152 132 160 208 1 73 64 9 69 48 10 40 1 40 160 2 138 0 40 160 0 2 78 0 36 251 83 204 50 129 147 19 129 234 84 210 184 17 209 76 4 162 128 10 74 0 40 166 1 69 0 37 20 0 81 64 5 37 0 20 148 1 123 20 98 160 98 133 62 148 155 104 0 218 104 197 0 20 80 1 69 0 20 80 1 69 0 20 148 0 81 138 0 40 160 2 138 0 74 13 48 18 146 129 9 69 0 20 148 0 81 64 5 42 161 108 237 228 142 212 0 197 101 108 237 96 216 244 57 162 128 10 41 128 84 240 219 51 141 205 242 39 169 239 244 164 221 129 11 45 244 86 131 203 183 198 243 198 115 201 252 106 142 249 238 207 153 51 182 206 195 214 161 106 203 217 18 209 90 16 37 20 0 82 80 1 69 48 10 40 1 40 160 2 138 0 74 40 0 164 160 13 79 42 156 35 21 157 202 29 180 82 109 20 134 49 133 70 105 161 13 162 152 130 138 0 40 160 2 138 0 40 160 2 138 0 40 160 4 162 128 18 146 152 5 37 2 12 81 64 5 37 0 20 80 2 82 16 8 193 25 7 177 160 10 179 216 163 13 209 13 143 219 158 42 163 75 119 111 195 179 99 253 174 69 75 211 98 150 164 137 169 55 241 198 167 232 113 86 205 221 184 181 18 103 116 142 14 213 207 221 247 52 115 7 41 115 78 49 11 5 185 184 120 218 65 215 230 24 7 232 59 213 75 139 233 238 220 164 60 47 115 83 123 142 214 27 29 178 39 45 243 183 169 169 84 109 80 57 56 245 57 173 18 177 45 133 20 196 20 148 0 81 64 5 37 48 10 40 0 162 128 18 138 0 41 40 0 162 128 54 105 9 197 100 88 3 72 104 1 140 106 34 41 161 9 138 74 98 10 90 0 41 40 0 165 160 4 162 128 10 40 0 162 128 18 146 128 10 74 96 24 165 197 0 37 20 0 148 148 8 40 160 4 162 128 10 66 50 8 35 32 246 160 10 183 218 60 134 35 52 40 20 128 73 143 60 145 235 89 17 28 182 57 218 125 43 54 90 44 111 1 112 78 71 165 93 183 185 133 45 70 208 119 1 247 71 115 245 161 59 3 39 130 67 44 42 236 187 73 234 41 245 162 32 40 166 1 73 64 5 20 0 81 64 9 69 48 10 40 1 40 160 2 138 0 40 160 13 138 67 89 22 33 163 20 0 211 77 41 154 98 24 69 55 20 192 40 160 66 81 64 11 69 0 20 80 2 81 64 5 20 0 148 80 1 138 40 0 162 128 18 146 152 9 69 2 18 138 0 100 146 44 107 185 242 7 168 4 210 193 113 3 72 167 122 48 207 66 122 254 20 12 210 149 109 174 65 216 72 112 58 170 241 248 213 54 186 183 180 7 0 180 131 185 199 31 74 207 155 161 86 234 82 150 123 171 204 128 197 34 110 190 255 0 227 81 255 0 103 197 180 134 102 57 244 226 154 136 54 80 150 194 100 149 130 33 100 3 33 135 122 45 25 35 148 7 0 174 121 7 181 22 176 94 230 205 21 161 1 73 64 5 20 0 82 80 1 69 0 37 20 192 40 160 4 162 128 10 40 0 162 128 53 201 164 205 100 88 102 138 0 74 40 0 197 5 69 0 49 147 210 163 42 105 136 109 20 196 45 20 0 81 138 0 49 69 0 20 148 0 81 138 0 40 160 4 162 128 18 146 152 9 69 2 10 40 0 170 243 218 67 32 39 97 13 234 157 77 38 52 85 62 117 156 68 46 224 173 212 231 252 226 173 67 20 69 22 64 55 100 103 45 205 74 69 54 77 73 86 64 85 123 139 72 230 4 227 107 159 226 20 52 50 88 211 100 106 155 139 96 99 38 157 76 65 73 64 5 20 0 82 80 1 69 0 37 20 192 40 160 2 138 0 74 90 0 74 40 3 79 52 181 145 97 154 51 64 11 154 76 208 1 78 6 128 10 99 10 0 140 169 244 166 226 168 145 113 69 0 20 80 1 69 0 24 164 160 2 138 0 74 40 1 40 160 4 162 128 18 138 96 37 20 8 41 40 1 8 200 193 25 20 212 69 69 218 163 3 210 128 29 73 64 5 20 192 74 40 0 162 128 10 74 0 41 40 0 162 128 10 74 96 20 80 1 69 0 20 80 1 69 0 105 81 89 22 38 104 205 48 23 52 82 0 165 160 5 162 128 10 77 162 128 16 173 52 173 49 13 197 46 40 1 40 166 1 73 64 130 146 128 10 13 0 37 37 0 20 148 0 82 83 1 40 160 66 81 64 5 20 0 148 80 2 81 76 2 138 0 74 40 0 164 160 2 146 128 10 40 0 162 152 9 69 0 20 80 1 69 0 20 148 1 167 72 107 50 132 163 52 0 102 151 52 0 82 210 1 115 69 3 19 52 185 160 3 52 211 76 67 104 160 4 162 128 10 41 128 148 80 33 40 160 4 164 160 2 146 128 18 138 96 37 20 8 40 160 4 162 128 10 74 0 40 160 2 146 152 5 37 0 20 148 0 82 80 1 69 0 20 80 2 81 76 2 138 0 40 160 2 138 0 191 186 147 117 102 80 102 140 208 1 75 154 0 51 75 154 0 51 70 104 0 205 0 208 2 210 26 0 74 40 1 40 160 2 138 98 10 74 0 41 40 1 40 160 4 162 128 18 146 128 10 74 96 20 80 32 164 160 2 146 128 10 40 0 164 166 1 73 64 9 69 0 20 148 0 81 64 5 20 0 81 64 9 69 48 10 40 0 162 144 23 40 169 24 82 208 48 165 160 2 138 64 20 162 128 22 140 80 2 129 78 217 64 11 178 143 44 82 1 165 41 165 72 166 3 104 166 2 129 154 82 180 128 2 154 54 208 3 72 166 154 96 54 138 4 33 164 160 2 146 152 130 138 0 40 160 4 162 128 10 74 0 41 41 128 82 80 1 73 64 5 20 0 148 80 1 69 0 20 80 1 69 0 20 80 1 69 0 90 165 169 24 82 208 48 165 2 128 22 148 12 210 1 118 209 138 0 0 167 1 64 15 11 75 138 67 22 144 208 2 82 26 0 97 90 80 162 129 11 180 81 138 6 46 41 8 160 6 21 166 48 166 33 152 162 152 132 52 148 0 98 146 128 10 41 128 148 80 33 40 160 2 146 128 10 74 96 20 148 0 82 80 1 69 0 20 148 0 81 64 5 20 0 81 64 5 20 0 82 208 5 170 42 70 20 180 12 5 58 128 20 82 138 64 62 140 82 24 98 156 5 0 45 45 0 37 20 0 148 148 0 98 150 128 10 40 0 164 52 0 211 76 106 4 48 138 105 170 16 148 80 2 81 64 9 69 48 10 74 4 20 148 0 82 80 1 73 76 2 146 128 10 40 1 40 160 2 138 0 41 40 0 162 128 10 40 0 165 160 3 20 80 5 170 42 70 45 20 12 90 81 72 7 10 81 64 14 20 180 134 45 45 0 20 80 2 19 73 154 0 90 74 0 41 104 1 51 70 104 1 51 73 154 0 66 105 166 129 12 52 132 85 0 148 148 8 41 40 0 164 166 1 69 0 37 37 2 10 40 1 40 160 4 162 152 5 37 0 20 80 2 81 64 5 20 0 82 80 1 75 64 10 5 46 40 1 113 72 69 33 150 41 113 72 3 20 224 180 134 40 90 92 80 0 41 65 160 5 6 157 154 67 10 92 208 1 154 51 64 9 73 154 0 76 209 154 0 51 70 104 0 38 155 154 0 51 70 104 16 132 210 83 1 166 146 128 10 74 98 18 146 128 10 74 0 40 166 2 81 64 132 162 128 10 40 1 40 160 4 162 152 9 69 0 20 80 1 73 64 5 20 0 82 208 2 208 13 33 139 154 13 0 78 41 194 144 199 1 75 72 5 162 129 134 40 197 32 23 20 180 0 82 208 1 73 64 5 37 0 37 37 0 25 164 205 2 16 154 76 211 0 205 25 160 3 52 80 2 82 80 1 73 76 66 81 64 5 20 0 148 80 2 98 131 76 2 146 129 5 20 0 134 147 20 0 98 147 20 0 98 138 96 37 20 0 81 64 11 138 76 80 1 138 40 1 104 160 5 20 26 67 39 6 157 154 67 20 26 118 105 0 180 82 24 180 225 64 6 40 197 0 46 41 49 64 5 37 0 37 37 0 20 134 128 19 20 98 152 132 34 146 128 10 40 1 40 160 2 146 128 10 74 98 10 40 1 40 160 2 146 128 10 107 144 170 88 244 2 128 22 138 96 20 80 2 80 104 16 148 80 2 81 138 0 74 41 128 81 64 5 20 0 81 64 5 20 128 90 40 25 61 20 128 112 167 10 67 28 41 194 144 197 162 128 22 138 0 40 160 4 52 148 0 148 80 1 138 76 80 1 70 40 1 8 164 34 129 5 33 20 192 74 74 0 41 41 136 41 40 0 162 128 10 40 1 40 197 0 24 166 200 62 67 64 14 164 197 0 20 148 192 41 40 0 162 129 9 70 40 0 197 37 0 20 83 0 163 20 128 41 104 0 162 129 137 69 0 79 69 32 22 156 13 33 142 6 156 13 33 142 20 80 1 69 0 20 185 160 4 164 52 0 148 80 2 209 64 9 69 0 20 152 160 4 197 20 0 220 26 66 13 49 9 73 76 2 138 4 20 80 2 82 129 64 11 182 141 180 0 152 166 200 62 95 196 127 58 0 92 81 138 0 67 72 104 1 49 69 48 18 138 4 20 80 1 138 76 80 1 138 40 0 162 128 10 40 1 40 160 2 146 129 150 40 164 1 75 64 197 6 158 166 144 15 20 180 134 20 80 2 81 64 5 20 0 148 80 2 209 64 9 69 0 20 80 2 81 64 5 33 160 6 145 73 138 98 19 20 98 128 23 105 163 97 160 5 219 74 22 128 23 109 46 218 64 38 218 108 139 242 143 247 135 243 160 1 134 42 58 96 33 52 153 166 32 205 20 0 148 83 1 40 160 2 138 0 41 40 16 80 72 3 36 224 122 154 0 129 239 109 99 251 211 167 224 115 252 170 35 169 66 127 213 164 178 127 186 159 227 73 201 34 148 88 211 123 59 125 203 76 123 187 226 154 100 189 124 252 209 71 244 4 154 135 50 148 6 152 166 113 137 110 165 62 203 133 254 84 211 105 17 251 193 159 253 230 38 161 201 178 148 81 179 75 91 25 5 20 12 81 79 74 64 72 40 164 48 162 128 10 40 0 162 128 10 74 0 90 74 0 40 160 2 146 128 10 40 0 162 128 18 140 80 2 109 165 197 2 23 20 180 12 49 75 138 0 40 160 2 153 47 65 254 240 254 116 0 143 205 70 69 52 33 173 73 76 65 75 64 6 40 197 0 52 138 67 76 8 228 158 24 135 239 37 69 250 181 64 218 141 176 56 86 105 15 162 41 52 155 72 18 108 97 191 145 142 34 180 115 158 238 193 105 190 125 243 103 2 24 199 208 147 80 230 90 128 98 119 24 146 229 255 0 224 0 45 51 236 113 49 203 238 144 250 187 19 80 228 217 74 41 18 44 49 32 249 81 71 208 82 226 164 161 198 138 0 74 40 3 70 150 186 12 2 138 0 81 79 94 41 12 120 52 102 144 194 138 0 40 160 2 150 128 18 138 0 40 160 4 162 128 18 140 208 1 75 64 5 20 0 148 180 0 82 208 1 69 0 45 20 0 81 64 9 154 100 135 238 127 188 40 1 77 52 208 33 132 83 106 132 49 229 142 49 153 29 84 123 156 84 45 168 90 175 73 55 159 246 20 183 242 164 221 134 144 195 168 231 136 237 164 111 118 33 69 48 221 94 55 68 138 63 169 45 254 21 46 69 40 141 99 116 249 221 115 128 123 34 1 252 243 76 54 234 231 247 143 35 255 0 188 230 161 201 148 162 133 91 120 147 238 198 163 240 167 133 3 160 169 40 82 58 82 154 0 64 40 160 2 138 0 40 160 2 146 128 52 104 174 131 1 104 160 5 20 224 105 12 112 52 102 144 197 205 25 160 3 52 102 128 22 138 0 41 40 0 162 128 18 138 0 74 40 0 162 128 22 138 0 40 160 5 165 160 2 138 0 40 160 3 52 153 160 4 36 14 166 171 79 123 109 27 46 233 211 33 185 27 185 232 105 1 11 234 144 127 203 52 150 83 254 202 99 249 212 127 218 51 183 221 181 3 253 231 255 0 235 82 230 31 40 199 158 241 248 223 28 99 253 149 201 253 106 38 133 223 253 109 196 175 237 187 3 244 169 114 101 40 161 22 218 21 57 17 174 125 72 205 73 128 56 169 184 197 20 234 6 20 80 1 69 0 20 26 0 74 40 0 237 69 0 4 224 100 240 61 234 23 187 183 79 189 58 126 7 63 202 128 33 125 78 217 122 22 127 247 87 252 106 7 213 215 63 36 36 253 91 20 236 43 157 29 21 185 136 180 80 1 75 64 197 6 151 52 128 51 70 104 0 205 40 52 0 185 165 164 48 162 128 10 74 0 41 40 0 162 128 18 150 128 10 40 1 104 160 2 151 52 0 100 14 166 153 36 241 70 51 36 168 163 221 177 72 10 207 169 219 3 132 47 33 255 0 97 9 253 106 54 212 156 255 0 171 181 127 248 27 1 254 52 155 42 196 79 121 122 223 116 67 31 224 88 212 67 237 4 16 247 82 144 78 112 56 255 0 235 212 185 15 148 67 2 49 203 130 231 253 182 45 252 233 194 52 81 242 168 31 65 74 227 176 184 161 71 20 134 45 45 0 6 155 64 11 75 64 5 20 0 81 64 12 121 162 79 191 34 47 213 133 68 215 182 195 254 90 103 232 164 209 96 35 55 233 156 44 82 19 239 129 80 207 168 203 24 200 129 87 234 217 167 97 92 170 218 165 203 116 42 159 69 255 0 26 133 238 238 92 252 211 63 224 113 252 170 172 43 144 156 177 201 36 159 122 13 2 10 40 3 255 217' - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20512' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailImageWidth:20512' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ThumbnailImageWidth id: '20512' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20512/entry' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailImageWidth:20512/entry' class: FileEye\MediaProbe\Entry\Core\Long valid: true format: Long @@ -498,15 +500,16 @@ elements: text: '480' - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20513' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailImageHeight:20513' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ThumbnailImageHeight id: '20513' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20513/entry' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailImageHeight:20513/entry' class: FileEye\MediaProbe\Entry\Core\Long valid: true format: Long @@ -515,15 +518,16 @@ elements: text: '272' - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20515' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailCompression:20515' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ThumbnailCompression id: '20515' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20515/entry' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailCompression:20515/entry' class: FileEye\MediaProbe\Entry\Core\Short valid: true format: Short @@ -532,15 +536,16 @@ elements: text: '6' - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20521' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailOrientation:20521' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ThumbnailOrientation id: '20521' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20521/entry' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailOrientation:20521/entry' class: FileEye\MediaProbe\Entry\Core\Short valid: true format: Short @@ -549,15 +554,16 @@ elements: text: '1' - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20525' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailResolutionX:20525' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ThumbnailResolutionX id: '20525' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20525/entry' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailResolutionX:20525/entry' class: FileEye\MediaProbe\Entry\Core\Rational valid: true format: Rational @@ -566,15 +572,16 @@ elements: text: '72' - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20526' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailResolutionY:20526' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ThumbnailResolutionY id: '20526' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20526/entry' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailResolutionY:20526/entry' class: FileEye\MediaProbe\Entry\Core\Rational valid: true format: Rational @@ -583,15 +590,16 @@ elements: text: '72' - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20528' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailResolutionUnit:20528' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ThumbnailResolutionUnit id: '20528' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20528/entry' + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailResolutionUnit:20528/entry' class: FileEye\MediaProbe\Entry\Core\Short valid: true format: Short @@ -600,15 +608,16 @@ elements: text: '2' - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20624' + path: '/media/tiff/ifd:IFD0:0/tag:LuminanceTable:20624' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: LuminanceTable id: '20624' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20624/entry' + path: '/media/tiff/ifd:IFD0:0/tag:LuminanceTable:20624/entry' class: FileEye\MediaProbe\Entry\Core\Short valid: true format: Short @@ -617,15 +626,16 @@ elements: text: '3 3 3 3 3 3 3 4 3 3 3 3 3 3 3 4 3 3 3 3 3 3 4 5 3 3 3 3 3 4 5 6 3 3 3 3 5 6 7 8 3 3 3 4 6 8 9 12 3 3 4 5 7 9 12 15 4 4 5 6 8 12 15 21' - node: tag - path: '/media/tiff/ifd:IFD0:0/tag:20625' + path: '/media/tiff/ifd:IFD0:0/tag:ChrominanceTable:20625' class: FileEye\MediaProbe\Block\Tiff\Tag valid: true + name: ChrominanceTable id: '20625' - collection: Tiff\UnknownTag + collection: Tiff\Tag elements: - node: entry - path: '/media/tiff/ifd:IFD0:0/tag:20625/entry' + path: '/media/tiff/ifd:IFD0:0/tag:ChrominanceTable:20625/entry' class: FileEye\MediaProbe\Entry\Core\Short valid: true format: Short @@ -1646,51 +1656,50 @@ log: path: '/media/tiff/ifd:IFD0:0/tag:ExtraSamples:338' message: "Found Short data format, expected Undefined for item 'ExtraSamples' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:BrightnessValue:37379' - message: "Found Rational data format, expected SignedRational for item 'BrightnessValue' in 'ExifIFD'" + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailData:20507' + message: "Found Byte data format, expected Undefined for item 'ThumbnailData' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' - message: "Found Undefined data format, expected Byte for item 'GPSVersionID' in 'GPS'" + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailImageWidth:20512' + message: "Found Long data format, expected Undefined for item 'ThumbnailImageWidth' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:ExifImageWidth:40962' - message: "Found Long data format, expected Short for item 'ExifImageWidth' in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailImageHeight:20513' + message: "Found Long data format, expected Undefined for item 'ThumbnailImageHeight' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:ExifImageHeight:40963' - message: "Found Long data format, expected Short for item 'ExifImageHeight' in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailCompression:20515' + message: "Found Short data format, expected Undefined for item 'ThumbnailCompression' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:FocalLengthIn35mmFormat:41989' - message: "Found Long data format, expected Short for item 'FocalLengthIn35mmFormat' in 'IFD0'" - NOTICE: + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailOrientation:20521' + message: "Found Short data format, expected Undefined for item 'ThumbnailOrientation' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:20507' - message: "Unknown item 20507/0x501B in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailResolutionX:20525' + message: "Found Rational data format, expected Undefined for item 'ThumbnailResolutionX' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:20512' - message: "Unknown item 20512/0x5020 in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailResolutionY:20526' + message: "Found Rational data format, expected Undefined for item 'ThumbnailResolutionY' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:20513' - message: "Unknown item 20513/0x5021 in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:ThumbnailResolutionUnit:20528' + message: "Found Short data format, expected Undefined for item 'ThumbnailResolutionUnit' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:20515' - message: "Unknown item 20515/0x5023 in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:LuminanceTable:20624' + message: "Found Short data format, expected Undefined for item 'LuminanceTable' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:20521' - message: "Unknown item 20521/0x5029 in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:ChrominanceTable:20625' + message: "Found Short data format, expected Undefined for item 'ChrominanceTable' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:20525' - message: "Unknown item 20525/0x502D in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/tag:BrightnessValue:37379' + message: "Found Rational data format, expected SignedRational for item 'BrightnessValue' in 'ExifIFD'" - - path: '/media/tiff/ifd:IFD0:0/tag:20526' - message: "Unknown item 20526/0x502E in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/ifd:GPS:34853/tag:GPSVersionID:0' + message: "Found Undefined data format, expected Byte for item 'GPSVersionID' in 'GPS'" - - path: '/media/tiff/ifd:IFD0:0/tag:20528' - message: "Unknown item 20528/0x5030 in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:ExifImageWidth:40962' + message: "Found Long data format, expected Short for item 'ExifImageWidth' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:20624' - message: "Unknown item 20624/0x5090 in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:ExifImageHeight:40963' + message: "Found Long data format, expected Short for item 'ExifImageHeight' in 'IFD0'" - - path: '/media/tiff/ifd:IFD0:0/tag:20625' - message: "Unknown item 20625/0x5091 in 'IFD0'" + path: '/media/tiff/ifd:IFD0:0/tag:FocalLengthIn35mmFormat:41989' + message: "Found Long data format, expected Short for item 'FocalLengthIn35mmFormat' in 'IFD0'" gdInfo: 0: 3264 1: 1836 From e93c132258d794cba4e3ee8ce669a107c1bc8f6e Mon Sep 17 00:00:00 2001 From: mondrake Date: Sun, 26 Jan 2025 15:46:00 +0100 Subject: [PATCH 10/10] fixes --- specs/ExifMakerNotes/Apple/Main.yaml | 3 ++ specs/ExifMakerNotes/Apple/RunTime.yaml | 1 + .../ExifMakerNotes/Canon/CameraSettings.yaml | 1 + src/Collection/ExifMakerNotes/Apple/Main.php | 3 ++ .../ExifMakerNotes/Apple/RunTime.php | 1 + .../ExifMakerNotes/Canon/CameraSettings.php | 1 + src/Entry/Vendor/Apple/Exif/AFPerformance.php | 14 ++++++++ .../Vendor/Apple/Exif/FocusDistanceRange.php | 16 +++++++++ .../Vendor/Apple/Exif/ImageCaptureType.php | 14 ++++++++ src/Entry/Vendor/Apple/Exif/RunTimeFlags.php | 27 +++++++++++++++ .../Canon/Exif/CameraSettings/FlashBits.php | 32 +++++++++++++++++ .../Canon/Exif/Functions2/AEBShotCount.php | 17 +++------- .../Canon/Exif/Functions2/TimerLength.php | 34 ++++++++++++++----- .../Exif/Functions2/ViewfinderWarnings.php | 6 +--- .../image/broken/canon-eos-650d.jpg.dump.yml | 2 +- .../image/broken/gh-10-b.jpg.dump.yml | 2 +- .../image/camera/apple-iphone11.jpg.dump.yml | 22 ++++++++---- .../image/camera/apple-iphone6s.jpg.dump.yml | 12 ++++--- .../image/camera/apple-iphone7.JPG.dump.yml | 15 +++++--- .../image/camera/canon-ixus-ii.jpg.dump.yml | 2 +- .../camera/canon-powershot-s60.jpg.dump.yml | 2 +- .../camera/canon_eos_70d_29.jpg.dump.yml | 6 ++-- .../camera/canon_eos_850d_08.jpg.dump.yml | 8 +++-- .../image/exiftool/Canon.jpg.dump.yml | 2 +- .../image/exiftool/Canon1DmkIII.jpg.dump.yml | 9 ++--- tests/media-dumps/image/pel-157.tiff.dump.yml | 2 ++ 26 files changed, 194 insertions(+), 60 deletions(-) create mode 100644 src/Entry/Vendor/Apple/Exif/AFPerformance.php create mode 100644 src/Entry/Vendor/Apple/Exif/FocusDistanceRange.php create mode 100644 src/Entry/Vendor/Apple/Exif/ImageCaptureType.php create mode 100644 src/Entry/Vendor/Apple/Exif/RunTimeFlags.php create mode 100644 src/Entry/Vendor/Canon/Exif/CameraSettings/FlashBits.php diff --git a/specs/ExifMakerNotes/Apple/Main.yaml b/specs/ExifMakerNotes/Apple/Main.yaml index acbdef436..54352141c 100644 --- a/specs/ExifMakerNotes/Apple/Main.yaml +++ b/specs/ExifMakerNotes/Apple/Main.yaml @@ -96,6 +96,7 @@ items: DOMNode: 'Apple:BurstUUID' desc: 'Burst UUID' 12: + entryClass: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\FocusDistanceRange exiftool: - name: FocusDistanceRange @@ -121,6 +122,7 @@ items: DOMNode: 'Apple:ContentIdentifier' desc: 'Content Identifier' 20: + entryClass: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\ImageCaptureType exiftool: - name: ImageCaptureType @@ -199,6 +201,7 @@ items: DOMNode: 'Apple:HDRHeadroom' desc: 'HDR Headroom' 35: + entryClass: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\AFPerformance exiftool: - name: AFPerformance diff --git a/specs/ExifMakerNotes/Apple/RunTime.yaml b/specs/ExifMakerNotes/Apple/RunTime.yaml index b8198da01..87cc3a22b 100644 --- a/specs/ExifMakerNotes/Apple/RunTime.yaml +++ b/specs/ExifMakerNotes/Apple/RunTime.yaml @@ -19,6 +19,7 @@ items: DOMNode: 'Apple:RunTimeEpoch' desc: 'Run Time Epoch' flags: + entryClass: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\RunTimeFlags format: Char exiftool: - diff --git a/specs/ExifMakerNotes/Canon/CameraSettings.yaml b/specs/ExifMakerNotes/Canon/CameraSettings.yaml index 123d18907..b92af8ae8 100644 --- a/specs/ExifMakerNotes/Canon/CameraSettings.yaml +++ b/specs/ExifMakerNotes/Canon/CameraSettings.yaml @@ -963,6 +963,7 @@ items: DOMNode: 'Canon:FlashActivity' desc: 'Flash Activity' 29: + entryClass: FileEye\MediaProbe\Entry\Vendor\Canon\Exif\CameraSettings\FlashBits exiftool: - name: FlashBits diff --git a/src/Collection/ExifMakerNotes/Apple/Main.php b/src/Collection/ExifMakerNotes/Apple/Main.php index 343ea762e..0daa7459c 100644 --- a/src/Collection/ExifMakerNotes/Apple/Main.php +++ b/src/Collection/ExifMakerNotes/Apple/Main.php @@ -506,6 +506,7 @@ class Main extends CollectionBase { array ( 0 => array ( + 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Apple\\Exif\\FocusDistanceRange', 'collection' => 'Tiff\\Tag', 'name' => 'FocusDistanceRange', 'title' => 'Focus Distance Range', @@ -549,6 +550,7 @@ class Main extends CollectionBase { array ( 0 => array ( + 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Apple\\Exif\\ImageCaptureType', 'collection' => 'Tiff\\Tag', 'name' => 'ImageCaptureType', 'title' => 'Image Capture Type', @@ -686,6 +688,7 @@ class Main extends CollectionBase { array ( 0 => array ( + 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Apple\\Exif\\AFPerformance', 'collection' => 'Tiff\\Tag', 'name' => 'AFPerformance', 'title' => 'AF Performance', diff --git a/src/Collection/ExifMakerNotes/Apple/RunTime.php b/src/Collection/ExifMakerNotes/Apple/RunTime.php index 5afd91825..b05a3a2ea 100644 --- a/src/Collection/ExifMakerNotes/Apple/RunTime.php +++ b/src/Collection/ExifMakerNotes/Apple/RunTime.php @@ -77,6 +77,7 @@ class RunTime extends CollectionBase { array ( 0 => array ( + 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Apple\\Exif\\RunTimeFlags', 'format' => array ( 0 => 2000, diff --git a/src/Collection/ExifMakerNotes/Canon/CameraSettings.php b/src/Collection/ExifMakerNotes/Canon/CameraSettings.php index 920d11afd..a710d86bc 100644 --- a/src/Collection/ExifMakerNotes/Canon/CameraSettings.php +++ b/src/Collection/ExifMakerNotes/Canon/CameraSettings.php @@ -1528,6 +1528,7 @@ class CameraSettings extends CollectionBase { array ( 0 => array ( + 'entryClass' => 'FileEye\\MediaProbe\\Entry\\Vendor\\Canon\\Exif\\CameraSettings\\FlashBits', 'collection' => 'Tiff\\Tag', 'name' => 'FlashBits', 'title' => 'Flash Bits', diff --git a/src/Entry/Vendor/Apple/Exif/AFPerformance.php b/src/Entry/Vendor/Apple/Exif/AFPerformance.php new file mode 100644 index 000000000..dde70f85c --- /dev/null +++ b/src/Entry/Vendor/Apple/Exif/AFPerformance.php @@ -0,0 +1,14 @@ +getValue($options); + return sprintf('%d %d %d', $value[0], $value[1] >> 28, $value[1] & 0xfffffff); + } +} diff --git a/src/Entry/Vendor/Apple/Exif/FocusDistanceRange.php b/src/Entry/Vendor/Apple/Exif/FocusDistanceRange.php new file mode 100644 index 000000000..6a95d4b34 --- /dev/null +++ b/src/Entry/Vendor/Apple/Exif/FocusDistanceRange.php @@ -0,0 +1,16 @@ +getValue($options); + return $value[0] <= $value[1] ? + sprintf('%4.2f - %4.2f m', $value[0], $value[1]) : + sprintf('%4.2f - %4.2f m', $value[1], $value[0]); + } +} diff --git a/src/Entry/Vendor/Apple/Exif/ImageCaptureType.php b/src/Entry/Vendor/Apple/Exif/ImageCaptureType.php new file mode 100644 index 000000000..354ff23e9 --- /dev/null +++ b/src/Entry/Vendor/Apple/Exif/ImageCaptureType.php @@ -0,0 +1,14 @@ +getValue($options); + return $this->getMappedText($value) ?? sprintf('Unknown (%d)', $value); + } +} diff --git a/src/Entry/Vendor/Apple/Exif/RunTimeFlags.php b/src/Entry/Vendor/Apple/Exif/RunTimeFlags.php new file mode 100644 index 000000000..91f8045c8 --- /dev/null +++ b/src/Entry/Vendor/Apple/Exif/RunTimeFlags.php @@ -0,0 +1,27 @@ +getValue($options); + $ret = []; + for ($i = 0; $i < 32; $i++) { + $mask = 2 ** $i; + if ($value & $mask) { + $text = $this->getMappedText('Bit' . (string) $i); + + if ($text === null) { + $text = '[' . (string) $i . ']'; + } + + $ret[] = $text; + } + } + return implode(', ', $ret); + } +} diff --git a/src/Entry/Vendor/Canon/Exif/CameraSettings/FlashBits.php b/src/Entry/Vendor/Canon/Exif/CameraSettings/FlashBits.php new file mode 100644 index 000000000..7c27353b8 --- /dev/null +++ b/src/Entry/Vendor/Canon/Exif/CameraSettings/FlashBits.php @@ -0,0 +1,32 @@ +getValue($options); + + if ($value === 0) { + return $this->getMappedText($value); + } + + $ret = []; + for ($i = 0; $i < 32; $i++) { + $mask = 2 ** $i; + if ($value & $mask) { + $text = $this->getMappedText('Bit' . (string) $i); + + if ($text === null) { + $text = '[' . (string) $i . ']'; + } + + $ret[] = $text; + } + } + return implode(', ', $ret); + } +} diff --git a/src/Entry/Vendor/Canon/Exif/Functions2/AEBShotCount.php b/src/Entry/Vendor/Canon/Exif/Functions2/AEBShotCount.php index 096d0e0cc..851ffa4ef 100644 --- a/src/Entry/Vendor/Canon/Exif/Functions2/AEBShotCount.php +++ b/src/Entry/Vendor/Canon/Exif/Functions2/AEBShotCount.php @@ -10,23 +10,14 @@ */ class AEBShotCount extends SignedLong { - /** - * {@inheritdoc} - */ public static function resolveItemCollectionIndex(?int $components_count, ElementInterface $context): mixed { - switch ($components_count) { - case 1: - return 0; - - case 2: - return 1; - } + return match ($components_count) { + 1 => 1, + 2 => 2, + }; } - /** - * {@inheritdoc} - */ public function toString(array $options = []): string { $val = $this->getValue($options); diff --git a/src/Entry/Vendor/Canon/Exif/Functions2/TimerLength.php b/src/Entry/Vendor/Canon/Exif/Functions2/TimerLength.php index ebef4156a..e5916ebd6 100644 --- a/src/Entry/Vendor/Canon/Exif/Functions2/TimerLength.php +++ b/src/Entry/Vendor/Canon/Exif/Functions2/TimerLength.php @@ -2,6 +2,7 @@ namespace FileEye\MediaProbe\Entry\Vendor\Canon\Exif\Functions2; +use FileEye\MediaProbe\Model\ElementInterface; use FileEye\MediaProbe\Entry\Core\SignedLong; /** @@ -9,17 +10,32 @@ */ class TimerLength extends SignedLong { - /** - * {@inheritdoc} - */ + public static function resolveItemCollectionIndex(?int $components_count, ElementInterface $context): mixed + { + return match ($components_count) { + 3 => 0, + 4 => 1, + }; + } + public function toString(array $options = []): string { $val = $this->getValue($options); - $ret = []; - $ret[] = $this->getMappedText($val[0]); - $ret[] = '6 s: ' . $val[1]; - $ret[] = '16 s: ' . $val[2]; - $ret[] = 'After release: ' . $val[3]; - return implode('; ', $ret); + + if (count($val) === 4) { + $ret = []; + $ret[] = $this->getMappedText($val[0]); + $ret[] = '6 s: ' . $val[1]; + $ret[] = '16 s: ' . $val[2]; + $ret[] = 'After release: ' . $val[3]; + return implode('; ', $ret); + } + else { + $ret = []; + $ret[] = '6 s: ' . $val[1]; + $ret[] = '16 s: ' . $val[2]; + $ret[] = 'After release: ' . $val[3]; + return implode('; ', $ret); + } } } diff --git a/src/Entry/Vendor/Canon/Exif/Functions2/ViewfinderWarnings.php b/src/Entry/Vendor/Canon/Exif/Functions2/ViewfinderWarnings.php index a55112048..0589301e5 100644 --- a/src/Entry/Vendor/Canon/Exif/Functions2/ViewfinderWarnings.php +++ b/src/Entry/Vendor/Canon/Exif/Functions2/ViewfinderWarnings.php @@ -9,18 +9,14 @@ */ class ViewfinderWarnings extends SignedLong { - /** - * {@inheritdoc} - */ public function toString(array $options = []): string { $value = (int) $this->getValue($options); - $ret = []; for ($i = 0; $i < 32; $i++) { $mask = 2 ** $i; if ($value & $mask) { - $text = $this->getMappedText($mask); + $text = $this->getMappedText('Bit' . (string) $i); if ($text === null) { $text = '[' . (string) $i . ']'; diff --git a/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml b/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml index c030c0b7c..8fe822138 100644 --- a/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml +++ b/tests/media-dumps/image/broken/canon-eos-650d.jpg.dump.yml @@ -1139,7 +1139,7 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29/entry' - class: FileEye\MediaProbe\Entry\Core\SignedShort + class: FileEye\MediaProbe\Entry\Vendor\Canon\Exif\CameraSettings\FlashBits valid: true format: SignedShort components: 1 diff --git a/tests/media-dumps/image/broken/gh-10-b.jpg.dump.yml b/tests/media-dumps/image/broken/gh-10-b.jpg.dump.yml index 29ff21725..d4731f863 100644 --- a/tests/media-dumps/image/broken/gh-10-b.jpg.dump.yml +++ b/tests/media-dumps/image/broken/gh-10-b.jpg.dump.yml @@ -1191,7 +1191,7 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29/entry' - class: FileEye\MediaProbe\Entry\Core\SignedShort + class: FileEye\MediaProbe\Entry\Vendor\Canon\Exif\CameraSettings\FlashBits valid: true format: SignedShort components: 1 diff --git a/tests/media-dumps/image/camera/apple-iphone11.jpg.dump.yml b/tests/media-dumps/image/camera/apple-iphone11.jpg.dump.yml index 8f98f0ac9..e392a8a53 100644 --- a/tests/media-dumps/image/camera/apple-iphone11.jpg.dump.yml +++ b/tests/media-dumps/image/camera/apple-iphone11.jpg.dump.yml @@ -1,3 +1,11 @@ +skip: + exiftool: + - 'Apple:AEMatrix' + - 'Apple:ImageProcessingFlags' + - 'Apple:QualityHint' + - 'Apple:ImageCaptureRequestID' + - 'Apple:SceneFlags' + - 'Apple:SignalToNoiseRatioType' fileName: apple-iphone11.jpg mimeType: image/jpeg fileContentHash: 38be1f3365dbf826bb4fc7c486f884791ee8813fc9ec218704645b5982738f12 @@ -662,12 +670,12 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeFlags:flags/entry' - class: FileEye\MediaProbe\Entry\Core\Char + class: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\RunTimeFlags valid: true format: Char components: 1 bytesHash: 6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b - text: '1' + text: Valid - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeValue:value' @@ -824,12 +832,12 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:FocusDistanceRange:12/entry' - class: FileEye\MediaProbe\Entry\Core\SignedRational + class: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\FocusDistanceRange valid: true format: SignedRational components: 2 bytesHash: 5c9229d72008f3e4d0273f4e6b881245b177027ffcfc6f66877eb19d8a6cfccd - text: '50.05859375 47.22265625' + text: '47.22 - 50.06 m' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:13' @@ -893,7 +901,7 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageCaptureType:20/entry' - class: FileEye\MediaProbe\Entry\Core\SignedLong + class: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\ImageCaptureType valid: true format: SignedLong components: 1 @@ -1036,12 +1044,12 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:AFPerformance:35/entry' - class: FileEye\MediaProbe\Entry\Core\SignedLong + class: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\AFPerformance valid: true format: SignedLong components: 2 bytesHash: e6d6504539d2404f7eca98924eac70e4fce92ad52656e804b3b1fbcf9f66b672 - text: '171 268435521' + text: '171 1 65' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:SceneFlags:37' diff --git a/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml b/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml index a52345056..28039e077 100644 --- a/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml +++ b/tests/media-dumps/image/camera/apple-iphone6s.jpg.dump.yml @@ -1,3 +1,7 @@ +skip: + exiftool: + - 'Apple:AEMatrix' + - 'Apple:ImageProcessingFlags' fileName: apple-iphone6s.jpg mimeType: image/jpeg fileContentHash: acb2045c15846eeb455deb1654ed381a1dbb2d2e618ed5a36a96221411aff6ac @@ -608,12 +612,12 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeFlags:flags/entry' - class: FileEye\MediaProbe\Entry\Core\Char + class: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\RunTimeFlags valid: true format: Char components: 1 bytesHash: 6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b - text: '1' + text: Valid - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeValue:value' @@ -822,12 +826,12 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageCaptureType:20/entry' - class: FileEye\MediaProbe\Entry\Core\SignedLong + class: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\ImageCaptureType valid: true format: SignedLong components: 1 bytesHash: 1bc5d0e3df0ea12c4d0078668d14924f95106bbe173e196de50fe13a900b0937 - text: '4' + text: 'Unknown (4)' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:LivePhotoVideoIndex:23' diff --git a/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml b/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml index c7197eab6..832fb4143 100644 --- a/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml +++ b/tests/media-dumps/image/camera/apple-iphone7.JPG.dump.yml @@ -1,3 +1,8 @@ +skip: + exiftool: + - 'Apple:AEMatrix' + - 'Apple:ImageProcessingFlags' + - 'Apple:QualityHint' fileName: apple-iphone7.JPG mimeType: image/jpeg fileContentHash: 70abc50d086d0d12391befa26357a0524e9b99c1a7e96f1d44d7f79a06881b1f @@ -608,12 +613,12 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeFlags:flags/entry' - class: FileEye\MediaProbe\Entry\Core\Char + class: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\RunTimeFlags valid: true format: Char components: 1 bytesHash: 6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b - text: '1' + text: Valid - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/plist:AppleRuntime:3/tag:RunTimeValue:value' @@ -770,12 +775,12 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:FocusDistanceRange:12/entry' - class: FileEye\MediaProbe\Entry\Core\SignedRational + class: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\FocusDistanceRange valid: true format: SignedRational components: 2 bytesHash: 0aee66fe9fc2bd3863c3192aaf02d60a20dbfcc8baaa66210a42eccb696433db - text: '0.53515625 1.90625' + text: '0.54 - 1.91 m' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:13' @@ -857,7 +862,7 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Apple:37500/tag:ImageCaptureType:20/entry' - class: FileEye\MediaProbe\Entry\Core\SignedLong + class: FileEye\MediaProbe\Entry\Vendor\Apple\Exif\ImageCaptureType valid: true format: SignedLong components: 1 diff --git a/tests/media-dumps/image/camera/canon-ixus-ii.jpg.dump.yml b/tests/media-dumps/image/camera/canon-ixus-ii.jpg.dump.yml index 5d76aec4d..ad0c33ff7 100644 --- a/tests/media-dumps/image/camera/canon-ixus-ii.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon-ixus-ii.jpg.dump.yml @@ -978,7 +978,7 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29/entry' - class: FileEye\MediaProbe\Entry\Core\SignedShort + class: FileEye\MediaProbe\Entry\Vendor\Canon\Exif\CameraSettings\FlashBits valid: true format: SignedShort components: 1 diff --git a/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml b/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml index cfc7c53c8..76f811bc5 100644 --- a/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon-powershot-s60.jpg.dump.yml @@ -978,7 +978,7 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29/entry' - class: FileEye\MediaProbe\Entry\Core\SignedShort + class: FileEye\MediaProbe\Entry\Vendor\Canon\Exif\CameraSettings\FlashBits valid: true format: SignedShort components: 1 diff --git a/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml b/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml index d833cadd3..a160bea38 100644 --- a/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon_eos_70d_29.jpg.dump.yml @@ -1119,7 +1119,7 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29/entry' - class: FileEye\MediaProbe\Entry\Core\SignedShort + class: FileEye\MediaProbe\Entry\Vendor\Canon\Exif\CameraSettings\FlashBits valid: true format: SignedShort components: 1 @@ -3340,7 +3340,7 @@ elements: format: SignedLong components: 2 bytesHash: 35be322d094f9d154a8aba4733b8497f180353bd7ae7b0a15f90b586b549f28b - text: '' + text: '3 shots' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:SafetyShift:264' @@ -3664,7 +3664,7 @@ elements: format: SignedLong components: 1 bytesHash: 9d9f290527a6be626a8f5985b26e19b237b44872b03631811df4416fc1713178 - text: '[0], [1]' + text: 'Monochrome, WB corrected' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:CustomControls:1804' diff --git a/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml b/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml index cbb9693d7..5a8a1575c 100644 --- a/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml +++ b/tests/media-dumps/image/camera/canon_eos_850d_08.jpg.dump.yml @@ -108,6 +108,8 @@ skip: - 'Canon:Sharpness' - 'Canon:AFPointsSelected' - 'Canon:AFPointsInFocus' + - '########### 201103' + - 'Canon:FirmwareVersion' fileName: canon_eos_850d_08.jpg mimeType: image/jpeg fileContentHash: 4e20f0333037b59712360f2c847b0bd4a880f54c1a1cb3ce7f763bcc76d76ebc @@ -1186,12 +1188,12 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29/entry' - class: FileEye\MediaProbe\Entry\Core\SignedShort + class: FileEye\MediaProbe\Entry\Vendor\Canon\Exif\CameraSettings\FlashBits valid: true format: SignedShort components: 1 bytesHash: e545d395bb3fd971f91bf9a2b6722831df704efae6c1aa9da0989ed0970b77bb - text: '8' + text: E-TTL - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FocusContinuous:32' @@ -3576,7 +3578,7 @@ elements: format: SignedLong components: 1 bytesHash: d23f96d836ebed25ad1d3d2b9d92362252cc8a347a98312a75284f7f6d08bd02 - text: '[0], [1], [6]' + text: 'Monochrome, WB corrected, Noise reduction' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:CustomControls:1804' diff --git a/tests/media-dumps/image/exiftool/Canon.jpg.dump.yml b/tests/media-dumps/image/exiftool/Canon.jpg.dump.yml index f4aa3b8c8..bacfd1cec 100644 --- a/tests/media-dumps/image/exiftool/Canon.jpg.dump.yml +++ b/tests/media-dumps/image/exiftool/Canon.jpg.dump.yml @@ -1010,7 +1010,7 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29/entry' - class: FileEye\MediaProbe\Entry\Core\SignedShort + class: FileEye\MediaProbe\Entry\Vendor\Canon\Exif\CameraSettings\FlashBits valid: true format: SignedShort components: 1 diff --git a/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml b/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml index b5645f64b..629630abc 100644 --- a/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml +++ b/tests/media-dumps/image/exiftool/Canon1DmkIII.jpg.dump.yml @@ -1002,7 +1002,7 @@ elements: - node: entry path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonCameraSettings:1/tag:FlashBits:29/entry' - class: FileEye\MediaProbe\Entry\Core\SignedShort + class: FileEye\MediaProbe\Entry\Vendor\Canon\Exif\CameraSettings\FlashBits valid: true format: SignedShort components: 1 @@ -3322,7 +3322,7 @@ elements: format: SignedLong components: 1 bytesHash: 9d9f290527a6be626a8f5985b26e19b237b44872b03631811df4416fc1713178 - text: '3 shots' + text: '7 shots' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:Exposure:1/tag:SpotMeterLinkToAFPoint:263' @@ -4195,7 +4195,7 @@ elements: format: SignedLong components: 4 bytesHash: 9e92db3fb903d738ba7d3555b28197adffda640121de63a5a3803dab8e01f149 - text: '; 6 s: 6; 16 s: 16; After release: 2' + text: 'Disable; 6 s: 6; 16 s: 16; After release: 2' - node: tag path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:ShortReleaseTimeLag:2061' @@ -5837,9 +5837,6 @@ log: - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:AutoFocusDrive:3/tag:ContinuousShootingSpeed:1552' message: "Found 3 data components, expected 6 for item 'ContinuousShootingSpeed' in 'AutoFocusDrive'" - - - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/index:CanonCustomFunctions2Header:153/index:OperationOthers:4/tag:TimerLength:2060' - message: "Found 4 data components, expected 3 for item 'TimerLength' in 'OperationOthers'" - path: '/media/jpeg/jpegSegment:APP1:225/exif/tiff/ifd:IFD0:0/ifd:ExifIFD:34665/makerNote:Canon:37500/map:CanonColorData:16385' message: "Could not access value for item 'PerChannelBlackLevel' in 'CanonColorData', overflow" diff --git a/tests/media-dumps/image/pel-157.tiff.dump.yml b/tests/media-dumps/image/pel-157.tiff.dump.yml index f26a32e66..2c251e0ed 100644 --- a/tests/media-dumps/image/pel-157.tiff.dump.yml +++ b/tests/media-dumps/image/pel-157.tiff.dump.yml @@ -1,4 +1,6 @@ skip: + mediaprobe: + - '/media/tiff/ifd:IFD0:0/tag:ThumbnailData:20507/entry' exiftool: - 'IFD0:PreviewImageStart' - 'IFD0:PreviewImageLength'