From d91307bf6a9a09e1efb9db931a6b0ae72132e965 Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Tue, 26 Feb 2019 11:05:49 +0400 Subject: [PATCH 1/2] add php 7.1 env in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0ddc59859c..2905528f10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 matrix: fast_finish: true From bb920a8fff3051cd51d360aec24cd94ec46de3ca Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Tue, 26 Feb 2019 11:47:09 +0400 Subject: [PATCH 2/2] update phpexiftool/exiftool and rebuild tag classes --- composer.json | 2 +- .../Driver/Tag/Canon/CameraPictureStyle.php | 84 +++ .../Driver/Tag/Canon/CanonModelID.php | 40 ++ .../Driver/Tag/Canon/ColorDataVersion.php | 8 + lib/PHPExiftool/Driver/Tag/Canon/LensType.php | 28 +- .../CanonCustom/InitialAFPointAIServoAF.php | 60 ++ .../Driver/Tag/CanonRaw/CanonModelID.php | 40 ++ .../Driver/Tag/CanonVRD/DR4CameraModel.php | 40 ++ .../Driver/Tag/Composite/LensID.php | 28 +- .../Driver/Tag/Composite/VolumeSize.php | 43 ++ lib/PHPExiftool/Driver/Tag/EXE/CreateDate.php | 47 ++ .../Driver/Tag/EXE/ObjectFileType.php | 20 +- .../Driver/Tag/EXE/ObjectFlags.php | 134 ++++ .../Driver/Tag/ExifIFD/SonyRawFileType.php | 64 ++ .../Driver/Tag/ISO/AbstractFileName.php | 45 ++ .../Driver/Tag/ISO/BibligraphicFileName.php | 45 ++ .../Driver/Tag/ISO/BootIdentifier.php | 45 ++ lib/PHPExiftool/Driver/Tag/ISO/BootSystem.php | 45 ++ .../Driver/Tag/ISO/CopyrightFileName.php | 45 ++ .../Driver/Tag/ISO/DataPreparer.php | 45 ++ .../Driver/Tag/ISO/PathTableLocation.php | 43 ++ .../Driver/Tag/ISO/PathTableSize.php | 43 ++ lib/PHPExiftool/Driver/Tag/ISO/Publisher.php | 45 ++ .../Tag/ISO/RootDirectoryCreateDate.php | 47 ++ lib/PHPExiftool/Driver/Tag/ISO/Software.php | 45 ++ lib/PHPExiftool/Driver/Tag/ISO/System.php | 45 ++ .../Driver/Tag/ISO/VolumeBlockCount.php | 43 ++ .../Driver/Tag/ISO/VolumeBlockSize.php | 43 ++ .../Driver/Tag/ISO/VolumeCreateDate.php | 47 ++ .../Driver/Tag/ISO/VolumeEffectiveDate.php | 47 ++ .../Driver/Tag/ISO/VolumeExpirationDate.php | 47 ++ .../Driver/Tag/ISO/VolumeModifyDate.php | 47 ++ lib/PHPExiftool/Driver/Tag/ISO/VolumeName.php | 45 ++ .../Driver/Tag/ISO/VolumeSetDiskCount.php | 43 ++ .../Driver/Tag/ISO/VolumeSetDiskNumber.php | 43 ++ .../Driver/Tag/ISO/VolumeSetName.php | 45 ++ .../Tag/Matroska/{Void.php => Void0.php} | 2 +- .../Driver/Tag/Minolta/LensType.php | 78 ++- .../Driver/Tag/Nikon/ISOExpansion.php | 16 + .../Driver/Tag/Nikon/MemoryCardNumber.php | 45 ++ .../Driver/Tag/Nikon/RetouchHistory.php | 48 ++ .../Driver/Tag/Olympus/CameraType.php | 10 +- .../Driver/Tag/Olympus/CameraType2.php | 10 +- .../Driver/Tag/Olympus/LensType.php | 20 + lib/PHPExiftool/Driver/Tag/Olympus/Model.php | 10 +- .../Driver/Tag/Pentax/LensType.php | 10 +- .../Driver/Tag/Pentax/PentaxModelID.php | 4 + .../Tag/Pentax/RawDevelopmentProcess.php | 4 + .../Driver/Tag/Photoshop/Compression.php | 62 ++ .../Tag/Photoshop/HasRealMergedData.php | 54 ++ .../Driver/Tag/Photoshop/LayerBlendModes.php | 160 +++++ .../Photoshop/{Slices.php => LayerCount.php} | 10 +- .../{VersionInfo.php => LayerNames.php} | 12 +- .../Driver/Tag/Photoshop/LayerOpacities.php | 45 ++ .../Driver/Tag/Photoshop/LayerRectangles.php | 45 ++ .../Tag/Photoshop/LayerUnicodeNames.php | 45 ++ .../Driver/Tag/Photoshop/NumSlices.php | 43 ++ .../Driver/Tag/Photoshop/PhotoshopFormat.php | 2 +- .../Driver/Tag/Photoshop/PixelAspectRatio.php | 6 +- .../Driver/Tag/Photoshop/PrintPosition.php | 45 ++ .../Driver/Tag/Photoshop/PrintScale.php | 6 +- .../Driver/Tag/Photoshop/PrintStyle.php | 21 +- .../Driver/Tag/Photoshop/ReaderName.php | 43 ++ .../Driver/Tag/Photoshop/SlicesGroupName.php | 43 ++ .../Driver/Tag/Photoshop/URLList.php | 2 + .../Driver/Tag/Photoshop/WriterName.php | 43 ++ .../Driver/Tag/QuickTime/FirmwareVersion.php | 4 +- .../Driver/Tag/QuickTime/LensSerialNumber.php | 43 ++ .../Driver/Tag/QuickTime/SerialNumberHash.php | 43 ++ .../Driver/Tag/QuickTime/UUIDUnknown.php | 2 - .../Driver/Tag/QuickTime/UserDataDji.php | 45 ++ .../Driver/Tag/QuickTime/UserDataRes.php | 45 ++ .../Driver/Tag/QuickTime/UserDataUid.php | 45 ++ .../Driver/Tag/RAF/RelativeExposure.php | 43 ++ .../Driver/Tag/Samsung/EmbeddedVideoFile.php | 47 ++ .../Driver/Tag/Samsung/EmbeddedVideoType.php | 45 ++ .../Driver/Tag/Samsung/TimeStamp.php | 47 ++ .../Driver/Tag/Sony/AFAreaModeSetting.php | 12 +- .../Driver/Tag/Sony/AFPointsUsed.php | 30 +- .../Driver/Tag/Sony/AFZoneSelected.php | 30 +- .../Driver/Tag/Sony/FlashActionExternal.php | 12 +- lib/PHPExiftool/Driver/Tag/Sony/FlashMode.php | 100 +-- .../Driver/Tag/Sony/FocalPlaneAFPointArea.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation1.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation10.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation11.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation12.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation13.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation14.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation15.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation2.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation3.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation4.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation5.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation6.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation7.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation8.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointLocation9.php | 47 ++ .../Tag/Sony/FocalPlaneAFPointsUsed.php | 6 +- .../Driver/Tag/Sony/FocusLocation.php | 47 ++ lib/PHPExiftool/Driver/Tag/Sony/LensType.php | 152 +++-- lib/PHPExiftool/Driver/Tag/Sony/LensType2.php | 32 + lib/PHPExiftool/Driver/Tag/Sony/LensType3.php | 32 + .../Driver/Tag/Sony/RAWFileType.php | 56 ++ .../Driver/Tag/Sony/ReleaseMode.php | 4 + .../Driver/Tag/Sony/ReleaseMode2.php | 2 +- lib/PHPExiftool/Driver/Tag/Sony/SelfTimer.php | 72 +++ .../Driver/Tag/Sony/SequenceLength.php | 56 +- .../Driver/Tag/Sony/SonyModelID.php | 12 + .../Driver/Tag/Sony/WBShiftABGMPrecise.php | 2 +- .../Driver/Tag/Track/UUIDUnknown.php | 2 - .../Driver/Tag/XMPAcdsee/EditStatus.php | 45 ++ .../Tag/XMPAcdsee/FixtureIdentifier.php | 45 ++ .../Driver/Tag/XMPAcdsee/ObjectCycle.php | 45 ++ .../Tag/XMPAcdsee/OriginatingProgram.php | 45 ++ .../Driver/Tag/XMPAcdsee/ReleaseDate.php | 45 ++ .../Driver/Tag/XMPAcdsee/ReleaseTime.php | 45 ++ .../Driver/Tag/XMPAcdsee/Snapshots.php | 51 ++ .../Driver/Tag/XMPCrs/DNGIgnoreSidecars.php | 43 ++ .../Driver/Tag/XMPCrs/DefaultAutoGray.php | 43 ++ .../Driver/Tag/XMPCrs/DefaultAutoTone.php | 43 ++ .../Tag/XMPCrs/DefaultsSpecificToISO.php | 43 ++ .../Tag/XMPCrs/DefaultsSpecificToSerial.php | 43 ++ .../Driver/Tag/XMPCrs/JPEGHandling.php | 43 ++ .../XMPCrs/NegativeCacheLargePreviewSize.php | 43 ++ .../Tag/XMPCrs/NegativeCacheMaximumSize.php | 43 ++ .../Driver/Tag/XMPCrs/NegativeCachePath.php | 43 ++ .../Driver/Tag/XMPCrs/TIFFHandling.php | 43 ++ lib/PHPExiftool/Driver/TagProvider.php | 570 +++++++++++++++++- lib/PHPExiftool/Driver/Type/VarUstr32.php | 23 + .../Tool/Command/ClassesBuilder.php | 1 + 131 files changed, 5525 insertions(+), 210 deletions(-) create mode 100644 lib/PHPExiftool/Driver/Tag/Canon/CameraPictureStyle.php create mode 100644 lib/PHPExiftool/Driver/Tag/CanonCustom/InitialAFPointAIServoAF.php create mode 100644 lib/PHPExiftool/Driver/Tag/Composite/VolumeSize.php create mode 100644 lib/PHPExiftool/Driver/Tag/EXE/CreateDate.php create mode 100644 lib/PHPExiftool/Driver/Tag/EXE/ObjectFlags.php create mode 100644 lib/PHPExiftool/Driver/Tag/ExifIFD/SonyRawFileType.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/AbstractFileName.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/BibligraphicFileName.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/BootIdentifier.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/BootSystem.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/CopyrightFileName.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/DataPreparer.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/PathTableLocation.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/PathTableSize.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/Publisher.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/RootDirectoryCreateDate.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/Software.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/System.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeBlockCount.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeBlockSize.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeCreateDate.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeEffectiveDate.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeExpirationDate.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeModifyDate.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeName.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeSetDiskCount.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeSetDiskNumber.php create mode 100644 lib/PHPExiftool/Driver/Tag/ISO/VolumeSetName.php rename lib/PHPExiftool/Driver/Tag/Matroska/{Void.php => Void0.php} (95%) create mode 100644 lib/PHPExiftool/Driver/Tag/Nikon/MemoryCardNumber.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/Compression.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/HasRealMergedData.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/LayerBlendModes.php rename lib/PHPExiftool/Driver/Tag/Photoshop/{Slices.php => LayerCount.php} (75%) rename lib/PHPExiftool/Driver/Tag/Photoshop/{VersionInfo.php => LayerNames.php} (72%) create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/LayerOpacities.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/LayerRectangles.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/LayerUnicodeNames.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/NumSlices.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/PrintPosition.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/ReaderName.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/SlicesGroupName.php create mode 100644 lib/PHPExiftool/Driver/Tag/Photoshop/WriterName.php create mode 100644 lib/PHPExiftool/Driver/Tag/QuickTime/LensSerialNumber.php create mode 100644 lib/PHPExiftool/Driver/Tag/QuickTime/SerialNumberHash.php create mode 100644 lib/PHPExiftool/Driver/Tag/QuickTime/UserDataDji.php create mode 100644 lib/PHPExiftool/Driver/Tag/QuickTime/UserDataRes.php create mode 100644 lib/PHPExiftool/Driver/Tag/QuickTime/UserDataUid.php create mode 100644 lib/PHPExiftool/Driver/Tag/RAF/RelativeExposure.php create mode 100644 lib/PHPExiftool/Driver/Tag/Samsung/EmbeddedVideoFile.php create mode 100644 lib/PHPExiftool/Driver/Tag/Samsung/EmbeddedVideoType.php create mode 100644 lib/PHPExiftool/Driver/Tag/Samsung/TimeStamp.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointArea.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation1.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation10.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation11.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation12.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation13.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation14.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation15.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation2.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation3.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation4.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation5.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation6.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation7.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation8.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation9.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/FocusLocation.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/RAWFileType.php create mode 100644 lib/PHPExiftool/Driver/Tag/Sony/SelfTimer.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPAcdsee/EditStatus.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPAcdsee/FixtureIdentifier.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPAcdsee/ObjectCycle.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPAcdsee/OriginatingProgram.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPAcdsee/ReleaseDate.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPAcdsee/ReleaseTime.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPAcdsee/Snapshots.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/DNGIgnoreSidecars.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultAutoGray.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultAutoTone.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultsSpecificToISO.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultsSpecificToSerial.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/JPEGHandling.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCacheLargePreviewSize.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCacheMaximumSize.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCachePath.php create mode 100644 lib/PHPExiftool/Driver/Tag/XMPCrs/TIFFHandling.php create mode 100644 lib/PHPExiftool/Driver/Type/VarUstr32.php diff --git a/composer.json b/composer.json index 4ce7ede7a4..797e3ab610 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "doctrine/cache": "^1.0", "doctrine/collections": "^1.0", "monolog/monolog": "^1.3", - "phpexiftool/exiftool": "10.10", + "phpexiftool/exiftool": "10.16", "symfony/console": "^2.1|^3.0", "symfony/process": "^2.1|^3.0" }, diff --git a/lib/PHPExiftool/Driver/Tag/Canon/CameraPictureStyle.php b/lib/PHPExiftool/Driver/Tag/Canon/CameraPictureStyle.php new file mode 100644 index 0000000000..a3b0d69d06 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Canon/CameraPictureStyle.php @@ -0,0 +1,84 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Canon; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class CameraPictureStyle extends AbstractTag +{ + + protected $Id = 175; + + protected $Name = 'CameraPictureStyle'; + + protected $FullName = 'Canon::CameraInfo7D'; + + protected $GroupName = 'Canon'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Canon'; + + protected $g2 = 'Camera'; + + protected $Type = 'int8u'; + + protected $Writable = true; + + protected $Description = 'Camera Picture Style'; + + protected $flag_Permanent = true; + + protected $Values = array( + 33 => array( + 'Id' => 33, + 'Label' => 'User Defined 1', + ), + 34 => array( + 'Id' => 34, + 'Label' => 'User Defined 2', + ), + 35 => array( + 'Id' => 35, + 'Label' => 'User Defined 3', + ), + 129 => array( + 'Id' => 129, + 'Label' => 'Standard', + ), + 130 => array( + 'Id' => 130, + 'Label' => 'Portrait', + ), + 131 => array( + 'Id' => 131, + 'Label' => 'Landscape', + ), + 132 => array( + 'Id' => 132, + 'Label' => 'Neutral', + ), + 133 => array( + 'Id' => 133, + 'Label' => 'Faithful', + ), + 134 => array( + 'Id' => 134, + 'Label' => 'Monochrome', + ), + ); + +} diff --git a/lib/PHPExiftool/Driver/Tag/Canon/CanonModelID.php b/lib/PHPExiftool/Driver/Tag/Canon/CanonModelID.php index a973882922..c69cd15d0e 100644 --- a/lib/PHPExiftool/Driver/Tag/Canon/CanonModelID.php +++ b/lib/PHPExiftool/Driver/Tag/Canon/CanonModelID.php @@ -895,10 +895,38 @@ class CanonModelID extends AbstractTag 'Id' => 60096512, 'Label' => 'PowerShot G5 X', ), + 60227584 => array( + 'Id' => 60227584, + 'Label' => 'PowerShot G7 X Mark II', + ), + 60358656 => array( + 'Id' => 60358656, + 'Label' => 'PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650', + ), + 67174400 => array( + 'Id' => 67174400, + 'Label' => 'PowerShot SX540 HS', + ), + 67239936 => array( + 'Id' => 67239936, + 'Label' => 'PowerShot SX420 IS', + ), + 67305472 => array( + 'Id' => 67305472, + 'Label' => 'PowerShot ELPH 190 IS / IXUS 180 / IXY 190', + ), 67371008 => array( 'Id' => 67371008, 'Label' => 'PowerShot G1', ), + 67371009 => array( + 'Id' => 67371009, + 'Label' => 'IXY 180', + ), + 67436544 => array( + 'Id' => 67436544, + 'Label' => 'PowerShot SX720 HS', + ), 100925440 => array( 'Id' => 100925440, 'Label' => 'PowerShot S100 / Digital IXUS / IXY Digital', @@ -1191,6 +1219,10 @@ class CanonModelID extends AbstractTag 'Id' => '2147484455', 'Label' => 'EOS Rebel T5 / 1200D / Kiss X70', ), + '2147484456' => array( + 'Id' => '2147484456', + 'Label' => 'EOS-1D X MARK II', + ), '2147484465' => array( 'Id' => '2147484465', 'Label' => 'EOS M', @@ -1203,6 +1235,10 @@ class CanonModelID extends AbstractTag 'Id' => '2147484487', 'Label' => 'EOS Rebel T6s / 760D / 8000D', ), + '2147484496' => array( + 'Id' => '2147484496', + 'Label' => 'EOS 80D', + ), '2147484501' => array( 'Id' => '2147484501', 'Label' => 'EOS M2', @@ -1219,6 +1255,10 @@ class CanonModelID extends AbstractTag 'Id' => '2147484673', 'Label' => 'EOS 5DS R', ), + '2147484676' => array( + 'Id' => '2147484676', + 'Label' => 'EOS Rebel T6 / 1300D / Kiss X80', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/Canon/ColorDataVersion.php b/lib/PHPExiftool/Driver/Tag/Canon/ColorDataVersion.php index 9d96bb90b7..a6d7b1caa6 100644 --- a/lib/PHPExiftool/Driver/Tag/Canon/ColorDataVersion.php +++ b/lib/PHPExiftool/Driver/Tag/Canon/ColorDataVersion.php @@ -91,6 +91,14 @@ class ColorDataVersion extends AbstractTag 'Id' => 12, 'Label' => '12 (5DS/5DSR)', ), + 12 => array( + 'Id' => 13, + 'Label' => '13 (80D)', + ), + 13 => array( + 'Id' => 14, + 'Label' => '14 (1300D)', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/Canon/LensType.php b/lib/PHPExiftool/Driver/Tag/Canon/LensType.php index 8bb913c21a..69372afae3 100644 --- a/lib/PHPExiftool/Driver/Tag/Canon/LensType.php +++ b/lib/PHPExiftool/Driver/Tag/Canon/LensType.php @@ -529,7 +529,7 @@ class LensType extends AbstractTag ), '137.6' => array( 'Id' => '137.6', - 'Label' => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM', + 'Label' => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C', ), '137.7' => array( 'Id' => '137.7', @@ -593,7 +593,11 @@ class LensType extends AbstractTag ), 143 => array( 'Id' => 143, - 'Label' => 'Canon EF 500mm f/4L IS', + 'Label' => 'Canon EF 500mm f/4L IS or Sigma Lens', + ), + '143.1' => array( + 'Id' => '143.1', + 'Label' => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM', ), 144 => array( 'Id' => 144, @@ -723,6 +727,10 @@ class LensType extends AbstractTag 'Id' => '160.4', 'Label' => 'Tokina AT-X 116 AF Pro DX 11-16mm f/2.8', ), + '160.5' => array( + 'Id' => '160.5', + 'Label' => 'Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8', + ), 161 => array( 'Id' => 161, 'Label' => 'Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens', @@ -781,7 +789,11 @@ class LensType extends AbstractTag ), 168 => array( 'Id' => 168, - 'Label' => 'Canon EF 28mm f/1.8 USM', + 'Label' => 'Canon EF 28mm f/1.8 USM or Sigma Lens', + ), + '168.1' => array( + 'Id' => '168.1', + 'Label' => 'Sigma 50-100mm f/1.8 DC HSM | A', ), 169 => array( 'Id' => 169, @@ -1121,7 +1133,7 @@ class LensType extends AbstractTag ), '234.1' => array( 'Id' => '234.1', - 'Label' => 'Tokina AT-X 12-28mm f/4 PRO DX', + 'Label' => 'Tokina AT-X 12-28 PRO DX 12-28mm f/4', ), 235 => array( 'Id' => 235, @@ -1355,6 +1367,14 @@ class LensType extends AbstractTag 'Id' => 4156, 'Label' => 'Canon EF 50mm f/1.8 STM', ), + 36912 => array( + 'Id' => 36912, + 'Label' => 'Canon EF-S 18-135mm f/3.5-5.6 IS USM', + ), + 65535 => array( + 'Id' => 65535, + 'Label' => 'n/a', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/CanonCustom/InitialAFPointAIServoAF.php b/lib/PHPExiftool/Driver/Tag/CanonCustom/InitialAFPointAIServoAF.php new file mode 100644 index 0000000000..d486516df4 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/CanonCustom/InitialAFPointAIServoAF.php @@ -0,0 +1,60 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\CanonCustom; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class InitialAFPointAIServoAF extends AbstractTag +{ + + protected $Id = 1310; + + protected $Name = 'InitialAFPointAIServoAF'; + + protected $FullName = 'CanonCustom::Functions2'; + + protected $GroupName = 'CanonCustom'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'CanonCustom'; + + protected $g2 = 'Camera'; + + protected $Type = 'int32s'; + + protected $Writable = true; + + protected $Description = 'Initial AF Point AI Servo AF'; + + protected $flag_Permanent = true; + + protected $Values = array( + 0 => array( + 'Id' => 0, + 'Label' => 'Auto', + ), + 1 => array( + 'Id' => 1, + 'Label' => 'Initial AF point selected', + ), + 2 => array( + 'Id' => 2, + 'Label' => 'Manual AF point', + ), + ); + +} diff --git a/lib/PHPExiftool/Driver/Tag/CanonRaw/CanonModelID.php b/lib/PHPExiftool/Driver/Tag/CanonRaw/CanonModelID.php index af98b35175..e803cc335c 100644 --- a/lib/PHPExiftool/Driver/Tag/CanonRaw/CanonModelID.php +++ b/lib/PHPExiftool/Driver/Tag/CanonRaw/CanonModelID.php @@ -895,10 +895,38 @@ class CanonModelID extends AbstractTag 'Id' => 60096512, 'Label' => 'PowerShot G5 X', ), + 60227584 => array( + 'Id' => 60227584, + 'Label' => 'PowerShot G7 X Mark II', + ), + 60358656 => array( + 'Id' => 60358656, + 'Label' => 'PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650', + ), + 67174400 => array( + 'Id' => 67174400, + 'Label' => 'PowerShot SX540 HS', + ), + 67239936 => array( + 'Id' => 67239936, + 'Label' => 'PowerShot SX420 IS', + ), + 67305472 => array( + 'Id' => 67305472, + 'Label' => 'PowerShot ELPH 190 IS / IXUS 180 / IXY 190', + ), 67371008 => array( 'Id' => 67371008, 'Label' => 'PowerShot G1', ), + 67371009 => array( + 'Id' => 67371009, + 'Label' => 'IXY 180', + ), + 67436544 => array( + 'Id' => 67436544, + 'Label' => 'PowerShot SX720 HS', + ), 100925440 => array( 'Id' => 100925440, 'Label' => 'PowerShot S100 / Digital IXUS / IXY Digital', @@ -1191,6 +1219,10 @@ class CanonModelID extends AbstractTag 'Id' => '2147484455', 'Label' => 'EOS Rebel T5 / 1200D / Kiss X70', ), + '2147484456' => array( + 'Id' => '2147484456', + 'Label' => 'EOS-1D X MARK II', + ), '2147484465' => array( 'Id' => '2147484465', 'Label' => 'EOS M', @@ -1203,6 +1235,10 @@ class CanonModelID extends AbstractTag 'Id' => '2147484487', 'Label' => 'EOS Rebel T6s / 760D / 8000D', ), + '2147484496' => array( + 'Id' => '2147484496', + 'Label' => 'EOS 80D', + ), '2147484501' => array( 'Id' => '2147484501', 'Label' => 'EOS M2', @@ -1219,6 +1255,10 @@ class CanonModelID extends AbstractTag 'Id' => '2147484673', 'Label' => 'EOS 5DS R', ), + '2147484676' => array( + 'Id' => '2147484676', + 'Label' => 'EOS Rebel T6 / 1300D / Kiss X80', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/CanonVRD/DR4CameraModel.php b/lib/PHPExiftool/Driver/Tag/CanonVRD/DR4CameraModel.php index a1406f7d60..c6c36b1513 100644 --- a/lib/PHPExiftool/Driver/Tag/CanonVRD/DR4CameraModel.php +++ b/lib/PHPExiftool/Driver/Tag/CanonVRD/DR4CameraModel.php @@ -893,10 +893,38 @@ class DR4CameraModel extends AbstractTag 'Id' => 60096512, 'Label' => 'PowerShot G5 X', ), + 60227584 => array( + 'Id' => 60227584, + 'Label' => 'PowerShot G7 X Mark II', + ), + 60358656 => array( + 'Id' => 60358656, + 'Label' => 'PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650', + ), + 67174400 => array( + 'Id' => 67174400, + 'Label' => 'PowerShot SX540 HS', + ), + 67239936 => array( + 'Id' => 67239936, + 'Label' => 'PowerShot SX420 IS', + ), + 67305472 => array( + 'Id' => 67305472, + 'Label' => 'PowerShot ELPH 190 IS / IXUS 180 / IXY 190', + ), 67371008 => array( 'Id' => 67371008, 'Label' => 'PowerShot G1', ), + 67371009 => array( + 'Id' => 67371009, + 'Label' => 'IXY 180', + ), + 67436544 => array( + 'Id' => 67436544, + 'Label' => 'PowerShot SX720 HS', + ), 100925440 => array( 'Id' => 100925440, 'Label' => 'PowerShot S100 / Digital IXUS / IXY Digital', @@ -1189,6 +1217,10 @@ class DR4CameraModel extends AbstractTag 'Id' => '2147484455', 'Label' => 'EOS Rebel T5 / 1200D / Kiss X70', ), + '2147484456' => array( + 'Id' => '2147484456', + 'Label' => 'EOS-1D X MARK II', + ), '2147484465' => array( 'Id' => '2147484465', 'Label' => 'EOS M', @@ -1201,6 +1233,10 @@ class DR4CameraModel extends AbstractTag 'Id' => '2147484487', 'Label' => 'EOS Rebel T6s / 760D / 8000D', ), + '2147484496' => array( + 'Id' => '2147484496', + 'Label' => 'EOS 80D', + ), '2147484501' => array( 'Id' => '2147484501', 'Label' => 'EOS M2', @@ -1217,6 +1253,10 @@ class DR4CameraModel extends AbstractTag 'Id' => '2147484673', 'Label' => 'EOS 5DS R', ), + '2147484676' => array( + 'Id' => '2147484676', + 'Label' => 'EOS Rebel T6 / 1300D / Kiss X80', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/Composite/LensID.php b/lib/PHPExiftool/Driver/Tag/Composite/LensID.php index 2be2fed9cf..90ad35ad5d 100644 --- a/lib/PHPExiftool/Driver/Tag/Composite/LensID.php +++ b/lib/PHPExiftool/Driver/Tag/Composite/LensID.php @@ -1585,7 +1585,7 @@ class LensID extends AbstractTag ), '8E 3C 2B 5C 24 30 4B 0E' => array( 'Id' => '8E 3C 2B 5C 24 30 4B 0E', - 'Label' => 'Sigma 17-70mm F2.8-4 DC Macro OS HSM Contemporary', + 'Label' => 'Sigma 17-70mm F2.8-4 DC Macro OS HSM | C', ), '8F 40 2D 72 2C 3C 91 06' => array( 'Id' => '8F 40 2D 72 2C 3C 91 06', @@ -1741,7 +1741,7 @@ class LensID extends AbstractTag ), 'A2 40 2D 53 2C 3C BD 0E' => array( 'Id' => 'A2 40 2D 53 2C 3C BD 0E', - 'Label' => 'AF-S DX VR Nikkor 18-55mm f/3.5-5.6G II', + 'Label' => 'AF-S DX Nikkor 18-55mm f/3.5-5.6G VR II', ), 'A2 48 5C 80 24 24 A4 0E' => array( 'Id' => 'A2 48 5C 80 24 24 A4 0E', @@ -1777,7 +1777,7 @@ class LensID extends AbstractTag ), 'A5 4C 44 44 14 14 C0 06' => array( 'Id' => 'A5 4C 44 44 14 14 C0 06', - 'Label' => 'AF-S Nikkor 35mm f/1.8G', + 'Label' => 'AF-S Nikkor 35mm f/1.8G ED', ), 'A6 48 37 5C 24 24 4B 06' => array( 'Id' => 'A6 48 37 5C 24 24 4B 06', @@ -1787,6 +1787,10 @@ class LensID extends AbstractTag 'Id' => 'A6 48 8E 8E 24 24 A8 0E', 'Label' => 'AF-S VR Nikkor 300mm f/2.8G IF-ED II', ), + 'A6 48 98 98 24 24 C1 0E' => array( + 'Id' => 'A6 48 98 98 24 24 C1 0E', + 'Label' => 'AF-S Nikkor 400mm f/2.8E FL ED VR', + ), 'A7 3C 53 80 30 3C C2 0E' => array( 'Id' => 'A7 3C 53 80 30 3C C2 0E', 'Label' => 'AF-S DX Nikkor 55-200mm f/4-5.6G ED VR II', @@ -1827,6 +1831,10 @@ class LensID extends AbstractTag 'Id' => 'AA 48 37 5C 24 24 C5 4E', 'Label' => 'AF-S Nikkor 24-70mm f/2.8E ED VR', ), + 'AB 3C A0 A0 30 30 C6 4E' => array( + 'Id' => 'AB 3C A0 A0 30 30 C6 4E', + 'Label' => 'AF-S Nikkor 500mm f/4E FL ED VR', + ), 'AC 38 53 8E 34 3C AE 0E' => array( 'Id' => 'AC 38 53 8E 34 3C AE 0E', 'Label' => 'AF-S DX VR Nikkor 55-300mm f/4.5-5.6G ED', @@ -1839,9 +1847,13 @@ class LensID extends AbstractTag 'Id' => 'AD 3C 2D 8E 2C 3C AF 0E', 'Label' => 'AF-S DX Nikkor 18-300mm f/3.5-5.6G ED VR', ), + 'AD 48 28 60 24 30 C8 0E' => array( + 'Id' => 'AD 48 28 60 24 30 C8 0E', + 'Label' => 'AF-S DX Nikkor 16-80mm f/2.8-4E ED VR', + ), 'AD 48 28 60 24 30 C8 4E' => array( 'Id' => 'AD 48 28 60 24 30 C8 4E', - 'Label' => 'AF-S VR DX 16-80mm f/2.8-4.0E ED', + 'Label' => 'AF-S DX Nikkor 16-80mm f/2.8-4E ED VR', ), 'AE 3C 80 A0 3C 3C C9 0E' => array( 'Id' => 'AE 3C 80 A0 3C 3C C9 0E', @@ -1887,6 +1899,10 @@ class LensID extends AbstractTag 'Id' => 'B5 4C 3C 3C 14 14 B7 06', 'Label' => 'AF-S Nikkor 28mm f/1.8G', ), + 'B6 3C B0 B0 3C 3C B8 0E' => array( + 'Id' => 'B6 3C B0 B0 3C 3C B8 0E', + 'Label' => 'AF-S VR Nikkor 800mm f/5.6E FL ED', + ), 'B6 48 37 56 24 24 1C 02' => array( 'Id' => 'B6 48 37 56 24 24 1C 02', 'Label' => 'Sigma 24-60mm F2.8 EX DG', @@ -1899,6 +1915,10 @@ class LensID extends AbstractTag 'Id' => 'B8 40 2D 44 2C 34 BA 06', 'Label' => 'AF-S Nikkor 18-35mm f/3.5-4.5G ED', ), + 'CC 4C 50 68 14 14 4B 06' => array( + 'Id' => 'CC 4C 50 68 14 14 4B 06', + 'Label' => 'Sigma 50-100mm F1.8 DC HSM | A', + ), 'CD 3D 2D 70 2E 3C 4B 0E' => array( 'Id' => 'CD 3D 2D 70 2E 3C 4B 0E', 'Label' => 'Sigma 18-125mm F3.8-5.6 DC OS HSM', diff --git a/lib/PHPExiftool/Driver/Tag/Composite/VolumeSize.php b/lib/PHPExiftool/Driver/Tag/Composite/VolumeSize.php new file mode 100644 index 0000000000..290e1ddc3b --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Composite/VolumeSize.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Composite; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeSize extends AbstractTag +{ + + protected $Id = 'VolumeSize'; + + protected $Name = 'VolumeSize'; + + protected $FullName = 'Composite'; + + protected $GroupName = 'Composite'; + + protected $g0 = 'Composite'; + + protected $g1 = 'Composite'; + + protected $g2 = 'Other'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Volume Size'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/EXE/CreateDate.php b/lib/PHPExiftool/Driver/Tag/EXE/CreateDate.php new file mode 100644 index 0000000000..a061577123 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/EXE/CreateDate.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\EXE; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class CreateDate extends AbstractTag +{ + + protected $Id = 16; + + protected $Name = 'CreateDate'; + + protected $FullName = 'EXE::AR'; + + protected $GroupName = 'EXE'; + + protected $g0 = 'EXE'; + + protected $g1 = 'EXE'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Create Date'; + + protected $local_g2 = 'Time'; + + protected $MaxLength = 12; + +} diff --git a/lib/PHPExiftool/Driver/Tag/EXE/ObjectFileType.php b/lib/PHPExiftool/Driver/Tag/EXE/ObjectFileType.php index 10f32ba9f8..f5ea7d037d 100644 --- a/lib/PHPExiftool/Driver/Tag/EXE/ObjectFileType.php +++ b/lib/PHPExiftool/Driver/Tag/EXE/ObjectFileType.php @@ -102,30 +102,38 @@ class ObjectFileType extends AbstractTag 'Label' => 'Shared library stub for static linking', ), 15 => array( + 'Id' => 10, + 'Label' => 'Debug information', + ), + 16 => array( + 'Id' => 11, + 'Label' => 'x86_64 kexts', + ), + 17 => array( 'Id' => 0, 'Label' => 'Unknown', ), - 16 => array( + 18 => array( 'Id' => 1, 'Label' => 'Executable application', ), - 17 => array( + 19 => array( 'Id' => 2, 'Label' => 'Dynamic link library', ), - 18 => array( + 20 => array( 'Id' => 3, 'Label' => 'Driver', ), - 19 => array( + 21 => array( 'Id' => 4, 'Label' => 'Font', ), - 20 => array( + 22 => array( 'Id' => 5, 'Label' => 'VxD', ), - 21 => array( + 23 => array( 'Id' => 7, 'Label' => 'Static library', ), diff --git a/lib/PHPExiftool/Driver/Tag/EXE/ObjectFlags.php b/lib/PHPExiftool/Driver/Tag/EXE/ObjectFlags.php new file mode 100644 index 0000000000..b7b6c90144 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/EXE/ObjectFlags.php @@ -0,0 +1,134 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\EXE; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class ObjectFlags extends AbstractTag +{ + + protected $Id = 6; + + protected $Name = 'ObjectFlags'; + + protected $FullName = 'EXE::MachO'; + + protected $GroupName = 'EXE'; + + protected $g0 = 'EXE'; + + protected $g1 = 'EXE'; + + protected $g2 = 'Other'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Object Flags'; + + protected $Values = array( + 1 => array( + 'Id' => 1, + 'Label' => 'No undefs', + ), + 2 => array( + 'Id' => 2, + 'Label' => 'Incrementa link', + ), + 4 => array( + 'Id' => 4, + 'Label' => 'Dyld link', + ), + 8 => array( + 'Id' => 8, + 'Label' => 'Bind at load', + ), + 16 => array( + 'Id' => 16, + 'Label' => 'Prebound', + ), + 32 => array( + 'Id' => 32, + 'Label' => 'Split segs', + ), + 64 => array( + 'Id' => 64, + 'Label' => 'Lazy init', + ), + 128 => array( + 'Id' => 128, + 'Label' => 'Two level', + ), + 256 => array( + 'Id' => 256, + 'Label' => 'Force flat', + ), + 512 => array( + 'Id' => 512, + 'Label' => 'No multi defs', + ), + 1024 => array( + 'Id' => 1024, + 'Label' => 'No fix prebinding', + ), + 2048 => array( + 'Id' => 2048, + 'Label' => 'Prebindable', + ), + 4096 => array( + 'Id' => 4096, + 'Label' => 'All mods bound', + ), + 8192 => array( + 'Id' => 8192, + 'Label' => 'Subsections via symbols', + ), + 16384 => array( + 'Id' => 16384, + 'Label' => 'Canonical', + ), + 32768 => array( + 'Id' => 32768, + 'Label' => 'Weak defines', + ), + 65536 => array( + 'Id' => 65536, + 'Label' => 'Binds to weak', + ), + 131072 => array( + 'Id' => 131072, + 'Label' => 'Allow stack execution', + ), + 262144 => array( + 'Id' => 262144, + 'Label' => 'Dead strippable dylib', + ), + 524288 => array( + 'Id' => 524288, + 'Label' => 'Root safe', + ), + 1048576 => array( + 'Id' => 1048576, + 'Label' => 'No reexported dylibs', + ), + 2097152 => array( + 'Id' => 2097152, + 'Label' => 'Random address', + ), + ); + +} diff --git a/lib/PHPExiftool/Driver/Tag/ExifIFD/SonyRawFileType.php b/lib/PHPExiftool/Driver/Tag/ExifIFD/SonyRawFileType.php new file mode 100644 index 0000000000..0bf2f34b18 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ExifIFD/SonyRawFileType.php @@ -0,0 +1,64 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ExifIFD; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class SonyRawFileType extends AbstractTag +{ + + protected $Id = 28672; + + protected $Name = 'SonyRawFileType'; + + protected $FullName = 'Exif::Main'; + + protected $GroupName = 'ExifIFD'; + + protected $g0 = 'EXIF'; + + protected $g1 = 'IFD0'; + + protected $g2 = 'Image'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Sony Raw File Type'; + + protected $local_g1 = 'ExifIFD'; + + protected $Values = array( + 0 => array( + 'Id' => 0, + 'Label' => 'Sony Uncompressed 14-bit RAW', + ), + 1 => array( + 'Id' => 1, + 'Label' => 'Sony Uncompressed 12-bit RAW', + ), + 2 => array( + 'Id' => 2, + 'Label' => 'Sony Compressed RAW', + ), + 3 => array( + 'Id' => 3, + 'Label' => 'Sony Lossless Compressed RAW', + ), + ); + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/AbstractFileName.php b/lib/PHPExiftool/Driver/Tag/ISO/AbstractFileName.php new file mode 100644 index 0000000000..88c32d7fc2 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/AbstractFileName.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class AbstractFileName extends AbstractTag +{ + + protected $Id = 740; + + protected $Name = 'AbstractFileName'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Abstract File Name'; + + protected $MaxLength = 36; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/BibligraphicFileName.php b/lib/PHPExiftool/Driver/Tag/ISO/BibligraphicFileName.php new file mode 100644 index 0000000000..dcc9594be2 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/BibligraphicFileName.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class BibligraphicFileName extends AbstractTag +{ + + protected $Id = 776; + + protected $Name = 'BibligraphicFileName'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Bibligraphic File Name'; + + protected $MaxLength = 37; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/BootIdentifier.php b/lib/PHPExiftool/Driver/Tag/ISO/BootIdentifier.php new file mode 100644 index 0000000000..e9fe886c7e --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/BootIdentifier.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class BootIdentifier extends AbstractTag +{ + + protected $Id = 39; + + protected $Name = 'BootIdentifier'; + + protected $FullName = 'ISO::BootRecord'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Boot Identifier'; + + protected $MaxLength = 32; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/BootSystem.php b/lib/PHPExiftool/Driver/Tag/ISO/BootSystem.php new file mode 100644 index 0000000000..5f1ab00633 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/BootSystem.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class BootSystem extends AbstractTag +{ + + protected $Id = 7; + + protected $Name = 'BootSystem'; + + protected $FullName = 'ISO::BootRecord'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Boot System'; + + protected $MaxLength = 32; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/CopyrightFileName.php b/lib/PHPExiftool/Driver/Tag/ISO/CopyrightFileName.php new file mode 100644 index 0000000000..5e247fa27f --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/CopyrightFileName.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class CopyrightFileName extends AbstractTag +{ + + protected $Id = 702; + + protected $Name = 'CopyrightFileName'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Copyright File Name'; + + protected $MaxLength = 38; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/DataPreparer.php b/lib/PHPExiftool/Driver/Tag/ISO/DataPreparer.php new file mode 100644 index 0000000000..ce82aa7d03 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/DataPreparer.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class DataPreparer extends AbstractTag +{ + + protected $Id = 446; + + protected $Name = 'DataPreparer'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Data Preparer'; + + protected $MaxLength = 128; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/PathTableLocation.php b/lib/PHPExiftool/Driver/Tag/ISO/PathTableLocation.php new file mode 100644 index 0000000000..120f9f0a40 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/PathTableLocation.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class PathTableLocation extends AbstractTag +{ + + protected $Id = 140; + + protected $Name = 'PathTableLocation'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'int32u'; + + protected $Writable = false; + + protected $Description = 'Path Table Location'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/PathTableSize.php b/lib/PHPExiftool/Driver/Tag/ISO/PathTableSize.php new file mode 100644 index 0000000000..096310c91b --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/PathTableSize.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class PathTableSize extends AbstractTag +{ + + protected $Id = 132; + + protected $Name = 'PathTableSize'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'int32u'; + + protected $Writable = false; + + protected $Description = 'Path Table Size'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/Publisher.php b/lib/PHPExiftool/Driver/Tag/ISO/Publisher.php new file mode 100644 index 0000000000..404bb8d4a2 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/Publisher.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class Publisher extends AbstractTag +{ + + protected $Id = 318; + + protected $Name = 'Publisher'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Publisher'; + + protected $MaxLength = 128; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/RootDirectoryCreateDate.php b/lib/PHPExiftool/Driver/Tag/ISO/RootDirectoryCreateDate.php new file mode 100644 index 0000000000..3c77572566 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/RootDirectoryCreateDate.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class RootDirectoryCreateDate extends AbstractTag +{ + + protected $Id = 174; + + protected $Name = 'RootDirectoryCreateDate'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'undef'; + + protected $Writable = false; + + protected $Description = 'Root Directory Create Date'; + + protected $local_g2 = 'Time'; + + protected $MaxLength = 7; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/Software.php b/lib/PHPExiftool/Driver/Tag/ISO/Software.php new file mode 100644 index 0000000000..eb0dea4ed5 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/Software.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class Software extends AbstractTag +{ + + protected $Id = 574; + + protected $Name = 'Software'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Software'; + + protected $MaxLength = 128; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/System.php b/lib/PHPExiftool/Driver/Tag/ISO/System.php new file mode 100644 index 0000000000..ed8bc467c1 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/System.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class System extends AbstractTag +{ + + protected $Id = 8; + + protected $Name = 'System'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'System'; + + protected $MaxLength = 32; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeBlockCount.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeBlockCount.php new file mode 100644 index 0000000000..d4bf1a22a8 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeBlockCount.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeBlockCount extends AbstractTag +{ + + protected $Id = 80; + + protected $Name = 'VolumeBlockCount'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'int32u'; + + protected $Writable = false; + + protected $Description = 'Volume Block Count'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeBlockSize.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeBlockSize.php new file mode 100644 index 0000000000..96c94d5e19 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeBlockSize.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeBlockSize extends AbstractTag +{ + + protected $Id = 128; + + protected $Name = 'VolumeBlockSize'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'int16u'; + + protected $Writable = false; + + protected $Description = 'Volume Block Size'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeCreateDate.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeCreateDate.php new file mode 100644 index 0000000000..acf284893a --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeCreateDate.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeCreateDate extends AbstractTag +{ + + protected $Id = 813; + + protected $Name = 'VolumeCreateDate'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'undef'; + + protected $Writable = false; + + protected $Description = 'Volume Create Date'; + + protected $local_g2 = 'Time'; + + protected $MaxLength = 17; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeEffectiveDate.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeEffectiveDate.php new file mode 100644 index 0000000000..5db65a5851 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeEffectiveDate.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeEffectiveDate extends AbstractTag +{ + + protected $Id = 864; + + protected $Name = 'VolumeEffectiveDate'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'undef'; + + protected $Writable = false; + + protected $Description = 'Volume Effective Date'; + + protected $local_g2 = 'Time'; + + protected $MaxLength = 17; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeExpirationDate.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeExpirationDate.php new file mode 100644 index 0000000000..b35981541e --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeExpirationDate.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeExpirationDate extends AbstractTag +{ + + protected $Id = 847; + + protected $Name = 'VolumeExpirationDate'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'undef'; + + protected $Writable = false; + + protected $Description = 'Volume Expiration Date'; + + protected $local_g2 = 'Time'; + + protected $MaxLength = 17; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeModifyDate.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeModifyDate.php new file mode 100644 index 0000000000..452d771d4d --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeModifyDate.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeModifyDate extends AbstractTag +{ + + protected $Id = 830; + + protected $Name = 'VolumeModifyDate'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'undef'; + + protected $Writable = false; + + protected $Description = 'Volume Modify Date'; + + protected $local_g2 = 'Time'; + + protected $MaxLength = 17; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeName.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeName.php new file mode 100644 index 0000000000..5092ccf946 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeName.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeName extends AbstractTag +{ + + protected $Id = 40; + + protected $Name = 'VolumeName'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Volume Name'; + + protected $MaxLength = 32; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeSetDiskCount.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeSetDiskCount.php new file mode 100644 index 0000000000..a28bbf472e --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeSetDiskCount.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeSetDiskCount extends AbstractTag +{ + + protected $Id = 120; + + protected $Name = 'VolumeSetDiskCount'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'int16u'; + + protected $Writable = false; + + protected $Description = 'Volume Set Disk Count'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeSetDiskNumber.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeSetDiskNumber.php new file mode 100644 index 0000000000..297c8b7905 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeSetDiskNumber.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeSetDiskNumber extends AbstractTag +{ + + protected $Id = 124; + + protected $Name = 'VolumeSetDiskNumber'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'int16u'; + + protected $Writable = false; + + protected $Description = 'Volume Set Disk Number'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/ISO/VolumeSetName.php b/lib/PHPExiftool/Driver/Tag/ISO/VolumeSetName.php new file mode 100644 index 0000000000..1c4a7120b3 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/ISO/VolumeSetName.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\ISO; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class VolumeSetName extends AbstractTag +{ + + protected $Id = 190; + + protected $Name = 'VolumeSetName'; + + protected $FullName = 'ISO::PrimaryVolume'; + + protected $GroupName = 'ISO'; + + protected $g0 = 'ISO'; + + protected $g1 = 'ISO'; + + protected $g2 = 'Other'; + + protected $Type = 'string'; + + protected $Writable = false; + + protected $Description = 'Volume Set Name'; + + protected $MaxLength = 128; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Matroska/Void.php b/lib/PHPExiftool/Driver/Tag/Matroska/Void0.php similarity index 95% rename from lib/PHPExiftool/Driver/Tag/Matroska/Void.php rename to lib/PHPExiftool/Driver/Tag/Matroska/Void0.php index cd410e202b..3461fa8c8d 100644 --- a/lib/PHPExiftool/Driver/Tag/Matroska/Void.php +++ b/lib/PHPExiftool/Driver/Tag/Matroska/Void0.php @@ -17,7 +17,7 @@ /** * @ExclusionPolicy("all") */ -class Void extends AbstractTag +class Void0 extends AbstractTag { protected $Id = 108; diff --git a/lib/PHPExiftool/Driver/Tag/Minolta/LensType.php b/lib/PHPExiftool/Driver/Tag/Minolta/LensType.php index 06a5ea6812..8e76853770 100644 --- a/lib/PHPExiftool/Driver/Tag/Minolta/LensType.php +++ b/lib/PHPExiftool/Driver/Tag/Minolta/LensType.php @@ -507,6 +507,10 @@ class LensType extends AbstractTag 'Id' => '128.20', 'Label' => 'Sigma 18-35mm F1.8 DC HSM', ), + '128.21' => array( + 'Id' => '128.21', + 'Label' => 'Sigma 50-500mm F4.5-6.3 APO DG OS HSM', + ), 129 => array( 'Id' => 129, 'Label' => 'Tamron Lens (129)', @@ -809,7 +813,7 @@ class LensType extends AbstractTag ), 25651 => array( 'Id' => 25651, - 'Label' => 'Minolta AF 600mm F4', + 'Label' => 'Minolta AF 600mm F4 APO', ), 25661 => array( 'Id' => 25661, @@ -913,7 +917,7 @@ class LensType extends AbstractTag ), 25931 => array( 'Id' => 25931, - 'Label' => 'Minolta AF 200mm F2.8 G APO', + 'Label' => 'Minolta AF 200mm F2.8 APO', ), 25941 => array( 'Id' => 25941, @@ -1001,7 +1005,7 @@ class LensType extends AbstractTag ), 26281 => array( 'Id' => 26281, - 'Label' => 'Minolta AF 80-200mm F2.8 G', + 'Label' => 'Minolta AF 80-200mm F2.8 HS-APO G', ), 26291 => array( 'Id' => 26291, @@ -1217,86 +1221,114 @@ class LensType extends AbstractTag ), '65535.28' => array( 'Id' => '65535.28', - 'Label' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', + 'Label' => 'Sony FE 24-70mm F2.8 GM', ), '65535.29' => array( 'Id' => '65535.29', - 'Label' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', + 'Label' => 'Sony FE 85mm F1.4 GM', ), '65535.30' => array( 'Id' => '65535.30', - 'Label' => 'Sigma 19mm F2.8 [EX] DN', + 'Label' => 'Sony FE 50mm F1.8', ), '65535.31' => array( 'Id' => '65535.31', - 'Label' => 'Sigma 30mm F2.8 [EX] DN', + 'Label' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', ), '65535.32' => array( 'Id' => '65535.32', - 'Label' => 'Sigma 60mm F2.8 DN', + 'Label' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', ), '65535.33' => array( 'Id' => '65535.33', - 'Label' => 'Tamron 18-200mm F3.5-6.3 Di III VC', + 'Label' => 'Sony FE 70-300mm F4.5-5.6 G OSS', ), '65535.34' => array( 'Id' => '65535.34', - 'Label' => 'Zeiss Batis 25mm F2', + 'Label' => 'Sony FE 70-200mm F2.8 GM OSS', ), '65535.35' => array( 'Id' => '65535.35', - 'Label' => 'Zeiss Batis 85mm F1.8', + 'Label' => 'Sigma 19mm F2.8 [EX] DN', ), '65535.36' => array( 'Id' => '65535.36', - 'Label' => 'Zeiss Loxia 21mm F2.8', + 'Label' => 'Sigma 30mm F2.8 [EX] DN', ), '65535.37' => array( 'Id' => '65535.37', - 'Label' => 'Zeiss Loxia 35mm F2', + 'Label' => 'Sigma 60mm F2.8 DN', ), '65535.38' => array( 'Id' => '65535.38', - 'Label' => 'Zeiss Loxia 50mm F2', + 'Label' => 'Sigma 30mm F1.4 DC DN | C', ), '65535.39' => array( 'Id' => '65535.39', - 'Label' => 'Zeiss Touit 12mm F2.8', + 'Label' => 'Tamron 18-200mm F3.5-6.3 Di III VC', ), '65535.40' => array( 'Id' => '65535.40', - 'Label' => 'Zeiss Touit 32mm F1.8', + 'Label' => 'Zeiss Batis 25mm F2', ), '65535.41' => array( 'Id' => '65535.41', - 'Label' => 'Zeiss Touit 50mm F2.8 Macro', + 'Label' => 'Zeiss Batis 85mm F1.8', ), '65535.42' => array( 'Id' => '65535.42', - 'Label' => 'Arax MC 35mm F2.8 Tilt+Shift', + 'Label' => 'Zeiss Batis 18mm F2.8', ), '65535.43' => array( 'Id' => '65535.43', - 'Label' => 'Arax MC 80mm F2.8 Tilt+Shift', + 'Label' => 'Zeiss Loxia 21mm F2.8', ), '65535.44' => array( 'Id' => '65535.44', - 'Label' => 'Zenitar MF 16mm F2.8 Fisheye M42', + 'Label' => 'Zeiss Loxia 35mm F2', ), '65535.45' => array( 'Id' => '65535.45', - 'Label' => 'Samyang 500mm Mirror F8.0', + 'Label' => 'Zeiss Loxia 50mm F2', ), '65535.46' => array( 'Id' => '65535.46', - 'Label' => 'Pentacon Auto 135mm F2.8', + 'Label' => 'Zeiss Touit 12mm F2.8', ), '65535.47' => array( 'Id' => '65535.47', - 'Label' => 'Pentacon Auto 29mm F2.8', + 'Label' => 'Zeiss Touit 32mm F1.8', ), '65535.48' => array( 'Id' => '65535.48', + 'Label' => 'Zeiss Touit 50mm F2.8 Macro', + ), + '65535.49' => array( + 'Id' => '65535.49', + 'Label' => 'Arax MC 35mm F2.8 Tilt+Shift', + ), + '65535.50' => array( + 'Id' => '65535.50', + 'Label' => 'Arax MC 80mm F2.8 Tilt+Shift', + ), + '65535.51' => array( + 'Id' => '65535.51', + 'Label' => 'Zenitar MF 16mm F2.8 Fisheye M42', + ), + '65535.52' => array( + 'Id' => '65535.52', + 'Label' => 'Samyang 500mm Mirror F8.0', + ), + '65535.53' => array( + 'Id' => '65535.53', + 'Label' => 'Pentacon Auto 135mm F2.8', + ), + '65535.54' => array( + 'Id' => '65535.54', + 'Label' => 'Pentacon Auto 29mm F2.8', + ), + '65535.55' => array( + 'Id' => '65535.55', 'Label' => 'Helios 44-2 58mm F2.0', ), ); diff --git a/lib/PHPExiftool/Driver/Tag/Nikon/ISOExpansion.php b/lib/PHPExiftool/Driver/Tag/Nikon/ISOExpansion.php index c834c31288..a8e9599b95 100644 --- a/lib/PHPExiftool/Driver/Tag/Nikon/ISOExpansion.php +++ b/lib/PHPExiftool/Driver/Tag/Nikon/ISOExpansion.php @@ -111,6 +111,22 @@ class ISOExpansion extends AbstractTag 'Id' => 272, 'Label' => 'Hi 4.0', ), + 273 => array( + 'Id' => 273, + 'Label' => 'Hi 4.3', + ), + 274 => array( + 'Id' => 274, + 'Label' => 'Hi 4.5', + ), + 275 => array( + 'Id' => 275, + 'Label' => 'Hi 4.7', + ), + 276 => array( + 'Id' => 276, + 'Label' => 'Hi 5.0', + ), 513 => array( 'Id' => 513, 'Label' => 'Lo 0.3', diff --git a/lib/PHPExiftool/Driver/Tag/Nikon/MemoryCardNumber.php b/lib/PHPExiftool/Driver/Tag/Nikon/MemoryCardNumber.php new file mode 100644 index 0000000000..66314216e1 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Nikon/MemoryCardNumber.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Nikon; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class MemoryCardNumber extends AbstractTag +{ + + protected $Id = 2; + + protected $Name = 'MemoryCardNumber'; + + protected $FullName = 'Nikon::FileInfo'; + + protected $GroupName = 'Nikon'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Nikon'; + + protected $g2 = 'Image'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Memory Card Number'; + + protected $flag_Permanent = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Nikon/RetouchHistory.php b/lib/PHPExiftool/Driver/Tag/Nikon/RetouchHistory.php index e60f708aa1..f9cdbf7e81 100644 --- a/lib/PHPExiftool/Driver/Tag/Nikon/RetouchHistory.php +++ b/lib/PHPExiftool/Driver/Tag/Nikon/RetouchHistory.php @@ -165,10 +165,58 @@ class RetouchHistory extends AbstractTag 'Id' => 38, 'Label' => 'Selective Color', ), + 39 => array( + 'Id' => 39, + 'Label' => 'Glamour', + ), 40 => array( 'Id' => 40, 'Label' => 'Drawing', ), + 44 => array( + 'Id' => 44, + 'Label' => 'Pop', + ), + 45 => array( + 'Id' => 45, + 'Label' => 'Toy Camera Effect 1', + ), + 46 => array( + 'Id' => 46, + 'Label' => 'Toy Camera Effect 2', + ), + 47 => array( + 'Id' => 47, + 'Label' => 'Cross Process (red)', + ), + 48 => array( + 'Id' => 48, + 'Label' => 'Cross Process (blue)', + ), + 49 => array( + 'Id' => 49, + 'Label' => 'Cross Process (green)', + ), + 50 => array( + 'Id' => 50, + 'Label' => 'Cross Process (yellow)', + ), + 51 => array( + 'Id' => 51, + 'Label' => 'Super Vivid', + ), + 52 => array( + 'Id' => 52, + 'Label' => 'High-contrast Monochrome', + ), + 53 => array( + 'Id' => 53, + 'Label' => 'High Key', + ), + 54 => array( + 'Id' => 54, + 'Label' => 'Low Key', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/Olympus/CameraType.php b/lib/PHPExiftool/Driver/Tag/Olympus/CameraType.php index 4bf06327e8..b1c389006a 100644 --- a/lib/PHPExiftool/Driver/Tag/Olympus/CameraType.php +++ b/lib/PHPExiftool/Driver/Tag/Olympus/CameraType.php @@ -749,7 +749,7 @@ class CameraType extends AbstractTag ), 'D4585' => array( 'Id' => 'D4585', - 'Label' => 'SH-2', + 'Label' => 'SH-2 / SH-3', ), 'D4586' => array( 'Id' => 'D4586', @@ -759,6 +759,10 @@ class CameraType extends AbstractTag 'Id' => 'D4587', 'Label' => 'TG-860', ), + 'D4591' => array( + 'Id' => 'D4591', + 'Label' => 'TG-870', + ), 'D4809' => array( 'Id' => 'D4809', 'Label' => 'C2500L', @@ -911,6 +915,10 @@ class CameraType extends AbstractTag 'Id' => 'S0059', 'Label' => 'E-M10MarkII', ), + 'S0061' => array( + 'Id' => 'S0061', + 'Label' => 'PEN-F', + ), 'SR45' => array( 'Id' => 'SR45', 'Label' => 'D220', diff --git a/lib/PHPExiftool/Driver/Tag/Olympus/CameraType2.php b/lib/PHPExiftool/Driver/Tag/Olympus/CameraType2.php index faae1d9f31..478af7ffcd 100644 --- a/lib/PHPExiftool/Driver/Tag/Olympus/CameraType2.php +++ b/lib/PHPExiftool/Driver/Tag/Olympus/CameraType2.php @@ -751,7 +751,7 @@ class CameraType2 extends AbstractTag ), 'D4585' => array( 'Id' => 'D4585', - 'Label' => 'SH-2', + 'Label' => 'SH-2 / SH-3', ), 'D4586' => array( 'Id' => 'D4586', @@ -761,6 +761,10 @@ class CameraType2 extends AbstractTag 'Id' => 'D4587', 'Label' => 'TG-860', ), + 'D4591' => array( + 'Id' => 'D4591', + 'Label' => 'TG-870', + ), 'D4809' => array( 'Id' => 'D4809', 'Label' => 'C2500L', @@ -913,6 +917,10 @@ class CameraType2 extends AbstractTag 'Id' => 'S0059', 'Label' => 'E-M10MarkII', ), + 'S0061' => array( + 'Id' => 'S0061', + 'Label' => 'PEN-F', + ), 'SR45' => array( 'Id' => 'SR45', 'Label' => 'D220', diff --git a/lib/PHPExiftool/Driver/Tag/Olympus/LensType.php b/lib/PHPExiftool/Driver/Tag/Olympus/LensType.php index ae2ed79b6b..d3e9230c3c 100644 --- a/lib/PHPExiftool/Driver/Tag/Olympus/LensType.php +++ b/lib/PHPExiftool/Driver/Tag/Olympus/LensType.php @@ -289,6 +289,10 @@ class LensType extends AbstractTag 'Id' => '1 06 00', 'Label' => 'Sigma APO 50-500mm F4.0-6.3 EX DG HSM', ), + '1 06 10' => array( + 'Id' => '1 06 10', + 'Label' => 'Sigma 30mm F1.4 DC DN | C', + ), '1 07 00' => array( 'Id' => '1 07 00', 'Label' => 'Sigma Macro 105mm F2.8 EX DG', @@ -441,6 +445,10 @@ class LensType extends AbstractTag 'Id' => '2 22 10', 'Label' => 'Leica DG Summilux 15mm F1.7 Asph.', ), + '2 23 10' => array( + 'Id' => '2 23 10', + 'Label' => 'Lumix G Vario 35-100mm F4.0-5.6 Asph. Mega OIS', + ), '2 24 10' => array( 'Id' => '2 24 10', 'Label' => 'Lumix G Macro 30mm F2.8 Asph. Mega OIS', @@ -449,6 +457,18 @@ class LensType extends AbstractTag 'Id' => '2 25 10', 'Label' => 'Lumix G 42.5mm F1.7 Asph. Power OIS', ), + '2 26 10' => array( + 'Id' => '2 26 10', + 'Label' => 'Lumix G 25mm F1.7 Asph.', + ), + '2 27 10' => array( + 'Id' => '2 27 10', + 'Label' => 'Leica DG Vario-Elmar 100-400mm F4.0-6.3 Asph. Power OIS', + ), + '2 28 10' => array( + 'Id' => '2 28 10', + 'Label' => 'Lumix G Vario 12-60mm F3.5-5.6 Asph. Power OIS', + ), '3 01 00' => array( 'Id' => '3 01 00', 'Label' => 'Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.', diff --git a/lib/PHPExiftool/Driver/Tag/Olympus/Model.php b/lib/PHPExiftool/Driver/Tag/Olympus/Model.php index 2014f50ed1..6521c16c88 100644 --- a/lib/PHPExiftool/Driver/Tag/Olympus/Model.php +++ b/lib/PHPExiftool/Driver/Tag/Olympus/Model.php @@ -751,7 +751,7 @@ class Model extends AbstractTag ), 'D4585' => array( 'Id' => 'D4585', - 'Label' => 'SH-2', + 'Label' => 'SH-2 / SH-3', ), 'D4586' => array( 'Id' => 'D4586', @@ -761,6 +761,10 @@ class Model extends AbstractTag 'Id' => 'D4587', 'Label' => 'TG-860', ), + 'D4591' => array( + 'Id' => 'D4591', + 'Label' => 'TG-870', + ), 'D4809' => array( 'Id' => 'D4809', 'Label' => 'C2500L', @@ -913,6 +917,10 @@ class Model extends AbstractTag 'Id' => 'S0059', 'Label' => 'E-M10MarkII', ), + 'S0061' => array( + 'Id' => 'S0061', + 'Label' => 'PEN-F', + ), 'SR45' => array( 'Id' => 'SR45', 'Label' => 'D220', diff --git a/lib/PHPExiftool/Driver/Tag/Pentax/LensType.php b/lib/PHPExiftool/Driver/Tag/Pentax/LensType.php index c40dce7e18..49a08dfa3d 100644 --- a/lib/PHPExiftool/Driver/Tag/Pentax/LensType.php +++ b/lib/PHPExiftool/Driver/Tag/Pentax/LensType.php @@ -935,7 +935,7 @@ class LensType extends AbstractTag ), '8 30' => array( 'Id' => '8 30', - 'Label' => 'Sigma 17-70mm F2.8-4 DC Macro HSM Contemporary', + 'Label' => 'Sigma 17-70mm F2.8-4 DC Macro HSM | C', ), '8 31' => array( 'Id' => '8 31', @@ -957,10 +957,18 @@ class LensType extends AbstractTag 'Id' => '8 60', 'Label' => 'HD PENTAX-D FA* 70-200mm F2.8 ED DC AW', ), + '8 61' => array( + 'Id' => '8 61', + 'Label' => 'HD PENTAX-D FA 28-105mm F3.5-5.6 ED DC WR', + ), '8 62' => array( 'Id' => '8 62', 'Label' => 'HD PENTAX-D FA 24-70mm F2.8 ED SDM WR', ), + '8 63' => array( + 'Id' => '8 63', + 'Label' => 'HD PENTAX-D FA 15-30mm F2.8 ED SDM WR', + ), '8 198' => array( 'Id' => '8 198', 'Label' => 'smc PENTAX-DA L 18-50mm F4-5.6 DC WR RE', diff --git a/lib/PHPExiftool/Driver/Tag/Pentax/PentaxModelID.php b/lib/PHPExiftool/Driver/Tag/Pentax/PentaxModelID.php index 87c14104f0..24233c0531 100644 --- a/lib/PHPExiftool/Driver/Tag/Pentax/PentaxModelID.php +++ b/lib/PHPExiftool/Driver/Tag/Pentax/PentaxModelID.php @@ -571,6 +571,10 @@ class PentaxModelID extends AbstractTag 'Id' => 77960, 'Label' => 'WG-5 GPS', ), + 77970 => array( + 'Id' => 77970, + 'Label' => 'K-1', + ), 77980 => array( 'Id' => 77980, 'Label' => 'K-3 II', diff --git a/lib/PHPExiftool/Driver/Tag/Pentax/RawDevelopmentProcess.php b/lib/PHPExiftool/Driver/Tag/Pentax/RawDevelopmentProcess.php index 6ee8458430..6a6f1b1a47 100644 --- a/lib/PHPExiftool/Driver/Tag/Pentax/RawDevelopmentProcess.php +++ b/lib/PHPExiftool/Driver/Tag/Pentax/RawDevelopmentProcess.php @@ -99,6 +99,10 @@ class RawDevelopmentProcess extends AbstractTag 'Id' => 15, 'Label' => '15 (K-S1,K-S2)', ), + 16 => array( + 'Id' => 16, + 'Label' => '16 (K-1)', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/Compression.php b/lib/PHPExiftool/Driver/Tag/Photoshop/Compression.php new file mode 100644 index 0000000000..55b125209d --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/Compression.php @@ -0,0 +1,62 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class Compression extends AbstractTag +{ + + protected $Id = 0; + + protected $Name = 'Compression'; + + protected $FullName = 'Photoshop::ImageData'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Image'; + + protected $Type = 'int16u'; + + protected $Writable = false; + + protected $Description = 'Compression'; + + protected $Values = array( + 0 => array( + 'Id' => 0, + 'Label' => 'Uncompressed', + ), + 1 => array( + 'Id' => 1, + 'Label' => 'RLE', + ), + 2 => array( + 'Id' => 2, + 'Label' => 'ZIP without prediction', + ), + 3 => array( + 'Id' => 3, + 'Label' => 'ZIP with prediction', + ), + ); + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/HasRealMergedData.php b/lib/PHPExiftool/Driver/Tag/Photoshop/HasRealMergedData.php new file mode 100644 index 0000000000..766df269af --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/HasRealMergedData.php @@ -0,0 +1,54 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class HasRealMergedData extends AbstractTag +{ + + protected $Id = 4; + + protected $Name = 'HasRealMergedData'; + + protected $FullName = 'Photoshop::VersionInfo'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Image'; + + protected $Type = 'int8u'; + + protected $Writable = false; + + protected $Description = 'Has Real Merged Data'; + + protected $Values = array( + 0 => array( + 'Id' => 0, + 'Label' => 'No', + ), + 1 => array( + 'Id' => 1, + 'Label' => 'Yes', + ), + ); + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/LayerBlendModes.php b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerBlendModes.php new file mode 100644 index 0000000000..4c504e6cd7 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerBlendModes.php @@ -0,0 +1,160 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class LayerBlendModes extends AbstractTag +{ + + protected $Id = '_xbnd'; + + protected $Name = 'LayerBlendModes'; + + protected $FullName = 'Photoshop::Layers'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Image'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Layer Blend Modes'; + + protected $flag_List = true; + + protected $Values = array( + 'colr' => array( + 'Id' => 'colr', + 'Label' => 'Color', + ), + 'dark' => array( + 'Id' => 'dark', + 'Label' => 'Darken', + ), + 'diff' => array( + 'Id' => 'diff', + 'Label' => 'Difference', + ), + 'diss' => array( + 'Id' => 'diss', + 'Label' => 'Dissolve', + ), + 'div ' => array( + 'Id' => 'div ', + 'Label' => 'Color Dodge', + ), + 'dkCl' => array( + 'Id' => 'dkCl', + 'Label' => 'Darker Color', + ), + 'fdiv' => array( + 'Id' => 'fdiv', + 'Label' => 'Divide', + ), + 'fsub' => array( + 'Id' => 'fsub', + 'Label' => 'Subtract', + ), + 'hLit' => array( + 'Id' => 'hLit', + 'Label' => 'Hard Light', + ), + 'hMix' => array( + 'Id' => 'hMix', + 'Label' => 'Hard Mix', + ), + 'hue ' => array( + 'Id' => 'hue ', + 'Label' => 'Hue', + ), + 'idiv' => array( + 'Id' => 'idiv', + 'Label' => 'Color Burn', + ), + 'lLit' => array( + 'Id' => 'lLit', + 'Label' => 'Linear Light', + ), + 'lbrn' => array( + 'Id' => 'lbrn', + 'Label' => 'Linear Burn', + ), + 'lddg' => array( + 'Id' => 'lddg', + 'Label' => 'Linear Dodge', + ), + 'lgCl' => array( + 'Id' => 'lgCl', + 'Label' => 'Lighter Color', + ), + 'lite' => array( + 'Id' => 'lite', + 'Label' => 'Lighten', + ), + 'lum ' => array( + 'Id' => 'lum ', + 'Label' => 'Luminosity', + ), + 'mul ' => array( + 'Id' => 'mul ', + 'Label' => 'Multiply', + ), + 'norm' => array( + 'Id' => 'norm', + 'Label' => 'Normal', + ), + 'over' => array( + 'Id' => 'over', + 'Label' => 'Overlay', + ), + 'pLit' => array( + 'Id' => 'pLit', + 'Label' => 'Pin Light', + ), + 'pass' => array( + 'Id' => 'pass', + 'Label' => 'Pass Through', + ), + 'sLit' => array( + 'Id' => 'sLit', + 'Label' => 'Soft Light', + ), + 'sat ' => array( + 'Id' => 'sat ', + 'Label' => 'Saturation', + ), + 'scrn' => array( + 'Id' => 'scrn', + 'Label' => 'Screen', + ), + 'smud' => array( + 'Id' => 'smud', + 'Label' => 'Exclusion', + ), + 'vLit' => array( + 'Id' => 'vLit', + 'Label' => 'Vivid Light', + ), + ); + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/Slices.php b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerCount.php similarity index 75% rename from lib/PHPExiftool/Driver/Tag/Photoshop/Slices.php rename to lib/PHPExiftool/Driver/Tag/Photoshop/LayerCount.php index fd7aedb67c..e8d694f824 100644 --- a/lib/PHPExiftool/Driver/Tag/Photoshop/Slices.php +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerCount.php @@ -17,14 +17,14 @@ /** * @ExclusionPolicy("all") */ -class Slices extends AbstractTag +class LayerCount extends AbstractTag { - protected $Id = 1050; + protected $Id = '_xcnt'; - protected $Name = 'Slices'; + protected $Name = 'LayerCount'; - protected $FullName = 'Photoshop::Main'; + protected $FullName = 'Photoshop::Layers'; protected $GroupName = 'Photoshop'; @@ -38,6 +38,6 @@ class Slices extends AbstractTag protected $Writable = false; - protected $Description = 'Slices'; + protected $Description = 'Layer Count'; } diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/VersionInfo.php b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerNames.php similarity index 72% rename from lib/PHPExiftool/Driver/Tag/Photoshop/VersionInfo.php rename to lib/PHPExiftool/Driver/Tag/Photoshop/LayerNames.php index e27f947e83..e1173f21a2 100644 --- a/lib/PHPExiftool/Driver/Tag/Photoshop/VersionInfo.php +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerNames.php @@ -17,14 +17,14 @@ /** * @ExclusionPolicy("all") */ -class VersionInfo extends AbstractTag +class LayerNames extends AbstractTag { - protected $Id = 1057; + protected $Id = '_xnam'; - protected $Name = 'VersionInfo'; + protected $Name = 'LayerNames'; - protected $FullName = 'Photoshop::Main'; + protected $FullName = 'Photoshop::Layers'; protected $GroupName = 'Photoshop'; @@ -38,6 +38,8 @@ class VersionInfo extends AbstractTag protected $Writable = false; - protected $Description = 'Version Info'; + protected $Description = 'Layer Names'; + + protected $flag_List = true; } diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/LayerOpacities.php b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerOpacities.php new file mode 100644 index 0000000000..45575531ef --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerOpacities.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class LayerOpacities extends AbstractTag +{ + + protected $Id = '_xopc'; + + protected $Name = 'LayerOpacities'; + + protected $FullName = 'Photoshop::Layers'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Image'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Layer Opacities'; + + protected $flag_List = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/LayerRectangles.php b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerRectangles.php new file mode 100644 index 0000000000..65dcb0245f --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerRectangles.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class LayerRectangles extends AbstractTag +{ + + protected $Id = '_xrct'; + + protected $Name = 'LayerRectangles'; + + protected $FullName = 'Photoshop::Layers'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Image'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Layer Rectangles'; + + protected $flag_List = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/LayerUnicodeNames.php b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerUnicodeNames.php new file mode 100644 index 0000000000..b26916e15f --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/LayerUnicodeNames.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class LayerUnicodeNames extends AbstractTag +{ + + protected $Id = 'luni'; + + protected $Name = 'LayerUnicodeNames'; + + protected $FullName = 'Photoshop::Layers'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Image'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Layer Unicode Names'; + + protected $flag_List = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/NumSlices.php b/lib/PHPExiftool/Driver/Tag/Photoshop/NumSlices.php new file mode 100644 index 0000000000..8bb27159ff --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/NumSlices.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class NumSlices extends AbstractTag +{ + + protected $Id = 24; + + protected $Name = 'NumSlices'; + + protected $FullName = 'Photoshop::SliceInfo'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Other'; + + protected $Type = 'int32u'; + + protected $Writable = false; + + protected $Description = 'Num Slices'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/PhotoshopFormat.php b/lib/PHPExiftool/Driver/Tag/Photoshop/PhotoshopFormat.php index abe36aea4b..5adefd1583 100644 --- a/lib/PHPExiftool/Driver/Tag/Photoshop/PhotoshopFormat.php +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/PhotoshopFormat.php @@ -47,7 +47,7 @@ class PhotoshopFormat extends AbstractTag ), 1 => array( 'Id' => 1, - 'Label' => 'Optimised', + 'Label' => 'Optimized', ), 257 => array( 'Id' => 257, diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/PixelAspectRatio.php b/lib/PHPExiftool/Driver/Tag/Photoshop/PixelAspectRatio.php index 327815dbc6..bec62bd11b 100644 --- a/lib/PHPExiftool/Driver/Tag/Photoshop/PixelAspectRatio.php +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/PixelAspectRatio.php @@ -20,11 +20,11 @@ class PixelAspectRatio extends AbstractTag { - protected $Id = 1064; + protected $Id = 4; protected $Name = 'PixelAspectRatio'; - protected $FullName = 'Photoshop::Main'; + protected $FullName = 'Photoshop::PixelInfo'; protected $GroupName = 'Photoshop'; @@ -34,7 +34,7 @@ class PixelAspectRatio extends AbstractTag protected $g2 = 'Image'; - protected $Type = '?'; + protected $Type = 'double'; protected $Writable = false; diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/PrintPosition.php b/lib/PHPExiftool/Driver/Tag/Photoshop/PrintPosition.php new file mode 100644 index 0000000000..c4b24e95cf --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/PrintPosition.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class PrintPosition extends AbstractTag +{ + + protected $Id = 2; + + protected $Name = 'PrintPosition'; + + protected $FullName = 'Photoshop::PrintScaleInfo'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Image'; + + protected $Type = 'float'; + + protected $Writable = false; + + protected $Description = 'Print Position'; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/PrintScale.php b/lib/PHPExiftool/Driver/Tag/Photoshop/PrintScale.php index f08bf046f8..c30b523f35 100644 --- a/lib/PHPExiftool/Driver/Tag/Photoshop/PrintScale.php +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/PrintScale.php @@ -20,11 +20,11 @@ class PrintScale extends AbstractTag { - protected $Id = 1062; + protected $Id = 10; protected $Name = 'PrintScale'; - protected $FullName = 'Photoshop::Main'; + protected $FullName = 'Photoshop::PrintScaleInfo'; protected $GroupName = 'Photoshop'; @@ -34,7 +34,7 @@ class PrintScale extends AbstractTag protected $g2 = 'Image'; - protected $Type = '?'; + protected $Type = 'float'; protected $Writable = false; diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/PrintStyle.php b/lib/PHPExiftool/Driver/Tag/Photoshop/PrintStyle.php index cc3abf98f4..4223522639 100644 --- a/lib/PHPExiftool/Driver/Tag/Photoshop/PrintStyle.php +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/PrintStyle.php @@ -20,11 +20,11 @@ class PrintStyle extends AbstractTag { - protected $Id = 1083; + protected $Id = 'mixed'; protected $Name = 'PrintStyle'; - protected $FullName = 'Photoshop::Main'; + protected $FullName = 'mixed'; protected $GroupName = 'Photoshop'; @@ -34,10 +34,25 @@ class PrintStyle extends AbstractTag protected $g2 = 'Image'; - protected $Type = '?'; + protected $Type = 'mixed'; protected $Writable = false; protected $Description = 'Print Style'; + protected $Values = array( + 0 => array( + 'Id' => 0, + 'Label' => 'Centered', + ), + 1 => array( + 'Id' => 1, + 'Label' => 'Size to Fit', + ), + 2 => array( + 'Id' => 2, + 'Label' => 'User Defined', + ), + ); + } diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/ReaderName.php b/lib/PHPExiftool/Driver/Tag/Photoshop/ReaderName.php new file mode 100644 index 0000000000..17f5be08e5 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/ReaderName.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class ReaderName extends AbstractTag +{ + + protected $Id = 9; + + protected $Name = 'ReaderName'; + + protected $FullName = 'Photoshop::VersionInfo'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Image'; + + protected $Type = 'var_ustr32'; + + protected $Writable = false; + + protected $Description = 'Reader Name'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/SlicesGroupName.php b/lib/PHPExiftool/Driver/Tag/Photoshop/SlicesGroupName.php new file mode 100644 index 0000000000..c7ff375e4a --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/SlicesGroupName.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class SlicesGroupName extends AbstractTag +{ + + protected $Id = 20; + + protected $Name = 'SlicesGroupName'; + + protected $FullName = 'Photoshop::SliceInfo'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Other'; + + protected $Type = 'var_ustr32'; + + protected $Writable = false; + + protected $Description = 'Slices Group Name'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/URLList.php b/lib/PHPExiftool/Driver/Tag/Photoshop/URLList.php index 19f28ade0d..635fcb52c1 100644 --- a/lib/PHPExiftool/Driver/Tag/Photoshop/URLList.php +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/URLList.php @@ -40,4 +40,6 @@ class URLList extends AbstractTag protected $Description = 'URL List'; + protected $flag_List = true; + } diff --git a/lib/PHPExiftool/Driver/Tag/Photoshop/WriterName.php b/lib/PHPExiftool/Driver/Tag/Photoshop/WriterName.php new file mode 100644 index 0000000000..aeb50b7dfe --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Photoshop/WriterName.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Photoshop; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class WriterName extends AbstractTag +{ + + protected $Id = 5; + + protected $Name = 'WriterName'; + + protected $FullName = 'Photoshop::VersionInfo'; + + protected $GroupName = 'Photoshop'; + + protected $g0 = 'Photoshop'; + + protected $g1 = 'Photoshop'; + + protected $g2 = 'Image'; + + protected $Type = 'var_ustr32'; + + protected $Writable = false; + + protected $Description = 'Writer Name'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/QuickTime/FirmwareVersion.php b/lib/PHPExiftool/Driver/Tag/QuickTime/FirmwareVersion.php index 8cda0a6312..ed95152393 100644 --- a/lib/PHPExiftool/Driver/Tag/QuickTime/FirmwareVersion.php +++ b/lib/PHPExiftool/Driver/Tag/QuickTime/FirmwareVersion.php @@ -20,7 +20,7 @@ class FirmwareVersion extends AbstractTag { - protected $Id = 'CNFV'; + protected $Id = 'mixed'; protected $Name = 'FirmwareVersion'; @@ -34,7 +34,7 @@ class FirmwareVersion extends AbstractTag protected $g2 = 'Video'; - protected $Type = 'string'; + protected $Type = 'mixed'; protected $Writable = false; diff --git a/lib/PHPExiftool/Driver/Tag/QuickTime/LensSerialNumber.php b/lib/PHPExiftool/Driver/Tag/QuickTime/LensSerialNumber.php new file mode 100644 index 0000000000..e7a7b9a529 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/QuickTime/LensSerialNumber.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\QuickTime; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class LensSerialNumber extends AbstractTag +{ + + protected $Id = 'LENS'; + + protected $Name = 'LensSerialNumber'; + + protected $FullName = 'QuickTime::UserData'; + + protected $GroupName = 'QuickTime'; + + protected $g0 = 'QuickTime'; + + protected $g1 = 'QuickTime'; + + protected $g2 = 'Video'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Lens Serial Number'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/QuickTime/SerialNumberHash.php b/lib/PHPExiftool/Driver/Tag/QuickTime/SerialNumberHash.php new file mode 100644 index 0000000000..fb2a31786b --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/QuickTime/SerialNumberHash.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\QuickTime; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class SerialNumberHash extends AbstractTag +{ + + protected $Id = 'CAME'; + + protected $Name = 'SerialNumberHash'; + + protected $FullName = 'QuickTime::UserData'; + + protected $GroupName = 'QuickTime'; + + protected $g0 = 'QuickTime'; + + protected $g1 = 'QuickTime'; + + protected $g2 = 'Video'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Camera Serial Number Hash'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/QuickTime/UUIDUnknown.php b/lib/PHPExiftool/Driver/Tag/QuickTime/UUIDUnknown.php index 44690f8c43..294a2b7878 100644 --- a/lib/PHPExiftool/Driver/Tag/QuickTime/UUIDUnknown.php +++ b/lib/PHPExiftool/Driver/Tag/QuickTime/UUIDUnknown.php @@ -40,8 +40,6 @@ class UUIDUnknown extends AbstractTag protected $Description = 'UUID-Unknown'; - protected $flag_Binary = true; - protected $Index = 'mixed'; } diff --git a/lib/PHPExiftool/Driver/Tag/QuickTime/UserDataDji.php b/lib/PHPExiftool/Driver/Tag/QuickTime/UserDataDji.php new file mode 100644 index 0000000000..507cc992f9 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/QuickTime/UserDataDji.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\QuickTime; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class UserDataDji extends AbstractTag +{ + + protected $Id = '\\xa9dji'; + + protected $Name = 'UserData_dji'; + + protected $FullName = 'QuickTime::UserData'; + + protected $GroupName = 'QuickTime'; + + protected $g0 = 'QuickTime'; + + protected $g1 = 'QuickTime'; + + protected $g2 = 'Video'; + + protected $Type = 'undef'; + + protected $Writable = false; + + protected $Description = 'User Data dji'; + + protected $flag_Binary = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/QuickTime/UserDataRes.php b/lib/PHPExiftool/Driver/Tag/QuickTime/UserDataRes.php new file mode 100644 index 0000000000..d121f4deaa --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/QuickTime/UserDataRes.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\QuickTime; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class UserDataRes extends AbstractTag +{ + + protected $Id = '\\xa9res'; + + protected $Name = 'UserData_res'; + + protected $FullName = 'QuickTime::UserData'; + + protected $GroupName = 'QuickTime'; + + protected $g0 = 'QuickTime'; + + protected $g1 = 'QuickTime'; + + protected $g2 = 'Video'; + + protected $Type = 'undef'; + + protected $Writable = false; + + protected $Description = 'User Data res'; + + protected $flag_Binary = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/QuickTime/UserDataUid.php b/lib/PHPExiftool/Driver/Tag/QuickTime/UserDataUid.php new file mode 100644 index 0000000000..4beaec6df8 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/QuickTime/UserDataUid.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\QuickTime; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class UserDataUid extends AbstractTag +{ + + protected $Id = '\\xa9uid'; + + protected $Name = 'UserData_uid'; + + protected $FullName = 'QuickTime::UserData'; + + protected $GroupName = 'QuickTime'; + + protected $g0 = 'QuickTime'; + + protected $g1 = 'QuickTime'; + + protected $g2 = 'Video'; + + protected $Type = 'undef'; + + protected $Writable = false; + + protected $Description = 'User Data uid'; + + protected $flag_Binary = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/RAF/RelativeExposure.php b/lib/PHPExiftool/Driver/Tag/RAF/RelativeExposure.php new file mode 100644 index 0000000000..133dc968c3 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/RAF/RelativeExposure.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\RAF; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class RelativeExposure extends AbstractTag +{ + + protected $Id = 37376; + + protected $Name = 'RelativeExposure'; + + protected $FullName = 'FujiFilm::RAF'; + + protected $GroupName = 'RAF'; + + protected $g0 = 'RAF'; + + protected $g1 = 'RAF'; + + protected $g2 = 'Image'; + + protected $Type = 'rational32s'; + + protected $Writable = false; + + protected $Description = 'Relative Exposure'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Samsung/EmbeddedVideoFile.php b/lib/PHPExiftool/Driver/Tag/Samsung/EmbeddedVideoFile.php new file mode 100644 index 0000000000..9eda0c5097 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Samsung/EmbeddedVideoFile.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Samsung; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class EmbeddedVideoFile extends AbstractTag +{ + + protected $Id = '0x0a30'; + + protected $Name = 'EmbeddedVideoFile'; + + protected $FullName = 'Samsung::Trailer'; + + protected $GroupName = 'Samsung'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Samsung'; + + protected $g2 = 'Other'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Embedded Video File'; + + protected $flag_Binary = true; + + protected $flag_Permanent = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Samsung/EmbeddedVideoType.php b/lib/PHPExiftool/Driver/Tag/Samsung/EmbeddedVideoType.php new file mode 100644 index 0000000000..381b589590 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Samsung/EmbeddedVideoType.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Samsung; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class EmbeddedVideoType extends AbstractTag +{ + + protected $Id = '0x0a30-name'; + + protected $Name = 'EmbeddedVideoType'; + + protected $FullName = 'Samsung::Trailer'; + + protected $GroupName = 'Samsung'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Samsung'; + + protected $g2 = 'Other'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Embedded Video Type'; + + protected $flag_Permanent = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Samsung/TimeStamp.php b/lib/PHPExiftool/Driver/Tag/Samsung/TimeStamp.php new file mode 100644 index 0000000000..c29df5c288 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Samsung/TimeStamp.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Samsung; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class TimeStamp extends AbstractTag +{ + + protected $Id = '0x0a01'; + + protected $Name = 'TimeStamp'; + + protected $FullName = 'Samsung::Trailer'; + + protected $GroupName = 'Samsung'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Samsung'; + + protected $g2 = 'Other'; + + protected $Type = '?'; + + protected $Writable = false; + + protected $Description = 'Time Stamp'; + + protected $local_g2 = 'Time'; + + protected $flag_Permanent = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/AFAreaModeSetting.php b/lib/PHPExiftool/Driver/Tag/Sony/AFAreaModeSetting.php index 1fdbc821b3..edf441997d 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/AFAreaModeSetting.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/AFAreaModeSetting.php @@ -76,22 +76,26 @@ class AFAreaModeSetting extends AbstractTag 'Label' => 'Zone', ), 8 => array( + 'Id' => 12, + 'Label' => 'Expanded Flexible Spot', + ), + 9 => array( 'Id' => 0, 'Label' => 'Wide', ), - 9 => array( + 10 => array( 'Id' => 4, 'Label' => 'Flexible Spot', ), - 10 => array( + 11 => array( 'Id' => 8, 'Label' => 'Zone', ), - 11 => array( + 12 => array( 'Id' => 9, 'Label' => 'Center', ), - 12 => array( + 13 => array( 'Id' => 12, 'Label' => 'Expanded Flexible Spot', ), diff --git a/lib/PHPExiftool/Driver/Tag/Sony/AFPointsUsed.php b/lib/PHPExiftool/Driver/Tag/Sony/AFPointsUsed.php index 72eb6f73d8..9b7276e32c 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/AFPointsUsed.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/AFPointsUsed.php @@ -63,7 +63,7 @@ class AFPointsUsed extends AbstractTag ), 4 => array( 'Id' => 8, - 'Label' => 'B2', + 'Label' => 'H2', ), 5 => array( 'Id' => 16, @@ -79,19 +79,19 @@ class AFPointsUsed extends AbstractTag ), 8 => array( 'Id' => 128, - 'Label' => 'H6', + 'Label' => 'B6', ), 9 => array( 'Id' => 256, - 'Label' => 'B7', + 'Label' => 'H7', ), 10 => array( 'Id' => 512, - 'Label' => 'B8', + 'Label' => 'H8', ), 11 => array( 'Id' => 1024, - 'Label' => 'H9', + 'Label' => 'B9', ), 12 => array( 'Id' => 2048, @@ -103,7 +103,7 @@ class AFPointsUsed extends AbstractTag ), 14 => array( 'Id' => 8192, - 'Label' => 'I6', + 'Label' => 'C2', ), 15 => array( 'Id' => 16384, @@ -475,7 +475,7 @@ class AFPointsUsed extends AbstractTag ), 106 => array( 'Id' => 2, - 'Label' => 'G10', + 'Label' => 'A6', ), 107 => array( 'Id' => 4, @@ -491,7 +491,7 @@ class AFPointsUsed extends AbstractTag ), 110 => array( 'Id' => 32, - 'Label' => 'B4', + 'Label' => 'H4', ), 111 => array( 'Id' => 64, @@ -499,19 +499,19 @@ class AFPointsUsed extends AbstractTag ), 112 => array( 'Id' => 128, - 'Label' => 'B6', + 'Label' => 'H6', ), 113 => array( 'Id' => 256, - 'Label' => 'H7', + 'Label' => 'B7', ), 114 => array( 'Id' => 512, - 'Label' => 'H8', + 'Label' => 'B8', ), 115 => array( 'Id' => 1024, - 'Label' => 'B9', + 'Label' => 'H9', ), 116 => array( 'Id' => 2048, @@ -519,15 +519,15 @@ class AFPointsUsed extends AbstractTag ), 117 => array( 'Id' => 4096, - 'Label' => 'I5', + 'Label' => 'C1', ), 118 => array( 'Id' => 8192, - 'Label' => 'C2', + 'Label' => 'I6', ), 119 => array( 'Id' => 16384, - 'Label' => 'I7', + 'Label' => 'C3', ), 120 => array( 'Id' => 32768, diff --git a/lib/PHPExiftool/Driver/Tag/Sony/AFZoneSelected.php b/lib/PHPExiftool/Driver/Tag/Sony/AFZoneSelected.php index f697d78883..7df09ba6c0 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/AFZoneSelected.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/AFZoneSelected.php @@ -51,15 +51,39 @@ class AFZoneSelected extends AbstractTag ), 1 => array( 'Id' => 1, - 'Label' => 'Zone 1', + 'Label' => 'Center', + ), + 2 => array( + 'Id' => 2, + 'Label' => 'Top', + ), + 3 => array( + 'Id' => 3, + 'Label' => 'Right', ), 4 => array( 'Id' => 4, - 'Label' => 'Zone 4', + 'Label' => 'Left', ), 5 => array( 'Id' => 5, - 'Label' => 'Zone 5', + 'Label' => 'Bottom', + ), + 6 => array( + 'Id' => 6, + 'Label' => 'Bottom Right', + ), + 7 => array( + 'Id' => 7, + 'Label' => 'Bottom Left', + ), + 8 => array( + 'Id' => 8, + 'Label' => 'Top Left', + ), + 9 => array( + 'Id' => 9, + 'Label' => 'Top Right', ), ); diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FlashActionExternal.php b/lib/PHPExiftool/Driver/Tag/Sony/FlashActionExternal.php index 6dddf30a03..582a79c68a 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/FlashActionExternal.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/FlashActionExternal.php @@ -44,22 +44,26 @@ class FlashActionExternal extends AbstractTag protected $Values = array( 0 => array( - 'Id' => 122, + 'Id' => 121, 'Label' => 'Fired', ), 1 => array( - 'Id' => 136, - 'Label' => 'Did not fire', + 'Id' => 122, + 'Label' => 'Fired', ), 2 => array( 'Id' => 136, 'Label' => 'Did not fire', ), 3 => array( + 'Id' => 136, + 'Label' => 'Did not fire', + ), + 4 => array( 'Id' => 167, 'Label' => 'Fired', ), - 4 => array( + 5 => array( 'Id' => 182, 'Label' => 'Fired, HSS', ), diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FlashMode.php b/lib/PHPExiftool/Driver/Tag/Sony/FlashMode.php index 368453da65..238fdd4e6b 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/FlashMode.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/FlashMode.php @@ -136,145 +136,177 @@ class FlashMode extends AbstractTag 'Label' => 'Rear Sync', ), 23 => array( + 'Id' => 6, + 'Label' => 'Wireless', + ), + 24 => array( 'Id' => 0, 'Label' => 'Autoflash', ), - 24 => array( + 25 => array( 'Id' => 1, 'Label' => 'Fill-flash', ), - 25 => array( + 26 => array( 'Id' => 2, 'Label' => 'Flash Off', ), - 26 => array( + 27 => array( 'Id' => 3, 'Label' => 'Slow Sync', ), - 27 => array( + 28 => array( 'Id' => 4, 'Label' => 'Rear Sync', ), - 28 => array( + 29 => array( + 'Id' => 6, + 'Label' => 'Wireless', + ), + 30 => array( 'Id' => 0, 'Label' => 'Autoflash', ), - 29 => array( + 31 => array( 'Id' => 1, 'Label' => 'Fill-flash', ), - 30 => array( + 32 => array( 'Id' => 2, 'Label' => 'Flash Off', ), - 31 => array( + 33 => array( 'Id' => 3, 'Label' => 'Slow Sync', ), - 32 => array( + 34 => array( 'Id' => 4, 'Label' => 'Rear Sync', ), - 33 => array( + 35 => array( + 'Id' => 6, + 'Label' => 'Wireless', + ), + 36 => array( 'Id' => 0, 'Label' => 'Autoflash', ), - 34 => array( + 37 => array( 'Id' => 1, 'Label' => 'Fill-flash', ), - 35 => array( + 38 => array( 'Id' => 2, 'Label' => 'Flash Off', ), - 36 => array( + 39 => array( 'Id' => 3, 'Label' => 'Slow Sync', ), - 37 => array( + 40 => array( 'Id' => 4, 'Label' => 'Rear Sync', ), - 38 => array( + 41 => array( + 'Id' => 6, + 'Label' => 'Wireless', + ), + 42 => array( 'Id' => 0, 'Label' => 'Autoflash', ), - 39 => array( + 43 => array( 'Id' => 1, 'Label' => 'Fill-flash', ), - 40 => array( + 44 => array( 'Id' => 2, 'Label' => 'Flash Off', ), - 41 => array( + 45 => array( 'Id' => 3, 'Label' => 'Slow Sync', ), - 42 => array( + 46 => array( 'Id' => 4, 'Label' => 'Rear Sync', ), - 43 => array( + 47 => array( + 'Id' => 6, + 'Label' => 'Wireless', + ), + 48 => array( 'Id' => 0, 'Label' => 'Autoflash', ), - 44 => array( + 49 => array( 'Id' => 1, 'Label' => 'Fill-flash', ), - 45 => array( + 50 => array( 'Id' => 2, 'Label' => 'Flash Off', ), - 46 => array( + 51 => array( 'Id' => 3, 'Label' => 'Slow Sync', ), - 47 => array( + 52 => array( 'Id' => 4, 'Label' => 'Rear Sync', ), - 48 => array( + 53 => array( + 'Id' => 6, + 'Label' => 'Wireless', + ), + 54 => array( 'Id' => 0, 'Label' => 'Autoflash', ), - 49 => array( + 55 => array( 'Id' => 1, 'Label' => 'Fill-flash', ), - 50 => array( + 56 => array( 'Id' => 2, 'Label' => 'Flash Off', ), - 51 => array( + 57 => array( 'Id' => 3, 'Label' => 'Slow Sync', ), - 52 => array( + 58 => array( 'Id' => 4, 'Label' => 'Rear Sync', ), - 53 => array( + 59 => array( + 'Id' => 6, + 'Label' => 'Wireless', + ), + 60 => array( 'Id' => 0, 'Label' => 'Autoflash', ), - 54 => array( + 61 => array( 'Id' => 1, 'Label' => 'Fill-flash', ), - 55 => array( + 62 => array( 'Id' => 2, 'Label' => 'Flash Off', ), - 56 => array( + 63 => array( 'Id' => 3, 'Label' => 'Slow Sync', ), - 57 => array( + 64 => array( 'Id' => 4, 'Label' => 'Rear Sync', ), + 65 => array( + 'Id' => 6, + 'Label' => 'Wireless', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointArea.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointArea.php new file mode 100644 index 0000000000..ad07dac651 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointArea.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointArea extends AbstractTag +{ + + protected $Id = 2; + + protected $Name = 'FocalPlaneAFPointArea'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Area'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation1.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation1.php new file mode 100644 index 0000000000..b83cbfe3ac --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation1.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation1 extends AbstractTag +{ + + protected $Id = 6; + + protected $Name = 'FocalPlaneAFPointLocation1'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 1'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation10.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation10.php new file mode 100644 index 0000000000..cd287beaf8 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation10.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation10 extends AbstractTag +{ + + protected $Id = 42; + + protected $Name = 'FocalPlaneAFPointLocation10'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 10'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation11.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation11.php new file mode 100644 index 0000000000..bddf13db76 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation11.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation11 extends AbstractTag +{ + + protected $Id = 46; + + protected $Name = 'FocalPlaneAFPointLocation11'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 11'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation12.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation12.php new file mode 100644 index 0000000000..79b26f456d --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation12.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation12 extends AbstractTag +{ + + protected $Id = 50; + + protected $Name = 'FocalPlaneAFPointLocation12'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 12'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation13.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation13.php new file mode 100644 index 0000000000..0643555306 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation13.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation13 extends AbstractTag +{ + + protected $Id = 54; + + protected $Name = 'FocalPlaneAFPointLocation13'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 13'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation14.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation14.php new file mode 100644 index 0000000000..ddf6ad87c8 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation14.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation14 extends AbstractTag +{ + + protected $Id = 58; + + protected $Name = 'FocalPlaneAFPointLocation14'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 14'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation15.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation15.php new file mode 100644 index 0000000000..e9c4c74c30 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation15.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation15 extends AbstractTag +{ + + protected $Id = 62; + + protected $Name = 'FocalPlaneAFPointLocation15'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 15'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation2.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation2.php new file mode 100644 index 0000000000..21e02414e0 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation2.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation2 extends AbstractTag +{ + + protected $Id = 10; + + protected $Name = 'FocalPlaneAFPointLocation2'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 2'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation3.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation3.php new file mode 100644 index 0000000000..40c03b386f --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation3.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation3 extends AbstractTag +{ + + protected $Id = 14; + + protected $Name = 'FocalPlaneAFPointLocation3'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 3'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation4.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation4.php new file mode 100644 index 0000000000..df9f41544f --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation4.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation4 extends AbstractTag +{ + + protected $Id = 18; + + protected $Name = 'FocalPlaneAFPointLocation4'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 4'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation5.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation5.php new file mode 100644 index 0000000000..b29acb2617 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation5.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation5 extends AbstractTag +{ + + protected $Id = 22; + + protected $Name = 'FocalPlaneAFPointLocation5'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 5'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation6.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation6.php new file mode 100644 index 0000000000..96da17bac9 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation6.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation6 extends AbstractTag +{ + + protected $Id = 26; + + protected $Name = 'FocalPlaneAFPointLocation6'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 6'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation7.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation7.php new file mode 100644 index 0000000000..e7afb842f1 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation7.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation7 extends AbstractTag +{ + + protected $Id = 30; + + protected $Name = 'FocalPlaneAFPointLocation7'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 7'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation8.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation8.php new file mode 100644 index 0000000000..213ca0682f --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation8.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation8 extends AbstractTag +{ + + protected $Id = 34; + + protected $Name = 'FocalPlaneAFPointLocation8'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 8'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation9.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation9.php new file mode 100644 index 0000000000..8903a8958a --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointLocation9.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocalPlaneAFPointLocation9 extends AbstractTag +{ + + protected $Id = 38; + + protected $Name = 'FocalPlaneAFPointLocation9'; + + protected $FullName = 'Sony::Tag202a'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focal Plane AF Point Location 9'; + + protected $flag_Permanent = true; + + protected $MaxLength = 2; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointsUsed.php b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointsUsed.php index 8ef9b782ed..80426966c4 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointsUsed.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocalPlaneAFPointsUsed.php @@ -20,11 +20,11 @@ class FocalPlaneAFPointsUsed extends AbstractTag { - protected $Id = 8226; + protected $Id = 'mixed'; protected $Name = 'FocalPlaneAFPointsUsed'; - protected $FullName = 'Sony::Main'; + protected $FullName = 'mixed'; protected $GroupName = 'Sony'; @@ -34,7 +34,7 @@ class FocalPlaneAFPointsUsed extends AbstractTag protected $g2 = 'Camera'; - protected $Type = '?'; + protected $Type = 'mixed'; protected $Writable = false; diff --git a/lib/PHPExiftool/Driver/Tag/Sony/FocusLocation.php b/lib/PHPExiftool/Driver/Tag/Sony/FocusLocation.php new file mode 100644 index 0000000000..2ad8be8653 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/FocusLocation.php @@ -0,0 +1,47 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FocusLocation extends AbstractTag +{ + + protected $Id = 8231; + + protected $Name = 'FocusLocation'; + + protected $FullName = 'Sony::Main'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = true; + + protected $Description = 'Focus Location'; + + protected $flag_Permanent = true; + + protected $MaxLength = 4; + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/LensType.php b/lib/PHPExiftool/Driver/Tag/Sony/LensType.php index 4d646980ac..3ef8a467c6 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/LensType.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/LensType.php @@ -507,6 +507,10 @@ class LensType extends AbstractTag 'Id' => '128.20', 'Label' => 'Sigma 18-35mm F1.8 DC HSM', ), + '128.21' => array( + 'Id' => '128.21', + 'Label' => 'Sigma 50-500mm F4.5-6.3 APO DG OS HSM', + ), 129 => array( 'Id' => 129, 'Label' => 'Tamron Lens (129)', @@ -809,7 +813,7 @@ class LensType extends AbstractTag ), 2565 => array( 'Id' => 2565, - 'Label' => 'Minolta AF 600mm F4', + 'Label' => 'Minolta AF 600mm F4 APO', ), 2566 => array( 'Id' => 2566, @@ -913,7 +917,7 @@ class LensType extends AbstractTag ), 2593 => array( 'Id' => 2593, - 'Label' => 'Minolta AF 200mm F2.8 G APO', + 'Label' => 'Minolta AF 200mm F2.8 APO', ), 2594 => array( 'Id' => 2594, @@ -1001,7 +1005,7 @@ class LensType extends AbstractTag ), 2628 => array( 'Id' => 2628, - 'Label' => 'Minolta AF 80-200mm F2.8 G', + 'Label' => 'Minolta AF 80-200mm F2.8 HS-APO G', ), 2629 => array( 'Id' => 2629, @@ -1217,86 +1221,114 @@ class LensType extends AbstractTag ), '6553.28' => array( 'Id' => '6553.28', - 'Label' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', + 'Label' => 'Sony FE 24-70mm F2.8 GM', ), '6553.29' => array( 'Id' => '6553.29', - 'Label' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', + 'Label' => 'Sony FE 85mm F1.4 GM', ), '6553.30' => array( 'Id' => '6553.30', - 'Label' => 'Sigma 19mm F2.8 [EX] DN', + 'Label' => 'Sony FE 50mm F1.8', ), '6553.31' => array( 'Id' => '6553.31', - 'Label' => 'Sigma 30mm F2.8 [EX] DN', + 'Label' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', ), '6553.32' => array( 'Id' => '6553.32', - 'Label' => 'Sigma 60mm F2.8 DN', + 'Label' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', ), '6553.33' => array( 'Id' => '6553.33', - 'Label' => 'Tamron 18-200mm F3.5-6.3 Di III VC', + 'Label' => 'Sony FE 70-300mm F4.5-5.6 G OSS', ), '6553.34' => array( 'Id' => '6553.34', - 'Label' => 'Zeiss Batis 25mm F2', + 'Label' => 'Sony FE 70-200mm F2.8 GM OSS', ), '6553.35' => array( 'Id' => '6553.35', - 'Label' => 'Zeiss Batis 85mm F1.8', + 'Label' => 'Sigma 19mm F2.8 [EX] DN', ), '6553.36' => array( 'Id' => '6553.36', - 'Label' => 'Zeiss Loxia 21mm F2.8', + 'Label' => 'Sigma 30mm F2.8 [EX] DN', ), '6553.37' => array( 'Id' => '6553.37', - 'Label' => 'Zeiss Loxia 35mm F2', + 'Label' => 'Sigma 60mm F2.8 DN', ), '6553.38' => array( 'Id' => '6553.38', - 'Label' => 'Zeiss Loxia 50mm F2', + 'Label' => 'Sigma 30mm F1.4 DC DN | C', ), '6553.39' => array( 'Id' => '6553.39', - 'Label' => 'Zeiss Touit 12mm F2.8', + 'Label' => 'Tamron 18-200mm F3.5-6.3 Di III VC', ), '6553.40' => array( 'Id' => '6553.40', - 'Label' => 'Zeiss Touit 32mm F1.8', + 'Label' => 'Zeiss Batis 25mm F2', ), '6553.41' => array( 'Id' => '6553.41', - 'Label' => 'Zeiss Touit 50mm F2.8 Macro', + 'Label' => 'Zeiss Batis 85mm F1.8', ), '6553.42' => array( 'Id' => '6553.42', - 'Label' => 'Arax MC 35mm F2.8 Tilt+Shift', + 'Label' => 'Zeiss Batis 18mm F2.8', ), '6553.43' => array( 'Id' => '6553.43', - 'Label' => 'Arax MC 80mm F2.8 Tilt+Shift', + 'Label' => 'Zeiss Loxia 21mm F2.8', ), '6553.44' => array( 'Id' => '6553.44', - 'Label' => 'Zenitar MF 16mm F2.8 Fisheye M42', + 'Label' => 'Zeiss Loxia 35mm F2', ), '6553.45' => array( 'Id' => '6553.45', - 'Label' => 'Samyang 500mm Mirror F8.0', + 'Label' => 'Zeiss Loxia 50mm F2', ), '6553.46' => array( 'Id' => '6553.46', - 'Label' => 'Pentacon Auto 135mm F2.8', + 'Label' => 'Zeiss Touit 12mm F2.8', ), '6553.47' => array( 'Id' => '6553.47', - 'Label' => 'Pentacon Auto 29mm F2.8', + 'Label' => 'Zeiss Touit 32mm F1.8', ), '6553.48' => array( 'Id' => '6553.48', + 'Label' => 'Zeiss Touit 50mm F2.8 Macro', + ), + '6553.49' => array( + 'Id' => '6553.49', + 'Label' => 'Arax MC 35mm F2.8 Tilt+Shift', + ), + '6553.50' => array( + 'Id' => '6553.50', + 'Label' => 'Arax MC 80mm F2.8 Tilt+Shift', + ), + '6553.51' => array( + 'Id' => '6553.51', + 'Label' => 'Zenitar MF 16mm F2.8 Fisheye M42', + ), + '6553.52' => array( + 'Id' => '6553.52', + 'Label' => 'Samyang 500mm Mirror F8.0', + ), + '6553.53' => array( + 'Id' => '6553.53', + 'Label' => 'Pentacon Auto 135mm F2.8', + ), + '6553.54' => array( + 'Id' => '6553.54', + 'Label' => 'Pentacon Auto 29mm F2.8', + ), + '6553.55' => array( + 'Id' => '6553.55', 'Label' => 'Helios 44-2 58mm F2.0', ), 25501 => array( @@ -1493,7 +1525,7 @@ class LensType extends AbstractTag ), 25651 => array( 'Id' => 25651, - 'Label' => 'Minolta AF 600mm F4', + 'Label' => 'Minolta AF 600mm F4 APO', ), 25661 => array( 'Id' => 25661, @@ -1597,7 +1629,7 @@ class LensType extends AbstractTag ), 25931 => array( 'Id' => 25931, - 'Label' => 'Minolta AF 200mm F2.8 G APO', + 'Label' => 'Minolta AF 200mm F2.8 APO', ), 25941 => array( 'Id' => 25941, @@ -1685,7 +1717,7 @@ class LensType extends AbstractTag ), 26281 => array( 'Id' => 26281, - 'Label' => 'Minolta AF 80-200mm F2.8 G', + 'Label' => 'Minolta AF 80-200mm F2.8 HS-APO G', ), 26291 => array( 'Id' => 26291, @@ -1901,86 +1933,114 @@ class LensType extends AbstractTag ), '65535.28' => array( 'Id' => '65535.28', - 'Label' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', + 'Label' => 'Sony FE 24-70mm F2.8 GM', ), '65535.29' => array( 'Id' => '65535.29', - 'Label' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', + 'Label' => 'Sony FE 85mm F1.4 GM', ), '65535.30' => array( 'Id' => '65535.30', - 'Label' => 'Sigma 19mm F2.8 [EX] DN', + 'Label' => 'Sony FE 50mm F1.8', ), '65535.31' => array( 'Id' => '65535.31', - 'Label' => 'Sigma 30mm F2.8 [EX] DN', + 'Label' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', ), '65535.32' => array( 'Id' => '65535.32', - 'Label' => 'Sigma 60mm F2.8 DN', + 'Label' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', ), '65535.33' => array( 'Id' => '65535.33', - 'Label' => 'Tamron 18-200mm F3.5-6.3 Di III VC', + 'Label' => 'Sony FE 70-300mm F4.5-5.6 G OSS', ), '65535.34' => array( 'Id' => '65535.34', - 'Label' => 'Zeiss Batis 25mm F2', + 'Label' => 'Sony FE 70-200mm F2.8 GM OSS', ), '65535.35' => array( 'Id' => '65535.35', - 'Label' => 'Zeiss Batis 85mm F1.8', + 'Label' => 'Sigma 19mm F2.8 [EX] DN', ), '65535.36' => array( 'Id' => '65535.36', - 'Label' => 'Zeiss Loxia 21mm F2.8', + 'Label' => 'Sigma 30mm F2.8 [EX] DN', ), '65535.37' => array( 'Id' => '65535.37', - 'Label' => 'Zeiss Loxia 35mm F2', + 'Label' => 'Sigma 60mm F2.8 DN', ), '65535.38' => array( 'Id' => '65535.38', - 'Label' => 'Zeiss Loxia 50mm F2', + 'Label' => 'Sigma 30mm F1.4 DC DN | C', ), '65535.39' => array( 'Id' => '65535.39', - 'Label' => 'Zeiss Touit 12mm F2.8', + 'Label' => 'Tamron 18-200mm F3.5-6.3 Di III VC', ), '65535.40' => array( 'Id' => '65535.40', - 'Label' => 'Zeiss Touit 32mm F1.8', + 'Label' => 'Zeiss Batis 25mm F2', ), '65535.41' => array( 'Id' => '65535.41', - 'Label' => 'Zeiss Touit 50mm F2.8 Macro', + 'Label' => 'Zeiss Batis 85mm F1.8', ), '65535.42' => array( 'Id' => '65535.42', - 'Label' => 'Arax MC 35mm F2.8 Tilt+Shift', + 'Label' => 'Zeiss Batis 18mm F2.8', ), '65535.43' => array( 'Id' => '65535.43', - 'Label' => 'Arax MC 80mm F2.8 Tilt+Shift', + 'Label' => 'Zeiss Loxia 21mm F2.8', ), '65535.44' => array( 'Id' => '65535.44', - 'Label' => 'Zenitar MF 16mm F2.8 Fisheye M42', + 'Label' => 'Zeiss Loxia 35mm F2', ), '65535.45' => array( 'Id' => '65535.45', - 'Label' => 'Samyang 500mm Mirror F8.0', + 'Label' => 'Zeiss Loxia 50mm F2', ), '65535.46' => array( 'Id' => '65535.46', - 'Label' => 'Pentacon Auto 135mm F2.8', + 'Label' => 'Zeiss Touit 12mm F2.8', ), '65535.47' => array( 'Id' => '65535.47', - 'Label' => 'Pentacon Auto 29mm F2.8', + 'Label' => 'Zeiss Touit 32mm F1.8', ), '65535.48' => array( 'Id' => '65535.48', + 'Label' => 'Zeiss Touit 50mm F2.8 Macro', + ), + '65535.49' => array( + 'Id' => '65535.49', + 'Label' => 'Arax MC 35mm F2.8 Tilt+Shift', + ), + '65535.50' => array( + 'Id' => '65535.50', + 'Label' => 'Arax MC 80mm F2.8 Tilt+Shift', + ), + '65535.51' => array( + 'Id' => '65535.51', + 'Label' => 'Zenitar MF 16mm F2.8 Fisheye M42', + ), + '65535.52' => array( + 'Id' => '65535.52', + 'Label' => 'Samyang 500mm Mirror F8.0', + ), + '65535.53' => array( + 'Id' => '65535.53', + 'Label' => 'Pentacon Auto 135mm F2.8', + ), + '65535.54' => array( + 'Id' => '65535.54', + 'Label' => 'Pentacon Auto 29mm F2.8', + ), + '65535.55' => array( + 'Id' => '65535.55', 'Label' => 'Helios 44-2 58mm F2.0', ), ); diff --git a/lib/PHPExiftool/Driver/Tag/Sony/LensType2.php b/lib/PHPExiftool/Driver/Tag/Sony/LensType2.php index b5f70e8a47..cf96880d6f 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/LensType2.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/LensType2.php @@ -187,6 +187,18 @@ class LensType2 extends AbstractTag 'Id' => 32817, 'Label' => 'Sony FE PZ 28-135mm F4 G OSS', ), + 32821 => array( + 'Id' => 32821, + 'Label' => 'Sony FE 24-70mm F2.8 GM', + ), + 32823 => array( + 'Id' => 32823, + 'Label' => 'Sony FE 85mm F1.4 GM', + ), + 32824 => array( + 'Id' => 32824, + 'Label' => 'Sony FE 50mm F1.8', + ), 32826 => array( 'Id' => 32826, 'Label' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', @@ -195,6 +207,14 @@ class LensType2 extends AbstractTag 'Id' => 32827, 'Label' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', ), + 32828 => array( + 'Id' => 32828, + 'Label' => 'Sony FE 70-300mm F4.5-5.6 G OSS', + ), + 32830 => array( + 'Id' => 32830, + 'Label' => 'Sony FE 70-200mm F2.8 GM OSS', + ), 49216 => array( 'Id' => 49216, 'Label' => 'Zeiss Batis 25mm F2', @@ -203,10 +223,22 @@ class LensType2 extends AbstractTag 'Id' => 49217, 'Label' => 'Zeiss Batis 85mm F1.8', ), + 49218 => array( + 'Id' => 49218, + 'Label' => 'Zeiss Batis 18mm F2.8', + ), + 49232 => array( + 'Id' => 49232, + 'Label' => 'Zeiss Loxia 50mm F2', + ), 49234 => array( 'Id' => 49234, 'Label' => 'Zeiss Loxia 21mm F2.8', ), + 50480 => array( + 'Id' => 50480, + 'Label' => 'Sigma 30mm F1.4 DC DN | C', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/Sony/LensType3.php b/lib/PHPExiftool/Driver/Tag/Sony/LensType3.php index 114c71deb7..4114750084 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/LensType3.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/LensType3.php @@ -187,6 +187,18 @@ class LensType3 extends AbstractTag 'Id' => 32817, 'Label' => 'Sony FE PZ 28-135mm F4 G OSS', ), + 32821 => array( + 'Id' => 32821, + 'Label' => 'Sony FE 24-70mm F2.8 GM', + ), + 32823 => array( + 'Id' => 32823, + 'Label' => 'Sony FE 85mm F1.4 GM', + ), + 32824 => array( + 'Id' => 32824, + 'Label' => 'Sony FE 50mm F1.8', + ), 32826 => array( 'Id' => 32826, 'Label' => 'Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)', @@ -195,6 +207,14 @@ class LensType3 extends AbstractTag 'Id' => 32827, 'Label' => 'Sony FE 16mm F3.5 Fisheye (SEL28F20 + SEL057FEC)', ), + 32828 => array( + 'Id' => 32828, + 'Label' => 'Sony FE 70-300mm F4.5-5.6 G OSS', + ), + 32830 => array( + 'Id' => 32830, + 'Label' => 'Sony FE 70-200mm F2.8 GM OSS', + ), 49216 => array( 'Id' => 49216, 'Label' => 'Zeiss Batis 25mm F2', @@ -203,10 +223,22 @@ class LensType3 extends AbstractTag 'Id' => 49217, 'Label' => 'Zeiss Batis 85mm F1.8', ), + 49218 => array( + 'Id' => 49218, + 'Label' => 'Zeiss Batis 18mm F2.8', + ), + 49232 => array( + 'Id' => 49232, + 'Label' => 'Zeiss Loxia 50mm F2', + ), 49234 => array( 'Id' => 49234, 'Label' => 'Zeiss Loxia 21mm F2.8', ), + 50480 => array( + 'Id' => 50480, + 'Label' => 'Sigma 30mm F1.4 DC DN | C', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/Sony/RAWFileType.php b/lib/PHPExiftool/Driver/Tag/Sony/RAWFileType.php new file mode 100644 index 0000000000..a01740974d --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/RAWFileType.php @@ -0,0 +1,56 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class RAWFileType extends AbstractTag +{ + + protected $Id = 8233; + + protected $Name = 'RAWFileType'; + + protected $FullName = 'Sony::Main'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Camera'; + + protected $Type = 'int16u'; + + protected $Writable = false; + + protected $Description = 'RAW File Type'; + + protected $flag_Permanent = true; + + protected $Values = array( + 0 => array( + 'Id' => 0, + 'Label' => 'Compressed RAW', + ), + 1 => array( + 'Id' => 1, + 'Label' => 'Uncompressed RAW', + ), + ); + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/ReleaseMode.php b/lib/PHPExiftool/Driver/Tag/Sony/ReleaseMode.php index ff967dc58f..ac43dcebf4 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/ReleaseMode.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/ReleaseMode.php @@ -59,6 +59,10 @@ class ReleaseMode extends AbstractTag 'Id' => 6, 'Label' => 'White Balance Bracketing', ), + 8 => array( + 'Id' => 8, + 'Label' => 'DRO Bracketing', + ), 65535 => array( 'Id' => 65535, 'Label' => 'n/a', diff --git a/lib/PHPExiftool/Driver/Tag/Sony/ReleaseMode2.php b/lib/PHPExiftool/Driver/Tag/Sony/ReleaseMode2.php index c8b1e69bab..4556710179 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/ReleaseMode2.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/ReleaseMode2.php @@ -57,7 +57,7 @@ class ReleaseMode2 extends AbstractTag ), 3 => array( 'Id' => 3, - 'Label' => 'Continuous - White Balance Bracketing', + 'Label' => 'DRO or White Balance Bracketing', ), 5 => array( 'Id' => 5, diff --git a/lib/PHPExiftool/Driver/Tag/Sony/SelfTimer.php b/lib/PHPExiftool/Driver/Tag/Sony/SelfTimer.php new file mode 100644 index 0000000000..4e6d1f6dfe --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/Sony/SelfTimer.php @@ -0,0 +1,72 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\Sony; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class SelfTimer extends AbstractTag +{ + + protected $Id = 'mixed'; + + protected $Name = 'SelfTimer'; + + protected $FullName = 'mixed'; + + protected $GroupName = 'Sony'; + + protected $g0 = 'MakerNotes'; + + protected $g1 = 'Sony'; + + protected $g2 = 'Image'; + + protected $Type = 'int8u'; + + protected $Writable = true; + + protected $Description = 'Self Timer'; + + protected $flag_Permanent = true; + + protected $Values = array( + 0 => array( + 'Id' => 0, + 'Label' => 'Off', + ), + 1 => array( + 'Id' => 1, + 'Label' => 'Self-timer 10 s', + ), + 2 => array( + 'Id' => 2, + 'Label' => 'Self-timer 2 s', + ), + 3 => array( + 'Id' => 0, + 'Label' => 'Off', + ), + 4 => array( + 'Id' => 1, + 'Label' => 'Self-timer 5 or 10 s', + ), + 5 => array( + 'Id' => 2, + 'Label' => 'Self-timer 2 s', + ), + ); + +} diff --git a/lib/PHPExiftool/Driver/Tag/Sony/SequenceLength.php b/lib/PHPExiftool/Driver/Tag/Sony/SequenceLength.php index 6926a3f2ba..2775d35aec 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/SequenceLength.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/SequenceLength.php @@ -89,21 +89,69 @@ class SequenceLength extends AbstractTag ), 11 => array( 'Id' => 1, - 'Label' => '1 file', + 'Label' => '1 shot', ), 12 => array( 'Id' => 2, - 'Label' => '2 files', + 'Label' => '2 shots', ), 13 => array( 'Id' => 3, - 'Label' => '3 files', + 'Label' => '3 shots', ), 14 => array( + 'Id' => 4, + 'Label' => '4 shots', + ), + 15 => array( + 'Id' => 5, + 'Label' => '5 shots', + ), + 16 => array( + 'Id' => 6, + 'Label' => '6 shots', + ), + 17 => array( + 'Id' => 9, + 'Label' => '9 shots', + ), + 18 => array( + 'Id' => 10, + 'Label' => '10 shots', + ), + 19 => array( + 'Id' => 100, + 'Label' => 'Continuous - iSweep Panorama', + ), + 20 => array( + 'Id' => 200, + 'Label' => 'Continuous - Sweep Panorama', + ), + 21 => array( + 'Id' => 0, + 'Label' => 'Continuous', + ), + 22 => array( + 'Id' => 1, + 'Label' => '1 file', + ), + 23 => array( + 'Id' => 2, + 'Label' => '2 files', + ), + 24 => array( + 'Id' => 3, + 'Label' => '3 files', + ), + 25 => array( 'Id' => 5, 'Label' => '5 files', ), - 15 => array( + 26 => array( + 'Id' => 9, + 'Label' => '9 files', + ), + 27 => array( 'Id' => 10, 'Label' => '10 files', ), diff --git a/lib/PHPExiftool/Driver/Tag/Sony/SonyModelID.php b/lib/PHPExiftool/Driver/Tag/Sony/SonyModelID.php index f7c745beff..b6346b4fea 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/SonyModelID.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/SonyModelID.php @@ -291,6 +291,18 @@ class SonyModelID extends AbstractTag 'Id' => 350, 'Label' => 'ILCE-7SM2', ), + 353 => array( + 'Id' => 353, + 'Label' => 'ILCA-68', + ), + 355 => array( + 'Id' => 355, + 'Label' => 'DSC-RX10M3', + ), + 357 => array( + 'Id' => 357, + 'Label' => 'ILCE-6300', + ), ); } diff --git a/lib/PHPExiftool/Driver/Tag/Sony/WBShiftABGMPrecise.php b/lib/PHPExiftool/Driver/Tag/Sony/WBShiftABGMPrecise.php index 814539ae42..c396c96bb1 100644 --- a/lib/PHPExiftool/Driver/Tag/Sony/WBShiftABGMPrecise.php +++ b/lib/PHPExiftool/Driver/Tag/Sony/WBShiftABGMPrecise.php @@ -36,7 +36,7 @@ class WBShiftABGMPrecise extends AbstractTag protected $Type = 'int32s'; - protected $Writable = true; + protected $Writable = false; protected $Description = 'WB Shift AB GM Precise'; diff --git a/lib/PHPExiftool/Driver/Tag/Track/UUIDUnknown.php b/lib/PHPExiftool/Driver/Tag/Track/UUIDUnknown.php index f95899602c..b5d8fb5be0 100644 --- a/lib/PHPExiftool/Driver/Tag/Track/UUIDUnknown.php +++ b/lib/PHPExiftool/Driver/Tag/Track/UUIDUnknown.php @@ -40,8 +40,6 @@ class UUIDUnknown extends AbstractTag protected $Description = 'UUID-Unknown'; - protected $flag_Binary = true; - protected $Index = 1; } diff --git a/lib/PHPExiftool/Driver/Tag/XMPAcdsee/EditStatus.php b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/EditStatus.php new file mode 100644 index 0000000000..273da52777 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/EditStatus.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPAcdsee; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class EditStatus extends AbstractTag +{ + + protected $Id = 'EditStatus'; + + protected $Name = 'EditStatus'; + + protected $FullName = 'XMP::acdsee'; + + protected $GroupName = 'XMP-acdsee'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-acdsee'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'Edit Status'; + + protected $flag_Avoid = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPAcdsee/FixtureIdentifier.php b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/FixtureIdentifier.php new file mode 100644 index 0000000000..15370f31b8 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/FixtureIdentifier.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPAcdsee; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class FixtureIdentifier extends AbstractTag +{ + + protected $Id = 'FixtureIdentifier'; + + protected $Name = 'FixtureIdentifier'; + + protected $FullName = 'XMP::acdsee'; + + protected $GroupName = 'XMP-acdsee'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-acdsee'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'Fixture Identifier'; + + protected $flag_Avoid = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPAcdsee/ObjectCycle.php b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/ObjectCycle.php new file mode 100644 index 0000000000..803ec33231 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/ObjectCycle.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPAcdsee; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class ObjectCycle extends AbstractTag +{ + + protected $Id = 'ObjectCycle'; + + protected $Name = 'ObjectCycle'; + + protected $FullName = 'XMP::acdsee'; + + protected $GroupName = 'XMP-acdsee'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-acdsee'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'Object Cycle'; + + protected $flag_Avoid = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPAcdsee/OriginatingProgram.php b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/OriginatingProgram.php new file mode 100644 index 0000000000..eeaf1f02be --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/OriginatingProgram.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPAcdsee; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class OriginatingProgram extends AbstractTag +{ + + protected $Id = 'OriginatingProgram'; + + protected $Name = 'OriginatingProgram'; + + protected $FullName = 'XMP::acdsee'; + + protected $GroupName = 'XMP-acdsee'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-acdsee'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'Originating Program'; + + protected $flag_Avoid = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPAcdsee/ReleaseDate.php b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/ReleaseDate.php new file mode 100644 index 0000000000..28c392c0fe --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/ReleaseDate.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPAcdsee; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class ReleaseDate extends AbstractTag +{ + + protected $Id = 'ReleaseDate'; + + protected $Name = 'ReleaseDate'; + + protected $FullName = 'XMP::acdsee'; + + protected $GroupName = 'XMP-acdsee'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-acdsee'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'Release Date'; + + protected $flag_Avoid = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPAcdsee/ReleaseTime.php b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/ReleaseTime.php new file mode 100644 index 0000000000..868f256cd0 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/ReleaseTime.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPAcdsee; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class ReleaseTime extends AbstractTag +{ + + protected $Id = 'ReleaseTime'; + + protected $Name = 'ReleaseTime'; + + protected $FullName = 'XMP::acdsee'; + + protected $GroupName = 'XMP-acdsee'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-acdsee'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'Release Time'; + + protected $flag_Avoid = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPAcdsee/Snapshots.php b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/Snapshots.php new file mode 100644 index 0000000000..d610e8080f --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPAcdsee/Snapshots.php @@ -0,0 +1,51 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPAcdsee; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class Snapshots extends AbstractTag +{ + + protected $Id = 'Snapshots'; + + protected $Name = 'Snapshots'; + + protected $FullName = 'XMP::acdsee'; + + protected $GroupName = 'XMP-acdsee'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-acdsee'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'Snapshots'; + + protected $flag_Avoid = true; + + protected $flag_Binary = true; + + protected $flag_List = true; + + protected $flag_Bag = true; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/DNGIgnoreSidecars.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/DNGIgnoreSidecars.php new file mode 100644 index 0000000000..28dfd2242b --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/DNGIgnoreSidecars.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class DNGIgnoreSidecars extends AbstractTag +{ + + protected $Id = 'DNGIgnoreSidecars'; + + protected $Name = 'DNGIgnoreSidecars'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'boolean'; + + protected $Writable = true; + + protected $Description = 'DNG Ignore Sidecars'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultAutoGray.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultAutoGray.php new file mode 100644 index 0000000000..6d6823d3bf --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultAutoGray.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class DefaultAutoGray extends AbstractTag +{ + + protected $Id = 'DefaultAutoGray'; + + protected $Name = 'DefaultAutoGray'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'boolean'; + + protected $Writable = true; + + protected $Description = 'Default Auto Gray'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultAutoTone.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultAutoTone.php new file mode 100644 index 0000000000..9a511db1c7 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultAutoTone.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class DefaultAutoTone extends AbstractTag +{ + + protected $Id = 'DefaultAutoTone'; + + protected $Name = 'DefaultAutoTone'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'boolean'; + + protected $Writable = true; + + protected $Description = 'Default Auto Tone'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultsSpecificToISO.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultsSpecificToISO.php new file mode 100644 index 0000000000..f0d7d20ef8 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultsSpecificToISO.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class DefaultsSpecificToISO extends AbstractTag +{ + + protected $Id = 'DefaultsSpecificToISO'; + + protected $Name = 'DefaultsSpecificToISO'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'boolean'; + + protected $Writable = true; + + protected $Description = 'Defaults Specific To ISO'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultsSpecificToSerial.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultsSpecificToSerial.php new file mode 100644 index 0000000000..d2e0771fd3 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/DefaultsSpecificToSerial.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class DefaultsSpecificToSerial extends AbstractTag +{ + + protected $Id = 'DefaultsSpecificToSerial'; + + protected $Name = 'DefaultsSpecificToSerial'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'boolean'; + + protected $Writable = true; + + protected $Description = 'Defaults Specific To Serial'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/JPEGHandling.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/JPEGHandling.php new file mode 100644 index 0000000000..5d19ac2287 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/JPEGHandling.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class JPEGHandling extends AbstractTag +{ + + protected $Id = 'JPEGHandling'; + + protected $Name = 'JPEGHandling'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'JPEG Handling'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCacheLargePreviewSize.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCacheLargePreviewSize.php new file mode 100644 index 0000000000..22f33d1747 --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCacheLargePreviewSize.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class NegativeCacheLargePreviewSize extends AbstractTag +{ + + protected $Id = 'NegativeCacheLargePreviewSize'; + + protected $Name = 'NegativeCacheLargePreviewSize'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'integer'; + + protected $Writable = true; + + protected $Description = 'Negative Cache Large Preview Size'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCacheMaximumSize.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCacheMaximumSize.php new file mode 100644 index 0000000000..dc91a9baad --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCacheMaximumSize.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class NegativeCacheMaximumSize extends AbstractTag +{ + + protected $Id = 'NegativeCacheMaximumSize'; + + protected $Name = 'NegativeCacheMaximumSize'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'real'; + + protected $Writable = true; + + protected $Description = 'Negative Cache Maximum Size'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCachePath.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCachePath.php new file mode 100644 index 0000000000..947349640c --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/NegativeCachePath.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class NegativeCachePath extends AbstractTag +{ + + protected $Id = 'NegativeCachePath'; + + protected $Name = 'NegativeCachePath'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'Negative Cache Path'; + +} diff --git a/lib/PHPExiftool/Driver/Tag/XMPCrs/TIFFHandling.php b/lib/PHPExiftool/Driver/Tag/XMPCrs/TIFFHandling.php new file mode 100644 index 0000000000..8451e286ba --- /dev/null +++ b/lib/PHPExiftool/Driver/Tag/XMPCrs/TIFFHandling.php @@ -0,0 +1,43 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Tag\XMPCrs; + +use JMS\Serializer\Annotation\ExclusionPolicy; +use PHPExiftool\Driver\AbstractTag; + +/** + * @ExclusionPolicy("all") + */ +class TIFFHandling extends AbstractTag +{ + + protected $Id = 'TIFFHandling'; + + protected $Name = 'TIFFHandling'; + + protected $FullName = 'XMP::crs'; + + protected $GroupName = 'XMP-crs'; + + protected $g0 = 'XMP'; + + protected $g1 = 'XMP-crs'; + + protected $g2 = 'Image'; + + protected $Type = 'string'; + + protected $Writable = true; + + protected $Description = 'TIFF Handling'; + +} diff --git a/lib/PHPExiftool/Driver/TagProvider.php b/lib/PHPExiftool/Driver/TagProvider.php index e0741365de..f81fe217f7 100644 --- a/lib/PHPExiftool/Driver/TagProvider.php +++ b/lib/PHPExiftool/Driver/TagProvider.php @@ -544,6 +544,7 @@ public function __construct() 'FileIndex2' => new \PHPExiftool\Driver\Tag\Canon\FileIndex2(), 'DirectoryIndex2' => new \PHPExiftool\Driver\Tag\Canon\DirectoryIndex2(), 'MeasuredEV' => new \PHPExiftool\Driver\Tag\Canon\MeasuredEV(), + 'CameraPictureStyle' => new \PHPExiftool\Driver\Tag\Canon\CameraPictureStyle(), 'Rotation' => new \PHPExiftool\Driver\Tag\Canon\Rotation(), 'MacroMode' => new \PHPExiftool\Driver\Tag\Canon\MacroMode(), 'SelfTimer' => new \PHPExiftool\Driver\Tag\Canon\SelfTimer(), @@ -962,6 +963,7 @@ public function __construct() 'AIServoSecondImagePriority' => new \PHPExiftool\Driver\Tag\CanonCustom\AIServoSecondImagePriority(), 'AFAreaSelectMethod' => new \PHPExiftool\Driver\Tag\CanonCustom\AFAreaSelectMethod(), 'AutoAFPointColorTracking' => new \PHPExiftool\Driver\Tag\CanonCustom\AutoAFPointColorTracking(), + 'InitialAFPointAIServoAF' => new \PHPExiftool\Driver\Tag\CanonCustom\InitialAFPointAIServoAF(), 'ContinuousShootingSpeed' => new \PHPExiftool\Driver\Tag\CanonCustom\ContinuousShootingSpeed(), 'ContinuousShotLimit' => new \PHPExiftool\Driver\Tag\CanonCustom\ContinuousShotLimit(), 'RestrictDriveModes' => new \PHPExiftool\Driver\Tag\CanonCustom\RestrictDriveModes(), @@ -1523,6 +1525,7 @@ public function __construct() 'SubSecDateTimeOriginal' => new \PHPExiftool\Driver\Tag\Composite\SubSecDateTimeOriginal(), 'SubSecModifyDate' => new \PHPExiftool\Driver\Tag\Composite\SubSecModifyDate(), 'ThumbnailImage' => new \PHPExiftool\Driver\Tag\Composite\ThumbnailImage(), + 'VolumeSize' => new \PHPExiftool\Driver\Tag\Composite\VolumeSize(), 'WB_RGBLevels' => new \PHPExiftool\Driver\Tag\Composite\WBRGBLevels(), 'WB_RGGBLevels' => new \PHPExiftool\Driver\Tag\Composite\WBRGGBLevels(), 'ZoomedPreviewImage' => new \PHPExiftool\Driver\Tag\Composite\ZoomedPreviewImage(), @@ -4971,6 +4974,7 @@ public function __construct() 'ApplicationNotes' => new \PHPExiftool\Driver\Tag\ExifIFD\ApplicationNotes(), 'USPTOMiscellaneous' => new \PHPExiftool\Driver\Tag\ExifIFD\USPTOMiscellaneous(), 'XP_DIP_XML' => new \PHPExiftool\Driver\Tag\ExifIFD\XPDIPXML(), + 'SonyRawFileType' => new \PHPExiftool\Driver\Tag\ExifIFD\SonyRawFileType(), 'ChromaticAberrationCorrParams' => new \PHPExiftool\Driver\Tag\ExifIFD\ChromaticAberrationCorrParams(), 'DistortionCorrParams' => new \PHPExiftool\Driver\Tag\ExifIFD\DistortionCorrParams(), 'ImageID' => new \PHPExiftool\Driver\Tag\ExifIFD\ImageID(), @@ -5442,6 +5446,7 @@ public function __construct() }); $this['EXE'] = $this->share(function(){ return array( + 'CreateDate' => new \PHPExiftool\Driver\Tag\EXE\CreateDate(), 'CHMVersion' => new \PHPExiftool\Driver\Tag\EXE\CHMVersion(), 'LanguageCode' => new \PHPExiftool\Driver\Tag\EXE\LanguageCode(), 'CPUArchitecture' => new \PHPExiftool\Driver\Tag\EXE\CPUArchitecture(), @@ -5450,6 +5455,7 @@ public function __construct() 'CPUType' => new \PHPExiftool\Driver\Tag\EXE\CPUType(), 'CPUCount' => new \PHPExiftool\Driver\Tag\EXE\CPUCount(), 'CPUSubtype' => new \PHPExiftool\Driver\Tag\EXE\CPUSubtype(), + 'ObjectFlags' => new \PHPExiftool\Driver\Tag\EXE\ObjectFlags(), 'MachineType' => new \PHPExiftool\Driver\Tag\EXE\MachineType(), 'TimeStamp' => new \PHPExiftool\Driver\Tag\EXE\TimeStamp(), 'PEType' => new \PHPExiftool\Driver\Tag\EXE\PEType(), @@ -6448,6 +6454,7 @@ public function __construct() 'WB_GRGBLevelsLivingRoomWarmWhiteFluor' => new \PHPExiftool\Driver\Tag\RAF\WBGRGBLevelsLivingRoomWarmWhiteFluor(), 'WB_GRGBLevelsTungsten' => new \PHPExiftool\Driver\Tag\RAF\WBGRGBLevelsTungsten(), 'WB_GRGBLevels' => new \PHPExiftool\Driver\Tag\RAF\WBGRGBLevels(), + 'RelativeExposure' => new \PHPExiftool\Driver\Tag\RAF\RelativeExposure(), 'RawExposureBias' => new \PHPExiftool\Driver\Tag\RAF\RawExposureBias(), ); }); @@ -7096,6 +7103,32 @@ public function __construct() 'UserDefinedURL' => new \PHPExiftool\Driver\Tag\ID3v24\UserDefinedURL(), ); }); + $this['ISO'] = $this->share(function(){ + return array( + 'BootSystem' => new \PHPExiftool\Driver\Tag\ISO\BootSystem(), + 'BootIdentifier' => new \PHPExiftool\Driver\Tag\ISO\BootIdentifier(), + 'System' => new \PHPExiftool\Driver\Tag\ISO\System(), + 'VolumeName' => new \PHPExiftool\Driver\Tag\ISO\VolumeName(), + 'VolumeBlockCount' => new \PHPExiftool\Driver\Tag\ISO\VolumeBlockCount(), + 'VolumeSetDiskCount' => new \PHPExiftool\Driver\Tag\ISO\VolumeSetDiskCount(), + 'VolumeSetDiskNumber' => new \PHPExiftool\Driver\Tag\ISO\VolumeSetDiskNumber(), + 'VolumeBlockSize' => new \PHPExiftool\Driver\Tag\ISO\VolumeBlockSize(), + 'PathTableSize' => new \PHPExiftool\Driver\Tag\ISO\PathTableSize(), + 'PathTableLocation' => new \PHPExiftool\Driver\Tag\ISO\PathTableLocation(), + 'RootDirectoryCreateDate' => new \PHPExiftool\Driver\Tag\ISO\RootDirectoryCreateDate(), + 'VolumeSetName' => new \PHPExiftool\Driver\Tag\ISO\VolumeSetName(), + 'Publisher' => new \PHPExiftool\Driver\Tag\ISO\Publisher(), + 'DataPreparer' => new \PHPExiftool\Driver\Tag\ISO\DataPreparer(), + 'Software' => new \PHPExiftool\Driver\Tag\ISO\Software(), + 'CopyrightFileName' => new \PHPExiftool\Driver\Tag\ISO\CopyrightFileName(), + 'AbstractFileName' => new \PHPExiftool\Driver\Tag\ISO\AbstractFileName(), + 'BibligraphicFileName' => new \PHPExiftool\Driver\Tag\ISO\BibligraphicFileName(), + 'VolumeCreateDate' => new \PHPExiftool\Driver\Tag\ISO\VolumeCreateDate(), + 'VolumeModifyDate' => new \PHPExiftool\Driver\Tag\ISO\VolumeModifyDate(), + 'VolumeExpirationDate' => new \PHPExiftool\Driver\Tag\ISO\VolumeExpirationDate(), + 'VolumeEffectiveDate' => new \PHPExiftool\Driver\Tag\ISO\VolumeEffectiveDate(), + ); + }); $this['ITC'] = $this->share(function(){ return array( 'DataType' => new \PHPExiftool\Driver\Tag\ITC\DataType(), @@ -9525,7 +9558,7 @@ public function __construct() 'TimeCode' => new \PHPExiftool\Driver\Tag\Matroska\TimeCode(), 'CueCodecState' => new \PHPExiftool\Driver\Tag\Matroska\CueCodecState(), 'CueRefCodecState' => new \PHPExiftool\Driver\Tag\Matroska\CueRefCodecState(), - 'Void' => new \PHPExiftool\Driver\Tag\Matroska\Void(), + 'Void' => new \PHPExiftool\Driver\Tag\Matroska\Void0(), 'BlockAddID' => new \PHPExiftool\Driver\Tag\Matroska\BlockAddID(), 'CueClusterPosition' => new \PHPExiftool\Driver\Tag\Matroska\CueClusterPosition(), 'CueTrack' => new \PHPExiftool\Driver\Tag\Matroska\CueTrack(), @@ -10447,6 +10480,7 @@ public function __construct() 'Face11Position' => new \PHPExiftool\Driver\Tag\Nikon\Face11Position(), 'Face12Position' => new \PHPExiftool\Driver\Tag\Nikon\Face12Position(), 'FileInfoVersion' => new \PHPExiftool\Driver\Tag\Nikon\FileInfoVersion(), + 'MemoryCardNumber' => new \PHPExiftool\Driver\Tag\Nikon\MemoryCardNumber(), 'DirectoryNumber' => new \PHPExiftool\Driver\Tag\Nikon\DirectoryNumber(), 'FileNumber' => new \PHPExiftool\Driver\Tag\Nikon\FileNumber(), 'FlashInfoVersion' => new \PHPExiftool\Driver\Tag\Nikon\FlashInfoVersion(), @@ -12425,9 +12459,16 @@ public function __construct() 'ImageWidth' => new \PHPExiftool\Driver\Tag\Photoshop\ImageWidth(), 'BitDepth' => new \PHPExiftool\Driver\Tag\Photoshop\BitDepth(), 'ColorMode' => new \PHPExiftool\Driver\Tag\Photoshop\ColorMode(), + 'Compression' => new \PHPExiftool\Driver\Tag\Photoshop\Compression(), 'PhotoshopQuality' => new \PHPExiftool\Driver\Tag\Photoshop\PhotoshopQuality(), 'PhotoshopFormat' => new \PHPExiftool\Driver\Tag\Photoshop\PhotoshopFormat(), 'ProgressiveScans' => new \PHPExiftool\Driver\Tag\Photoshop\ProgressiveScans(), + 'LayerBlendModes' => new \PHPExiftool\Driver\Tag\Photoshop\LayerBlendModes(), + 'LayerCount' => new \PHPExiftool\Driver\Tag\Photoshop\LayerCount(), + 'LayerNames' => new \PHPExiftool\Driver\Tag\Photoshop\LayerNames(), + 'LayerOpacities' => new \PHPExiftool\Driver\Tag\Photoshop\LayerOpacities(), + 'LayerRectangles' => new \PHPExiftool\Driver\Tag\Photoshop\LayerRectangles(), + 'LayerUnicodeNames' => new \PHPExiftool\Driver\Tag\Photoshop\LayerUnicodeNames(), 'Photoshop2Info' => new \PHPExiftool\Driver\Tag\Photoshop\Photoshop2Info(), 'MacintoshPrintInfo' => new \PHPExiftool\Driver\Tag\Photoshop\MacintoshPrintInfo(), 'XMLData' => new \PHPExiftool\Driver\Tag\Photoshop\XMLData(), @@ -12471,16 +12512,12 @@ public function __construct() 'IndexedColourTableCount' => new \PHPExiftool\Driver\Tag\Photoshop\IndexedColourTableCount(), 'TransparentIndex' => new \PHPExiftool\Driver\Tag\Photoshop\TransparentIndex(), 'GlobalAltitude' => new \PHPExiftool\Driver\Tag\Photoshop\GlobalAltitude(), - 'Slices' => new \PHPExiftool\Driver\Tag\Photoshop\Slices(), 'WorkflowURL' => new \PHPExiftool\Driver\Tag\Photoshop\WorkflowURL(), 'JumpToXPEP' => new \PHPExiftool\Driver\Tag\Photoshop\JumpToXPEP(), 'AlphaIdentifiers' => new \PHPExiftool\Driver\Tag\Photoshop\AlphaIdentifiers(), 'URL_List' => new \PHPExiftool\Driver\Tag\Photoshop\URLList(), - 'VersionInfo' => new \PHPExiftool\Driver\Tag\Photoshop\VersionInfo(), 'ExifInfo2' => new \PHPExiftool\Driver\Tag\Photoshop\ExifInfo2(), 'IPTCDigest' => new \PHPExiftool\Driver\Tag\Photoshop\IPTCDigest(), - 'PrintScale' => new \PHPExiftool\Driver\Tag\Photoshop\PrintScale(), - 'PixelAspectRatio' => new \PHPExiftool\Driver\Tag\Photoshop\PixelAspectRatio(), 'LayerComps' => new \PHPExiftool\Driver\Tag\Photoshop\LayerComps(), 'AlternateDuotoneColors' => new \PHPExiftool\Driver\Tag\Photoshop\AlternateDuotoneColors(), 'AlternateSpotColors' => new \PHPExiftool\Driver\Tag\Photoshop\AlternateSpotColors(), @@ -12507,10 +12544,18 @@ public function __construct() 'ImageReadyDataSets' => new \PHPExiftool\Driver\Tag\Photoshop\ImageReadyDataSets(), 'LightroomWorkflow' => new \PHPExiftool\Driver\Tag\Photoshop\LightroomWorkflow(), 'PrintFlagsInfo' => new \PHPExiftool\Driver\Tag\Photoshop\PrintFlagsInfo(), + 'PixelAspectRatio' => new \PHPExiftool\Driver\Tag\Photoshop\PixelAspectRatio(), + 'PrintPosition' => new \PHPExiftool\Driver\Tag\Photoshop\PrintPosition(), + 'PrintScale' => new \PHPExiftool\Driver\Tag\Photoshop\PrintScale(), 'XResolution' => new \PHPExiftool\Driver\Tag\Photoshop\XResolution(), 'DisplayedUnitsX' => new \PHPExiftool\Driver\Tag\Photoshop\DisplayedUnitsX(), 'YResolution' => new \PHPExiftool\Driver\Tag\Photoshop\YResolution(), 'DisplayedUnitsY' => new \PHPExiftool\Driver\Tag\Photoshop\DisplayedUnitsY(), + 'SlicesGroupName' => new \PHPExiftool\Driver\Tag\Photoshop\SlicesGroupName(), + 'NumSlices' => new \PHPExiftool\Driver\Tag\Photoshop\NumSlices(), + 'HasRealMergedData' => new \PHPExiftool\Driver\Tag\Photoshop\HasRealMergedData(), + 'WriterName' => new \PHPExiftool\Driver\Tag\Photoshop\WriterName(), + 'ReaderName' => new \PHPExiftool\Driver\Tag\Photoshop\ReaderName(), ); }); $this['PostScript'] = $this->share(function(){ @@ -14026,9 +14071,11 @@ public function __construct() 'BackgroundColor' => new \PHPExiftool\Driver\Tag\QuickTime\BackgroundColor(), 'FontName' => new \PHPExiftool\Driver\Tag\QuickTime\FontName(), 'PlayAllFrames' => new \PHPExiftool\Driver\Tag\QuickTime\PlayAllFrames(), + 'SerialNumberHash' => new \PHPExiftool\Driver\Tag\QuickTime\SerialNumberHash(), 'CompressorVersion' => new \PHPExiftool\Driver\Tag\QuickTime\CompressorVersion(), 'FirmwareVersion' => new \PHPExiftool\Driver\Tag\QuickTime\FirmwareVersion(), 'GoProType' => new \PHPExiftool\Driver\Tag\QuickTime\GoProType(), + 'LensSerialNumber' => new \PHPExiftool\Driver\Tag\QuickTime\LensSerialNumber(), 'LoopStyle' => new \PHPExiftool\Driver\Tag\QuickTime\LoopStyle(), 'MakerNotePentaxUnknown' => new \PHPExiftool\Driver\Tag\QuickTime\MakerNotePentaxUnknown(), 'PreviewImage' => new \PHPExiftool\Driver\Tag\QuickTime\PreviewImage(), @@ -14069,6 +14116,7 @@ public function __construct() 'Arranger' => new \PHPExiftool\Driver\Tag\QuickTime\Arranger(), 'ArrangerKeywords' => new \PHPExiftool\Driver\Tag\QuickTime\ArrangerKeywords(), 'ComposerKeywords' => new \PHPExiftool\Driver\Tag\QuickTime\ComposerKeywords(), + 'UserData_dji' => new \PHPExiftool\Driver\Tag\QuickTime\UserDataDji(), 'Edit1' => new \PHPExiftool\Driver\Tag\QuickTime\Edit1(), 'Edit2' => new \PHPExiftool\Driver\Tag\QuickTime\Edit2(), 'Edit3' => new \PHPExiftool\Driver\Tag\QuickTime\Edit3(), @@ -14089,12 +14137,14 @@ public function __construct() 'PerformerKeywords' => new \PHPExiftool\Driver\Tag\QuickTime\PerformerKeywords(), 'PerformerURL' => new \PHPExiftool\Driver\Tag\QuickTime\PerformerURL(), 'Requirements' => new \PHPExiftool\Driver\Tag\QuickTime\Requirements(), + 'UserData_res' => new \PHPExiftool\Driver\Tag\QuickTime\UserDataRes(), 'SubtitleKeywords' => new \PHPExiftool\Driver\Tag\QuickTime\SubtitleKeywords(), 'Subtitle' => new \PHPExiftool\Driver\Tag\QuickTime\Subtitle(), 'SourceCredits' => new \PHPExiftool\Driver\Tag\QuickTime\SourceCredits(), 'SongWriter' => new \PHPExiftool\Driver\Tag\QuickTime\SongWriter(), 'SongWriterKeywords' => new \PHPExiftool\Driver\Tag\QuickTime\SongWriterKeywords(), 'SoftwareVersion' => new \PHPExiftool\Driver\Tag\QuickTime\SoftwareVersion(), + 'UserData_uid' => new \PHPExiftool\Driver\Tag\QuickTime\UserDataUid(), 'DisplaySize' => new \PHPExiftool\Driver\Tag\QuickTime\DisplaySize(), 'SlideShow' => new \PHPExiftool\Driver\Tag\QuickTime\SlideShow(), 'GraphicsMode' => new \PHPExiftool\Driver\Tag\QuickTime\GraphicsMode(), @@ -14648,6 +14698,9 @@ public function __construct() 'EmbeddedImageName' => new \PHPExiftool\Driver\Tag\Samsung\EmbeddedImageName(), 'EmbeddedAudioFile' => new \PHPExiftool\Driver\Tag\Samsung\EmbeddedAudioFile(), 'EmbeddedAudioFileName' => new \PHPExiftool\Driver\Tag\Samsung\EmbeddedAudioFileName(), + 'TimeStamp' => new \PHPExiftool\Driver\Tag\Samsung\TimeStamp(), + 'EmbeddedVideoFile' => new \PHPExiftool\Driver\Tag\Samsung\EmbeddedVideoFile(), + 'EmbeddedVideoType' => new \PHPExiftool\Driver\Tag\Samsung\EmbeddedVideoType(), 'DeviceType' => new \PHPExiftool\Driver\Tag\Samsung\DeviceType(), 'SamsungModelID' => new \PHPExiftool\Driver\Tag\Samsung\SamsungModelID(), 'PictureWizard' => new \PHPExiftool\Driver\Tag\Samsung\PictureWizard(), @@ -15179,7 +15232,9 @@ public function __construct() 'AFZoneSelected' => new \PHPExiftool\Driver\Tag\Sony\AFZoneSelected(), 'FocalPlaneAFPointsUsed' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointsUsed(), 'WBShiftAB_GM_Precise' => new \PHPExiftool\Driver\Tag\Sony\WBShiftABGMPrecise(), + 'FocusLocation' => new \PHPExiftool\Driver\Tag\Sony\FocusLocation(), 'VariableLowPassFilter' => new \PHPExiftool\Driver\Tag\Sony\VariableLowPassFilter(), + 'RAWFileType' => new \PHPExiftool\Driver\Tag\Sony\RAWFileType(), 'Sony_0x9400' => new \PHPExiftool\Driver\Tag\Sony\Sony0x9400(), 'Sony_0x9401' => new \PHPExiftool\Driver\Tag\Sony\Sony0x9401(), 'Sony_0x9402' => new \PHPExiftool\Driver\Tag\Sony\Sony0x9402(), @@ -15280,6 +15335,7 @@ public function __construct() 'MetaVersion' => new \PHPExiftool\Driver\Tag\Sony\MetaVersion(), 'ReleaseMode3' => new \PHPExiftool\Driver\Tag\Sony\ReleaseMode3(), 'ReleaseMode2' => new \PHPExiftool\Driver\Tag\Sony\ReleaseMode2(), + 'SelfTimer' => new \PHPExiftool\Driver\Tag\Sony\SelfTimer(), 'StopsAboveBaseISO' => new \PHPExiftool\Driver\Tag\Sony\StopsAboveBaseISO(), 'PictureProfile' => new \PHPExiftool\Driver\Tag\Sony\PictureProfile(), 'PictureEffect2' => new \PHPExiftool\Driver\Tag\Sony\PictureEffect2(), @@ -15293,6 +15349,22 @@ public function __construct() 'MinFocalLength' => new \PHPExiftool\Driver\Tag\Sony\MinFocalLength(), 'MaxFocalLength' => new \PHPExiftool\Driver\Tag\Sony\MaxFocalLength(), 'LensFormat' => new \PHPExiftool\Driver\Tag\Sony\LensFormat(), + 'FocalPlaneAFPointArea' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointArea(), + 'FocalPlaneAFPointLocation1' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation1(), + 'FocalPlaneAFPointLocation2' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation2(), + 'FocalPlaneAFPointLocation3' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation3(), + 'FocalPlaneAFPointLocation4' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation4(), + 'FocalPlaneAFPointLocation5' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation5(), + 'FocalPlaneAFPointLocation6' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation6(), + 'FocalPlaneAFPointLocation7' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation7(), + 'FocalPlaneAFPointLocation8' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation8(), + 'FocalPlaneAFPointLocation9' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation9(), + 'FocalPlaneAFPointLocation10' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation10(), + 'FocalPlaneAFPointLocation11' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation11(), + 'FocalPlaneAFPointLocation12' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation12(), + 'FocalPlaneAFPointLocation13' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation13(), + 'FocalPlaneAFPointLocation14' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation14(), + 'FocalPlaneAFPointLocation15' => new \PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation15(), 'MaxAperture' => new \PHPExiftool\Driver\Tag\Sony\MaxAperture(), 'MinAperture' => new \PHPExiftool\Driver\Tag\Sony\MinAperture(), 'SonyFNumber' => new \PHPExiftool\Driver\Tag\Sony\SonyFNumber(), @@ -15775,11 +15847,18 @@ public function __construct() 'Collections' => new \PHPExiftool\Driver\Tag\XMPAcdsee\Collections(), 'DateTime' => new \PHPExiftool\Driver\Tag\XMPAcdsee\DateTime(), 'DPP' => new \PHPExiftool\Driver\Tag\XMPAcdsee\DPP(), + 'EditStatus' => new \PHPExiftool\Driver\Tag\XMPAcdsee\EditStatus(), + 'FixtureIdentifier' => new \PHPExiftool\Driver\Tag\XMPAcdsee\FixtureIdentifier(), 'Keywords' => new \PHPExiftool\Driver\Tag\XMPAcdsee\Keywords(), 'Notes' => new \PHPExiftool\Driver\Tag\XMPAcdsee\Notes(), + 'ObjectCycle' => new \PHPExiftool\Driver\Tag\XMPAcdsee\ObjectCycle(), + 'OriginatingProgram' => new \PHPExiftool\Driver\Tag\XMPAcdsee\OriginatingProgram(), 'Rating' => new \PHPExiftool\Driver\Tag\XMPAcdsee\Rating(), 'Rawrppused' => new \PHPExiftool\Driver\Tag\XMPAcdsee\Rawrppused(), + 'ReleaseDate' => new \PHPExiftool\Driver\Tag\XMPAcdsee\ReleaseDate(), + 'ReleaseTime' => new \PHPExiftool\Driver\Tag\XMPAcdsee\ReleaseTime(), 'RPP' => new \PHPExiftool\Driver\Tag\XMPAcdsee\RPP(), + 'Snapshots' => new \PHPExiftool\Driver\Tag\XMPAcdsee\Snapshots(), 'Tagged' => new \PHPExiftool\Driver\Tag\XMPAcdsee\Tagged(), ); }); @@ -15939,6 +16018,10 @@ public function __construct() 'CropUnit' => new \PHPExiftool\Driver\Tag\XMPCrs\CropUnit(), 'CropUnits' => new \PHPExiftool\Driver\Tag\XMPCrs\CropUnits(), 'CropWidth' => new \PHPExiftool\Driver\Tag\XMPCrs\CropWidth(), + 'DefaultAutoGray' => new \PHPExiftool\Driver\Tag\XMPCrs\DefaultAutoGray(), + 'DefaultAutoTone' => new \PHPExiftool\Driver\Tag\XMPCrs\DefaultAutoTone(), + 'DefaultsSpecificToISO' => new \PHPExiftool\Driver\Tag\XMPCrs\DefaultsSpecificToISO(), + 'DefaultsSpecificToSerial' => new \PHPExiftool\Driver\Tag\XMPCrs\DefaultsSpecificToSerial(), 'Defringe' => new \PHPExiftool\Driver\Tag\XMPCrs\Defringe(), 'DefringeGreenAmount' => new \PHPExiftool\Driver\Tag\XMPCrs\DefringeGreenAmount(), 'DefringeGreenHueHi' => new \PHPExiftool\Driver\Tag\XMPCrs\DefringeGreenHueHi(), @@ -15946,6 +16029,7 @@ public function __construct() 'DefringePurpleAmount' => new \PHPExiftool\Driver\Tag\XMPCrs\DefringePurpleAmount(), 'DefringePurpleHueHi' => new \PHPExiftool\Driver\Tag\XMPCrs\DefringePurpleHueHi(), 'DefringePurpleHueLo' => new \PHPExiftool\Driver\Tag\XMPCrs\DefringePurpleHueLo(), + 'DNGIgnoreSidecars' => new \PHPExiftool\Driver\Tag\XMPCrs\DNGIgnoreSidecars(), 'Exposure' => new \PHPExiftool\Driver\Tag\XMPCrs\Exposure(), 'Exposure2012' => new \PHPExiftool\Driver\Tag\XMPCrs\Exposure2012(), 'FillLight' => new \PHPExiftool\Driver\Tag\XMPCrs\FillLight(), @@ -16025,6 +16109,7 @@ public function __construct() 'HueAdjustmentYellow' => new \PHPExiftool\Driver\Tag\XMPCrs\HueAdjustmentYellow(), 'IncrementalTemperature' => new \PHPExiftool\Driver\Tag\XMPCrs\IncrementalTemperature(), 'IncrementalTint' => new \PHPExiftool\Driver\Tag\XMPCrs\IncrementalTint(), + 'JPEGHandling' => new \PHPExiftool\Driver\Tag\XMPCrs\JPEGHandling(), 'LensManualDistortionAmount' => new \PHPExiftool\Driver\Tag\XMPCrs\LensManualDistortionAmount(), 'LensProfileChromaticAberrationScale' => new \PHPExiftool\Driver\Tag\XMPCrs\LensProfileChromaticAberrationScale(), 'LensProfileDigest' => new \PHPExiftool\Driver\Tag\XMPCrs\LensProfileDigest(), @@ -16054,6 +16139,9 @@ public function __construct() 'LuminanceNoiseReductionDetail' => new \PHPExiftool\Driver\Tag\XMPCrs\LuminanceNoiseReductionDetail(), 'LuminanceSmoothing' => new \PHPExiftool\Driver\Tag\XMPCrs\LuminanceSmoothing(), 'MoireFilter' => new \PHPExiftool\Driver\Tag\XMPCrs\MoireFilter(), + 'NegativeCacheLargePreviewSize' => new \PHPExiftool\Driver\Tag\XMPCrs\NegativeCacheLargePreviewSize(), + 'NegativeCacheMaximumSize' => new \PHPExiftool\Driver\Tag\XMPCrs\NegativeCacheMaximumSize(), + 'NegativeCachePath' => new \PHPExiftool\Driver\Tag\XMPCrs\NegativeCachePath(), 'PaintBasedCorrections' => new \PHPExiftool\Driver\Tag\XMPCrs\PaintBasedCorrections(), 'PaintCorrectionActive' => new \PHPExiftool\Driver\Tag\XMPCrs\PaintCorrectionActive(), 'PaintCorrectionAmount' => new \PHPExiftool\Driver\Tag\XMPCrs\PaintCorrectionAmount(), @@ -16188,6 +16276,7 @@ public function __construct() 'SplitToningShadowHue' => new \PHPExiftool\Driver\Tag\XMPCrs\SplitToningShadowHue(), 'SplitToningShadowSaturation' => new \PHPExiftool\Driver\Tag\XMPCrs\SplitToningShadowSaturation(), 'ColorTemperature' => new \PHPExiftool\Driver\Tag\XMPCrs\ColorTemperature(), + 'TIFFHandling' => new \PHPExiftool\Driver\Tag\XMPCrs\TIFFHandling(), 'Tint' => new \PHPExiftool\Driver\Tag\XMPCrs\Tint(), 'ToneCurve' => new \PHPExiftool\Driver\Tag\XMPCrs\ToneCurve(), 'ToneCurveBlue' => new \PHPExiftool\Driver\Tag\XMPCrs\ToneCurveBlue(), @@ -17411,6 +17500,7 @@ public function getAll() 'ID3v2_2' => $this['ID3v2_2'], 'ID3v2_3' => $this['ID3v2_3'], 'ID3v2_4' => $this['ID3v2_4'], + 'ISO' => $this['ISO'], 'ITC' => $this['ITC'], 'JFIF' => $this['JFIF'], 'AVI1' => $this['AVI1'], @@ -20053,6 +20143,11 @@ public function getLookupTable() 'tagname' => 'MeasuredEV', 'classname' => 'PHPExiftool\Driver\Tag\Canon\MeasuredEV', ), + 'camerapicturestyle' => array( + 'namespace' => 'Canon', + 'tagname' => 'CameraPictureStyle', + 'classname' => 'PHPExiftool\Driver\Tag\Canon\CameraPictureStyle', + ), 'rotation' => array( 'namespace' => 'Canon', 'tagname' => 'Rotation', @@ -22126,6 +22221,11 @@ public function getLookupTable() 'tagname' => 'AutoAFPointColorTracking', 'classname' => 'PHPExiftool\Driver\Tag\CanonCustom\AutoAFPointColorTracking', ), + 'initialafpointaiservoaf' => array( + 'namespace' => 'CanonCustom', + 'tagname' => 'InitialAFPointAIServoAF', + 'classname' => 'PHPExiftool\Driver\Tag\CanonCustom\InitialAFPointAIServoAF', + ), 'continuousshootingspeed' => array( 'namespace' => 'CanonCustom', 'tagname' => 'ContinuousShootingSpeed', @@ -24863,6 +24963,11 @@ public function getLookupTable() 'tagname' => 'ThumbnailImage', 'classname' => 'PHPExiftool\Driver\Tag\Composite\ThumbnailImage', ), + 'volumesize' => array( + 'namespace' => 'Composite', + 'tagname' => 'VolumeSize', + 'classname' => 'PHPExiftool\Driver\Tag\Composite\VolumeSize', + ), 'wb_rgblevels' => array( 'namespace' => 'Composite', 'tagname' => 'WB_RGBLevels', @@ -42035,6 +42140,11 @@ public function getLookupTable() 'tagname' => 'XP_DIP_XML', 'classname' => 'PHPExiftool\Driver\Tag\ExifIFD\XPDIPXML', ), + 'sonyrawfiletype' => array( + 'namespace' => 'ExifIFD', + 'tagname' => 'SonyRawFileType', + 'classname' => 'PHPExiftool\Driver\Tag\ExifIFD\SonyRawFileType', + ), 'chromaticaberrationcorrparams' => array( 'namespace' => 'ExifIFD', 'tagname' => 'ChromaticAberrationCorrParams', @@ -44288,6 +44398,11 @@ public function getLookupTable() ), 'exe' => array( + 'createdate' => array( + 'namespace' => 'EXE', + 'tagname' => 'CreateDate', + 'classname' => 'PHPExiftool\Driver\Tag\EXE\CreateDate', + ), 'chmversion' => array( 'namespace' => 'EXE', 'tagname' => 'CHMVersion', @@ -44328,6 +44443,11 @@ public function getLookupTable() 'tagname' => 'CPUSubtype', 'classname' => 'PHPExiftool\Driver\Tag\EXE\CPUSubtype', ), + 'objectflags' => array( + 'namespace' => 'EXE', + 'tagname' => 'ObjectFlags', + 'classname' => 'PHPExiftool\Driver\Tag\EXE\ObjectFlags', + ), 'machinetype' => array( 'namespace' => 'EXE', 'tagname' => 'MachineType', @@ -48927,6 +49047,11 @@ public function getLookupTable() 'tagname' => 'WB_GRGBLevels', 'classname' => 'PHPExiftool\Driver\Tag\RAF\WBGRGBLevels', ), + 'relativeexposure' => array( + 'namespace' => 'RAF', + 'tagname' => 'RelativeExposure', + 'classname' => 'PHPExiftool\Driver\Tag\RAF\RelativeExposure', + ), 'rawexposurebias' => array( 'namespace' => 'RAF', 'tagname' => 'RawExposureBias', @@ -51716,6 +51841,119 @@ public function getLookupTable() 'classname' => 'PHPExiftool\Driver\Tag\ID3v24\UserDefinedURL', ), + ), + 'iso' => array( + 'bootsystem' => array( + 'namespace' => 'ISO', + 'tagname' => 'BootSystem', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\BootSystem', + ), + 'bootidentifier' => array( + 'namespace' => 'ISO', + 'tagname' => 'BootIdentifier', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\BootIdentifier', + ), + 'system' => array( + 'namespace' => 'ISO', + 'tagname' => 'System', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\System', + ), + 'volumename' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeName', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeName', + ), + 'volumeblockcount' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeBlockCount', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeBlockCount', + ), + 'volumesetdiskcount' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeSetDiskCount', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeSetDiskCount', + ), + 'volumesetdisknumber' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeSetDiskNumber', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeSetDiskNumber', + ), + 'volumeblocksize' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeBlockSize', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeBlockSize', + ), + 'pathtablesize' => array( + 'namespace' => 'ISO', + 'tagname' => 'PathTableSize', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\PathTableSize', + ), + 'pathtablelocation' => array( + 'namespace' => 'ISO', + 'tagname' => 'PathTableLocation', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\PathTableLocation', + ), + 'rootdirectorycreatedate' => array( + 'namespace' => 'ISO', + 'tagname' => 'RootDirectoryCreateDate', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\RootDirectoryCreateDate', + ), + 'volumesetname' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeSetName', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeSetName', + ), + 'publisher' => array( + 'namespace' => 'ISO', + 'tagname' => 'Publisher', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\Publisher', + ), + 'datapreparer' => array( + 'namespace' => 'ISO', + 'tagname' => 'DataPreparer', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\DataPreparer', + ), + 'software' => array( + 'namespace' => 'ISO', + 'tagname' => 'Software', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\Software', + ), + 'copyrightfilename' => array( + 'namespace' => 'ISO', + 'tagname' => 'CopyrightFileName', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\CopyrightFileName', + ), + 'abstractfilename' => array( + 'namespace' => 'ISO', + 'tagname' => 'AbstractFileName', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\AbstractFileName', + ), + 'bibligraphicfilename' => array( + 'namespace' => 'ISO', + 'tagname' => 'BibligraphicFileName', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\BibligraphicFileName', + ), + 'volumecreatedate' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeCreateDate', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeCreateDate', + ), + 'volumemodifydate' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeModifyDate', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeModifyDate', + ), + 'volumeexpirationdate' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeExpirationDate', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeExpirationDate', + ), + 'volumeeffectivedate' => array( + 'namespace' => 'ISO', + 'tagname' => 'VolumeEffectiveDate', + 'classname' => 'PHPExiftool\Driver\Tag\ISO\VolumeEffectiveDate', + ), + ), 'itc' => array( 'datatype' => array( @@ -62972,7 +63210,7 @@ public function getLookupTable() 'void' => array( 'namespace' => 'Matroska', 'tagname' => 'Void', - 'classname' => 'PHPExiftool\Driver\Tag\Matroska\Void', + 'classname' => 'PHPExiftool\Driver\Tag\Matroska\Void0', ), 'blockaddid' => array( 'namespace' => 'Matroska', @@ -67443,6 +67681,11 @@ public function getLookupTable() 'tagname' => 'FileInfoVersion', 'classname' => 'PHPExiftool\Driver\Tag\Nikon\FileInfoVersion', ), + 'memorycardnumber' => array( + 'namespace' => 'Nikon', + 'tagname' => 'MemoryCardNumber', + 'classname' => 'PHPExiftool\Driver\Tag\Nikon\MemoryCardNumber', + ), 'directorynumber' => array( 'namespace' => 'Nikon', 'tagname' => 'DirectoryNumber', @@ -76925,6 +77168,11 @@ public function getLookupTable() 'tagname' => 'ColorMode', 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\ColorMode', ), + 'compression' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'Compression', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\Compression', + ), 'photoshopquality' => array( 'namespace' => 'Photoshop', 'tagname' => 'PhotoshopQuality', @@ -76940,6 +77188,36 @@ public function getLookupTable() 'tagname' => 'ProgressiveScans', 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\ProgressiveScans', ), + 'layerblendmodes' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'LayerBlendModes', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\LayerBlendModes', + ), + 'layercount' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'LayerCount', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\LayerCount', + ), + 'layernames' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'LayerNames', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\LayerNames', + ), + 'layeropacities' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'LayerOpacities', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\LayerOpacities', + ), + 'layerrectangles' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'LayerRectangles', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\LayerRectangles', + ), + 'layerunicodenames' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'LayerUnicodeNames', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\LayerUnicodeNames', + ), 'photoshop2info' => array( 'namespace' => 'Photoshop', 'tagname' => 'Photoshop2Info', @@ -77155,11 +77433,6 @@ public function getLookupTable() 'tagname' => 'GlobalAltitude', 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\GlobalAltitude', ), - 'slices' => array( - 'namespace' => 'Photoshop', - 'tagname' => 'Slices', - 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\Slices', - ), 'workflowurl' => array( 'namespace' => 'Photoshop', 'tagname' => 'WorkflowURL', @@ -77180,11 +77453,6 @@ public function getLookupTable() 'tagname' => 'URL_List', 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\URLList', ), - 'versioninfo' => array( - 'namespace' => 'Photoshop', - 'tagname' => 'VersionInfo', - 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\VersionInfo', - ), 'exifinfo2' => array( 'namespace' => 'Photoshop', 'tagname' => 'ExifInfo2', @@ -77195,16 +77463,6 @@ public function getLookupTable() 'tagname' => 'IPTCDigest', 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\IPTCDigest', ), - 'printscale' => array( - 'namespace' => 'Photoshop', - 'tagname' => 'PrintScale', - 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\PrintScale', - ), - 'pixelaspectratio' => array( - 'namespace' => 'Photoshop', - 'tagname' => 'PixelAspectRatio', - 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\PixelAspectRatio', - ), 'layercomps' => array( 'namespace' => 'Photoshop', 'tagname' => 'LayerComps', @@ -77335,6 +77593,21 @@ public function getLookupTable() 'tagname' => 'PrintFlagsInfo', 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\PrintFlagsInfo', ), + 'pixelaspectratio' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'PixelAspectRatio', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\PixelAspectRatio', + ), + 'printposition' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'PrintPosition', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\PrintPosition', + ), + 'printscale' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'PrintScale', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\PrintScale', + ), 'xresolution' => array( 'namespace' => 'Photoshop', 'tagname' => 'XResolution', @@ -77355,6 +77628,31 @@ public function getLookupTable() 'tagname' => 'DisplayedUnitsY', 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\DisplayedUnitsY', ), + 'slicesgroupname' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'SlicesGroupName', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\SlicesGroupName', + ), + 'numslices' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'NumSlices', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\NumSlices', + ), + 'hasrealmergeddata' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'HasRealMergedData', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\HasRealMergedData', + ), + 'writername' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'WriterName', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\WriterName', + ), + 'readername' => array( + 'namespace' => 'Photoshop', + 'tagname' => 'ReaderName', + 'classname' => 'PHPExiftool\Driver\Tag\Photoshop\ReaderName', + ), ), 'postscript' => array( @@ -84862,6 +85160,11 @@ public function getLookupTable() 'tagname' => 'PlayAllFrames', 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\PlayAllFrames', ), + 'serialnumberhash' => array( + 'namespace' => 'QuickTime', + 'tagname' => 'SerialNumberHash', + 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\SerialNumberHash', + ), 'compressorversion' => array( 'namespace' => 'QuickTime', 'tagname' => 'CompressorVersion', @@ -84877,6 +85180,11 @@ public function getLookupTable() 'tagname' => 'GoProType', 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\GoProType', ), + 'lensserialnumber' => array( + 'namespace' => 'QuickTime', + 'tagname' => 'LensSerialNumber', + 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\LensSerialNumber', + ), 'loopstyle' => array( 'namespace' => 'QuickTime', 'tagname' => 'LoopStyle', @@ -85077,6 +85385,11 @@ public function getLookupTable() 'tagname' => 'ComposerKeywords', 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\ComposerKeywords', ), + 'userdata_dji' => array( + 'namespace' => 'QuickTime', + 'tagname' => 'UserData_dji', + 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\UserDataDji', + ), 'edit1' => array( 'namespace' => 'QuickTime', 'tagname' => 'Edit1', @@ -85177,6 +85490,11 @@ public function getLookupTable() 'tagname' => 'Requirements', 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\Requirements', ), + 'userdata_res' => array( + 'namespace' => 'QuickTime', + 'tagname' => 'UserData_res', + 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\UserDataRes', + ), 'subtitlekeywords' => array( 'namespace' => 'QuickTime', 'tagname' => 'SubtitleKeywords', @@ -85207,6 +85525,11 @@ public function getLookupTable() 'tagname' => 'SoftwareVersion', 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\SoftwareVersion', ), + 'userdata_uid' => array( + 'namespace' => 'QuickTime', + 'tagname' => 'UserData_uid', + 'classname' => 'PHPExiftool\Driver\Tag\QuickTime\UserDataUid', + ), 'displaysize' => array( 'namespace' => 'QuickTime', 'tagname' => 'DisplaySize', @@ -87649,6 +87972,21 @@ public function getLookupTable() 'tagname' => 'EmbeddedAudioFileName', 'classname' => 'PHPExiftool\Driver\Tag\Samsung\EmbeddedAudioFileName', ), + 'timestamp' => array( + 'namespace' => 'Samsung', + 'tagname' => 'TimeStamp', + 'classname' => 'PHPExiftool\Driver\Tag\Samsung\TimeStamp', + ), + 'embeddedvideofile' => array( + 'namespace' => 'Samsung', + 'tagname' => 'EmbeddedVideoFile', + 'classname' => 'PHPExiftool\Driver\Tag\Samsung\EmbeddedVideoFile', + ), + 'embeddedvideotype' => array( + 'namespace' => 'Samsung', + 'tagname' => 'EmbeddedVideoType', + 'classname' => 'PHPExiftool\Driver\Tag\Samsung\EmbeddedVideoType', + ), 'devicetype' => array( 'namespace' => 'Samsung', 'tagname' => 'DeviceType', @@ -90219,11 +90557,21 @@ public function getLookupTable() 'tagname' => 'WBShiftAB_GM_Precise', 'classname' => 'PHPExiftool\Driver\Tag\Sony\WBShiftABGMPrecise', ), + 'focuslocation' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocusLocation', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocusLocation', + ), 'variablelowpassfilter' => array( 'namespace' => 'Sony', 'tagname' => 'VariableLowPassFilter', 'classname' => 'PHPExiftool\Driver\Tag\Sony\VariableLowPassFilter', ), + 'rawfiletype' => array( + 'namespace' => 'Sony', + 'tagname' => 'RAWFileType', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\RAWFileType', + ), 'sony_0x9400' => array( 'namespace' => 'Sony', 'tagname' => 'Sony_0x9400', @@ -90724,6 +91072,11 @@ public function getLookupTable() 'tagname' => 'ReleaseMode2', 'classname' => 'PHPExiftool\Driver\Tag\Sony\ReleaseMode2', ), + 'selftimer' => array( + 'namespace' => 'Sony', + 'tagname' => 'SelfTimer', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\SelfTimer', + ), 'stopsabovebaseiso' => array( 'namespace' => 'Sony', 'tagname' => 'StopsAboveBaseISO', @@ -90789,6 +91142,86 @@ public function getLookupTable() 'tagname' => 'LensFormat', 'classname' => 'PHPExiftool\Driver\Tag\Sony\LensFormat', ), + 'focalplaneafpointarea' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointArea', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointArea', + ), + 'focalplaneafpointlocation1' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation1', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation1', + ), + 'focalplaneafpointlocation2' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation2', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation2', + ), + 'focalplaneafpointlocation3' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation3', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation3', + ), + 'focalplaneafpointlocation4' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation4', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation4', + ), + 'focalplaneafpointlocation5' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation5', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation5', + ), + 'focalplaneafpointlocation6' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation6', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation6', + ), + 'focalplaneafpointlocation7' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation7', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation7', + ), + 'focalplaneafpointlocation8' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation8', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation8', + ), + 'focalplaneafpointlocation9' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation9', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation9', + ), + 'focalplaneafpointlocation10' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation10', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation10', + ), + 'focalplaneafpointlocation11' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation11', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation11', + ), + 'focalplaneafpointlocation12' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation12', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation12', + ), + 'focalplaneafpointlocation13' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation13', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation13', + ), + 'focalplaneafpointlocation14' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation14', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation14', + ), + 'focalplaneafpointlocation15' => array( + 'namespace' => 'Sony', + 'tagname' => 'FocalPlaneAFPointLocation15', + 'classname' => 'PHPExiftool\Driver\Tag\Sony\FocalPlaneAFPointLocation15', + ), 'maxaperture' => array( 'namespace' => 'Sony', 'tagname' => 'MaxAperture', @@ -92825,6 +93258,16 @@ public function getLookupTable() 'tagname' => 'DPP', 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\DPP', ), + 'editstatus' => array( + 'namespace' => 'XMP-acdsee', + 'tagname' => 'EditStatus', + 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\EditStatus', + ), + 'fixtureidentifier' => array( + 'namespace' => 'XMP-acdsee', + 'tagname' => 'FixtureIdentifier', + 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\FixtureIdentifier', + ), 'keywords' => array( 'namespace' => 'XMP-acdsee', 'tagname' => 'Keywords', @@ -92835,6 +93278,16 @@ public function getLookupTable() 'tagname' => 'Notes', 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\Notes', ), + 'objectcycle' => array( + 'namespace' => 'XMP-acdsee', + 'tagname' => 'ObjectCycle', + 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\ObjectCycle', + ), + 'originatingprogram' => array( + 'namespace' => 'XMP-acdsee', + 'tagname' => 'OriginatingProgram', + 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\OriginatingProgram', + ), 'rating' => array( 'namespace' => 'XMP-acdsee', 'tagname' => 'Rating', @@ -92845,11 +93298,26 @@ public function getLookupTable() 'tagname' => 'Rawrppused', 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\Rawrppused', ), + 'releasedate' => array( + 'namespace' => 'XMP-acdsee', + 'tagname' => 'ReleaseDate', + 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\ReleaseDate', + ), + 'releasetime' => array( + 'namespace' => 'XMP-acdsee', + 'tagname' => 'ReleaseTime', + 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\ReleaseTime', + ), 'rpp' => array( 'namespace' => 'XMP-acdsee', 'tagname' => 'RPP', 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\RPP', ), + 'snapshots' => array( + 'namespace' => 'XMP-acdsee', + 'tagname' => 'Snapshots', + 'classname' => 'PHPExiftool\Driver\Tag\XMPAcdsee\Snapshots', + ), 'tagged' => array( 'namespace' => 'XMP-acdsee', 'tagname' => 'Tagged', @@ -93543,6 +94011,26 @@ public function getLookupTable() 'tagname' => 'CropWidth', 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\CropWidth', ), + 'defaultautogray' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'DefaultAutoGray', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\DefaultAutoGray', + ), + 'defaultautotone' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'DefaultAutoTone', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\DefaultAutoTone', + ), + 'defaultsspecifictoiso' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'DefaultsSpecificToISO', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\DefaultsSpecificToISO', + ), + 'defaultsspecifictoserial' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'DefaultsSpecificToSerial', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\DefaultsSpecificToSerial', + ), 'defringe' => array( 'namespace' => 'XMP-crs', 'tagname' => 'Defringe', @@ -93578,6 +94066,11 @@ public function getLookupTable() 'tagname' => 'DefringePurpleHueLo', 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\DefringePurpleHueLo', ), + 'dngignoresidecars' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'DNGIgnoreSidecars', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\DNGIgnoreSidecars', + ), 'exposure' => array( 'namespace' => 'XMP-crs', 'tagname' => 'Exposure', @@ -93973,6 +94466,11 @@ public function getLookupTable() 'tagname' => 'IncrementalTint', 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\IncrementalTint', ), + 'jpeghandling' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'JPEGHandling', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\JPEGHandling', + ), 'lensmanualdistortionamount' => array( 'namespace' => 'XMP-crs', 'tagname' => 'LensManualDistortionAmount', @@ -94118,6 +94616,21 @@ public function getLookupTable() 'tagname' => 'MoireFilter', 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\MoireFilter', ), + 'negativecachelargepreviewsize' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'NegativeCacheLargePreviewSize', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\NegativeCacheLargePreviewSize', + ), + 'negativecachemaximumsize' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'NegativeCacheMaximumSize', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\NegativeCacheMaximumSize', + ), + 'negativecachepath' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'NegativeCachePath', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\NegativeCachePath', + ), 'paintbasedcorrections' => array( 'namespace' => 'XMP-crs', 'tagname' => 'PaintBasedCorrections', @@ -94788,6 +95301,11 @@ public function getLookupTable() 'tagname' => 'ColorTemperature', 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\ColorTemperature', ), + 'tiffhandling' => array( + 'namespace' => 'XMP-crs', + 'tagname' => 'TIFFHandling', + 'classname' => 'PHPExiftool\Driver\Tag\XMPCrs\TIFFHandling', + ), 'tint' => array( 'namespace' => 'XMP-crs', 'tagname' => 'Tint', diff --git a/lib/PHPExiftool/Driver/Type/VarUstr32.php b/lib/PHPExiftool/Driver/Type/VarUstr32.php new file mode 100644 index 0000000000..ad13d4b185 --- /dev/null +++ b/lib/PHPExiftool/Driver/Type/VarUstr32.php @@ -0,0 +1,23 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace PHPExiftool\Driver\Type; + +use PHPExiftool\Driver\AbstractType; + +class VarUstr32 extends AbstractType +{ + + protected $ExiftoolName = 'var_ustr32'; + + protected $PHPMap = ''; + +} diff --git a/lib/PHPExiftool/Tool/Command/ClassesBuilder.php b/lib/PHPExiftool/Tool/Command/ClassesBuilder.php index a91947f9c6..02d5d441fc 100644 --- a/lib/PHPExiftool/Tool/Command/ClassesBuilder.php +++ b/lib/PHPExiftool/Tool/Command/ClassesBuilder.php @@ -547,6 +547,7 @@ protected function extractDump($dump, OutputInterface $output) 'try', 'use', 'var', + 'void', 'while', 'xor', 'yield',