exiftool_vendored 12.74.0 → 12.76.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfaf371fa934366773b7dde5e837c91f975499c1a503f2d5dc5b3e2aa45a83f1
-  data.tar.gz: 5dc4da573a2ccca50147787b16549efed648f0d8d77c40e59659c5d3fa0469cb
+  metadata.gz: 67bedcfd11781809c2cfd90e145b49a44247c647b1da224c5ba1109dd53d8030
+  data.tar.gz: dea0163e74b01c61aff7679a1cec47e875a4200be6be146db1f496453bb73877
 SHA512:
-  metadata.gz: 9d1543e5bb5dc636305b208149f84b76262725c9c78062d80aca27bdc0e008c748c8a497fc64d5c34ddd365796c40fcae2d06af64db711ee071da96f2337399f
-  data.tar.gz: 4ce5b564f2b77b083b55b27444fd8ca2daa2e05339baeeda494a04dd96f4538c117521ee6106263fdc506815b0bd89a4faf34ce964bed58657183013cd9769c1
+  metadata.gz: be5e71ec63d7c5e8f4f5072507b84e02b14ebafb5aff86b32849a3f43d4cc3c459eae421bb244ad083ea24448a8d7748dc56bdd9f3a125f5c53aa62bea635f23
+  data.tar.gz: 0fd3c38b2e6894e342161a31f07a3cf416caa74ada8df58a4bee908d93e217f33c5d5778aa3e2d2855a4a82fe3f362143fab26d902a5a007faa23d2d4c5d64f1

data/bin/Changes

@@ -4,17 +4,38 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 12.70. (Other versions are
+Note: The most recent production release is Version 12.76. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Jan. 31, 2024 - Version 12.76 (production release)
+
+  - Properly implement patch of 12.45 to avoid duplicating raw data when writing
+    Sony ARW images where the raw data is double-referenced as both strips and
+    tiles
+  - Improved handling of bad offsets in HtmlDump output
+
+Jan. 30, 2024 - Version 12.75 (production release)
+
+  - CORRUPTION WARNING: Fixed bug introduced in 12.45 which could result in
+    corrupted Sony ARW images from some newer models when rewriting lossless
+    compressed ARW images which were previously edited by 12.44 or earlier
+  - Added ability to read C2PA JUMBF metadata from PDF and SVG files
+  - Added ability to extract JUMBF metadata as a block
+  - Added read support for C2PA (JUMBF-format) files
+  - Removed "date before 1970" warning entirely since 64-bit systems should be
+    able to handle dates in this range
+  - Improved Canon FocusMode decoding
+  - Fixed bug introducd in 12.74 which could cause "Undefined subroutine"
+    runtime error when reading MIE files
+
 Jan. 23, 2024 - Version 12.74
 
   - Added a couple of new Nikon lenses (thanks Chris)
   - Added write support for a few new QuickTime Keys tags
   - Decode ShutterCount for Canon EOS R5 (thanks John Moyer)
   - Improved error messages in the case of file read errors
-  - Enhanced tag name strings (eg. -if option expressions) to allow values of
-    multiple matching tags to be concatenated when a group name of "All" is
+  - Enhanced tag name strings (eg. -if and -p option arguments) to allow values
+    of multiple matching tags to be concatenated when a group name of "All" is
     specified
   - Enhanced -p option to add -p- feature which avoids adding trailing newline
   - Changed warning from "Shift results in negative time" to "Shift results in

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.74"
+   "version" : "12.76"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.74
+version: 12.76

data/bin/README

@@ -14,49 +14,50 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DOCX  r     | ISO   r     | NRW   r/w   | RAR   r
-  3FR   r     | DPX   r     | ITC   r     | NUMBERS r   | RAW   r/w
-  3G2   r/w   | DR4   r/w/c | J2C   r     | O     r     | RIFF  r
-  3GP   r/w   | DSS   r     | JNG   r/w   | ODP   r     | RSRC  r
-  7Z    r     | DV    r     | JP2   r/w   | ODS   r     | RTF   r
-  A     r     | DVB   r/w   | JPEG  r/w   | ODT   r     | RW2   r/w
-  AA    r     | DVR-MS r    | JSON  r     | OFR   r     | RWL   r/w
-  AAC   r     | DYLIB r     | JXL   r     | OGG   r     | RWZ   r
-  AAE   r     | EIP   r     | K25   r     | OGV   r     | RM    r
-  AAX   r/w   | EPS   r/w   | KDC   r     | ONP   r     | SEQ   r
-  ACR   r     | EPUB  r     | KEY   r     | OPUS  r     | SKETCH r
-  AFM   r     | ERF   r/w   | LA    r     | ORF   r/w   | SO    r
-  AI    r/w   | EXE   r     | LFP   r     | ORI   r/w   | SR2   r/w
-  AIFF  r     | EXIF  r/w/c | LIF   r     | OTF   r     | SRF   r
-  APE   r     | EXR   r     | LNK   r     | PAC   r     | SRW   r/w
-  ARQ   r/w   | EXV   r/w/c | LRV   r/w   | PAGES r     | SVG   r
-  ARW   r/w   | F4A/V r/w   | M2TS  r     | PBM   r/w   | SWF   r
-  ASF   r     | FFF   r/w   | M4A/V r/w   | PCD   r     | THM   r/w
-  AVI   r     | FITS  r     | MACOS r     | PCX   r     | TIFF  r/w
-  AVIF  r/w   | FLA   r     | MAX   r     | PDB   r     | TORRENT r
-  AZW   r     | FLAC  r     | MEF   r/w   | PDF   r/w   | TTC   r
-  BMP   r     | FLIF  r/w   | MIE   r/w/c | PEF   r/w   | TTF   r
-  BPG   r     | FLV   r     | MIFF  r     | PFA   r     | TXT   r
-  BTF   r     | FPF   r     | MKA   r     | PFB   r     | VCF   r
-  CHM   r     | FPX   r     | MKS   r     | PFM   r     | VNT   r
-  COS   r     | GIF   r/w   | MKV   r     | PGF   r     | VRD   r/w/c
-  CR2   r/w   | GLV   r/w   | MNG   r/w   | PGM   r/w   | VSD   r
-  CR3   r/w   | GPR   r/w   | MOBI  r     | PLIST r     | WAV   r
-  CRM   r/w   | GZ    r     | MODD  r     | PICT  r     | WDP   r/w
-  CRW   r/w   | HDP   r/w   | MOI   r     | PMP   r     | WEBP  r/w
-  CS1   r/w   | HDR   r     | MOS   r/w   | PNG   r/w   | WEBM  r
-  CSV   r     | HEIC  r/w   | MOV   r/w   | PPM   r/w   | WMA   r
-  CUR   r     | HEIF  r/w   | MP3   r     | PPT   r     | WMV   r
-  CZI   r     | HTML  r     | MP4   r/w   | PPTX  r     | WPG   r
-  DCM   r     | ICC   r/w/c | MPC   r     | PS    r/w   | WTV   r
-  DCP   r/w   | ICO   r     | MPG   r     | PSB   r/w   | WV    r
-  DCR   r     | ICS   r     | MPO   r/w   | PSD   r/w   | X3F   r/w
-  DFONT r     | IDML  r     | MQV   r/w   | PSP   r     | XCF   r
-  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XISF  r
-  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLS   r
-  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XLSX  r
-  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | XMP   r/w/c
-  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     | ZIP   r
+  360   r/w   | DOCX  r     | ITC   r     | O     r     | RSRC  r
+  3FR   r     | DPX   r     | J2C   r     | ODP   r     | RTF   r
+  3G2   r/w   | DR4   r/w/c | JNG   r/w   | ODS   r     | RW2   r/w
+  3GP   r/w   | DSS   r     | JP2   r/w   | ODT   r     | RWL   r/w
+  7Z    r     | DV    r     | JPEG  r/w   | OFR   r     | RWZ   r
+  A     r     | DVB   r/w   | JSON  r     | OGG   r     | RM    r
+  AA    r     | DVR-MS r    | JXL   r     | OGV   r     | SEQ   r
+  AAC   r     | DYLIB r     | K25   r     | ONP   r     | SKETCH r
+  AAE   r     | EIP   r     | KDC   r     | OPUS  r     | SO    r
+  AAX   r/w   | EPS   r/w   | KEY   r     | ORF   r/w   | SR2   r/w
+  ACR   r     | EPUB  r     | LA    r     | ORI   r/w   | SRF   r
+  AFM   r     | ERF   r/w   | LFP   r     | OTF   r     | SRW   r/w
+  AI    r/w   | EXE   r     | LIF   r     | PAC   r     | SVG   r
+  AIFF  r     | EXIF  r/w/c | LNK   r     | PAGES r     | SWF   r
+  APE   r     | EXR   r     | LRV   r/w   | PBM   r/w   | THM   r/w
+  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PCD   r     | TIFF  r/w
+  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCX   r     | TORRENT r
+  ASF   r     | FFF   r/w   | MACOS r     | PDB   r     | TTC   r
+  AVI   r     | FITS  r     | MAX   r     | PDF   r/w   | TTF   r
+  AVIF  r/w   | FLA   r     | MEF   r/w   | PEF   r/w   | TXT   r
+  AZW   r     | FLAC  r     | MIE   r/w/c | PFA   r     | VCF   r
+  BMP   r     | FLIF  r/w   | MIFF  r     | PFB   r     | VNT   r
+  BPG   r     | FLV   r     | MKA   r     | PFM   r     | VRD   r/w/c
+  BTF   r     | FPF   r     | MKS   r     | PGF   r     | VSD   r
+  C2PA  r     | FPX   r     | MKV   r     | PGM   r/w   | WAV   r
+  CHM   r     | GIF   r/w   | MNG   r/w   | PLIST r     | WDP   r/w
+  COS   r     | GLV   r/w   | MOBI  r     | PICT  r     | WEBP  r/w
+  CR2   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WEBM  r
+  CR3   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WMA   r
+  CRM   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WMV   r
+  CRW   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WPG   r
+  CS1   r/w   | HEIC  r/w   | MP3   r     | PPTX  r     | WTV   r
+  CSV   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WV    r
+  CUR   r     | HTML  r     | MPC   r     | PSB   r/w   | X3F   r/w
+  CZI   r     | ICC   r/w/c | MPG   r     | PSD   r/w   | XCF   r
+  DCM   r     | ICO   r     | MPO   r/w   | PSP   r     | XISF  r
+  DCP   r/w   | ICS   r     | MQV   r/w   | QTIF  r/w   | XLS   r
+  DCR   r     | IDML  r     | MRC   r     | R3D   r     | XLSX  r
+  DFONT r     | IIQ   r/w   | MRW   r/w   | RA    r     | XMP   r/w/c
+  DIVX  r     | IND   r/w   | MXF   r     | RAF   r/w   | ZIP   r
+  DJVU  r     | INSP  r/w   | NEF   r/w   | RAM   r     |
+  DLL   r     | INSV  r     | NKSC  r/w   | RAR   r     |
+  DNG   r/w   | INX   r     | NRW   r/w   | RAW   r/w   |
+  DOC   r     | ISO   r     | NUMBERS r   | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -108,8 +109,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.74.tar.gz | tar -xf -
-  cd Image-ExifTool-12.74
+  gzip -dc Image-ExifTool-12.76.tar.gz | tar -xf -
+  cd Image-ExifTool-12.76
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.74';
+my $version = '12.76';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -4109,6 +4109,10 @@ sub SuggestedExtension($$$)
         $ext = 'pict';
     } elsif ($$valPt =~ /^\xff\x0a|\0\0\0\x0cJXL \x0d\x0a......ftypjxl/s) {
         $ext = 'jxl';
+    } elsif ($$valPt =~ /^.{4}jumb\0.{3}jumdc2pa/s) {
+        $ext = 'c2pa';
+    } elsif ($tag eq 'JUMBF') {
+        $ext = 'jumbf';
     } else {
         $ext = 'dat';
     }
@@ -4645,49 +4649,50 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DOCX  r     | ISO   r     | NRW   r/w   | RAR   r
-  3FR   r     | DPX   r     | ITC   r     | NUMBERS r   | RAW   r/w
-  3G2   r/w   | DR4   r/w/c | J2C   r     | O     r     | RIFF  r
-  3GP   r/w   | DSS   r     | JNG   r/w   | ODP   r     | RSRC  r
-  7Z    r     | DV    r     | JP2   r/w   | ODS   r     | RTF   r
-  A     r     | DVB   r/w   | JPEG  r/w   | ODT   r     | RW2   r/w
-  AA    r     | DVR-MS r    | JSON  r     | OFR   r     | RWL   r/w
-  AAC   r     | DYLIB r     | JXL   r     | OGG   r     | RWZ   r
-  AAE   r     | EIP   r     | K25   r     | OGV   r     | RM    r
-  AAX   r/w   | EPS   r/w   | KDC   r     | ONP   r     | SEQ   r
-  ACR   r     | EPUB  r     | KEY   r     | OPUS  r     | SKETCH r
-  AFM   r     | ERF   r/w   | LA    r     | ORF   r/w   | SO    r
-  AI    r/w   | EXE   r     | LFP   r     | ORI   r/w   | SR2   r/w
-  AIFF  r     | EXIF  r/w/c | LIF   r     | OTF   r     | SRF   r
-  APE   r     | EXR   r     | LNK   r     | PAC   r     | SRW   r/w
-  ARQ   r/w   | EXV   r/w/c | LRV   r/w   | PAGES r     | SVG   r
-  ARW   r/w   | F4A/V r/w   | M2TS  r     | PBM   r/w   | SWF   r
-  ASF   r     | FFF   r/w   | M4A/V r/w   | PCD   r     | THM   r/w
-  AVI   r     | FITS  r     | MACOS r     | PCX   r     | TIFF  r/w
-  AVIF  r/w   | FLA   r     | MAX   r     | PDB   r     | TORRENT r
-  AZW   r     | FLAC  r     | MEF   r/w   | PDF   r/w   | TTC   r
-  BMP   r     | FLIF  r/w   | MIE   r/w/c | PEF   r/w   | TTF   r
-  BPG   r     | FLV   r     | MIFF  r     | PFA   r     | TXT   r
-  BTF   r     | FPF   r     | MKA   r     | PFB   r     | VCF   r
-  CHM   r     | FPX   r     | MKS   r     | PFM   r     | VNT   r
-  COS   r     | GIF   r/w   | MKV   r     | PGF   r     | VRD   r/w/c
-  CR2   r/w   | GLV   r/w   | MNG   r/w   | PGM   r/w   | VSD   r
-  CR3   r/w   | GPR   r/w   | MOBI  r     | PLIST r     | WAV   r
-  CRM   r/w   | GZ    r     | MODD  r     | PICT  r     | WDP   r/w
-  CRW   r/w   | HDP   r/w   | MOI   r     | PMP   r     | WEBP  r/w
-  CS1   r/w   | HDR   r     | MOS   r/w   | PNG   r/w   | WEBM  r
-  CSV   r     | HEIC  r/w   | MOV   r/w   | PPM   r/w   | WMA   r
-  CUR   r     | HEIF  r/w   | MP3   r     | PPT   r     | WMV   r
-  CZI   r     | HTML  r     | MP4   r/w   | PPTX  r     | WPG   r
-  DCM   r     | ICC   r/w/c | MPC   r     | PS    r/w   | WTV   r
-  DCP   r/w   | ICO   r     | MPG   r     | PSB   r/w   | WV    r
-  DCR   r     | ICS   r     | MPO   r/w   | PSD   r/w   | X3F   r/w
-  DFONT r     | IDML  r     | MQV   r/w   | PSP   r     | XCF   r
-  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XISF  r
-  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLS   r
-  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XLSX  r
-  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | XMP   r/w/c
-  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     | ZIP   r
+  360   r/w   | DOCX  r     | ITC   r     | O     r     | RSRC  r
+  3FR   r     | DPX   r     | J2C   r     | ODP   r     | RTF   r
+  3G2   r/w   | DR4   r/w/c | JNG   r/w   | ODS   r     | RW2   r/w
+  3GP   r/w   | DSS   r     | JP2   r/w   | ODT   r     | RWL   r/w
+  7Z    r     | DV    r     | JPEG  r/w   | OFR   r     | RWZ   r
+  A     r     | DVB   r/w   | JSON  r     | OGG   r     | RM    r
+  AA    r     | DVR-MS r    | JXL   r     | OGV   r     | SEQ   r
+  AAC   r     | DYLIB r     | K25   r     | ONP   r     | SKETCH r
+  AAE   r     | EIP   r     | KDC   r     | OPUS  r     | SO    r
+  AAX   r/w   | EPS   r/w   | KEY   r     | ORF   r/w   | SR2   r/w
+  ACR   r     | EPUB  r     | LA    r     | ORI   r/w   | SRF   r
+  AFM   r     | ERF   r/w   | LFP   r     | OTF   r     | SRW   r/w
+  AI    r/w   | EXE   r     | LIF   r     | PAC   r     | SVG   r
+  AIFF  r     | EXIF  r/w/c | LNK   r     | PAGES r     | SWF   r
+  APE   r     | EXR   r     | LRV   r/w   | PBM   r/w   | THM   r/w
+  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PCD   r     | TIFF  r/w
+  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCX   r     | TORRENT r
+  ASF   r     | FFF   r/w   | MACOS r     | PDB   r     | TTC   r
+  AVI   r     | FITS  r     | MAX   r     | PDF   r/w   | TTF   r
+  AVIF  r/w   | FLA   r     | MEF   r/w   | PEF   r/w   | TXT   r
+  AZW   r     | FLAC  r     | MIE   r/w/c | PFA   r     | VCF   r
+  BMP   r     | FLIF  r/w   | MIFF  r     | PFB   r     | VNT   r
+  BPG   r     | FLV   r     | MKA   r     | PFM   r     | VRD   r/w/c
+  BTF   r     | FPF   r     | MKS   r     | PGF   r     | VSD   r
+  C2PA  r     | FPX   r     | MKV   r     | PGM   r/w   | WAV   r
+  CHM   r     | GIF   r/w   | MNG   r/w   | PLIST r     | WDP   r/w
+  COS   r     | GLV   r/w   | MOBI  r     | PICT  r     | WEBP  r/w
+  CR2   r/w   | GPR   r/w   | MODD  r     | PMP   r     | WEBM  r
+  CR3   r/w   | GZ    r     | MOI   r     | PNG   r/w   | WMA   r
+  CRM   r/w   | HDP   r/w   | MOS   r/w   | PPM   r/w   | WMV   r
+  CRW   r/w   | HDR   r     | MOV   r/w   | PPT   r     | WPG   r
+  CS1   r/w   | HEIC  r/w   | MP3   r     | PPTX  r     | WTV   r
+  CSV   r     | HEIF  r/w   | MP4   r/w   | PS    r/w   | WV    r
+  CUR   r     | HTML  r     | MPC   r     | PSB   r/w   | X3F   r/w
+  CZI   r     | ICC   r/w/c | MPG   r     | PSD   r/w   | XCF   r
+  DCM   r     | ICO   r     | MPO   r/w   | PSP   r     | XISF  r
+  DCP   r/w   | ICS   r     | MQV   r/w   | QTIF  r/w   | XLS   r
+  DCR   r     | IDML  r     | MRC   r     | R3D   r     | XLSX  r
+  DFONT r     | IIQ   r/w   | MRW   r/w   | RA    r     | XMP   r/w/c
+  DIVX  r     | IND   r/w   | MXF   r     | RAF   r/w   | ZIP   r
+  DJVU  r     | INSP  r/w   | NEF   r/w   | RAM   r     |
+  DLL   r     | INSV  r     | NKSC  r/w   | RAR   r     |
+  DNG   r/w   | INX   r     | NRW   r/w   | RAW   r/w   |
+  DOC   r     | ISO   r     | NUMBERS r   | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -5600,7 +5605,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.74 --
+    -- Generated by ExifTool 12.76 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38

data/bin/lib/Image/ExifTool/BuildTagLookup.pm

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.53';
+$VERSION = '3.54';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -1642,7 +1642,7 @@ sub WriteTagLookup($$)
                     } else {
                         my $quot = "'";
                         # escape non-printable characters in tag ID if necessary
-                        $quot = '"' if s/[\x00-\x1f,\x7f-\xff]/sprintf('\\x%.2x',ord($&))/ge;
+                        $quot = '"' if s/([\x00-\x1f,\x7f-\xff])/sprintf('\\x%.2x',ord($1))/ge;
                         $_ = $quot . $_ . $quot;
                     }
                 }
@@ -1655,7 +1655,7 @@ sub WriteTagLookup($$)
             } else {
                 my $quot = "'";
                 # escape non-printable characters in tag ID if necessary
-                $quot = '"' if $tagID =~ s/[\x00-\x1f,\x7f-\xff]/sprintf('\\x%.2x',ord($&))/ge;
+                $quot = '"' if $tagID =~ s/([\x00-\x1f,\x7f-\xff])/sprintf('\\x%.2x',ord($1))/ge;
                 $entry = "$quot${tagID}$quot";
             }
             my $wrNum = $wrNum{$tableNum};

data/bin/lib/Image/ExifTool/Canon.pm

@@ -2206,8 +2206,9 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             6 => 'Manual Focus (6)',
            16 => 'Pan Focus', #PH
            # 137 - Single?
-           256 => 'AF + MF', #PH (NC, EOS M)
-           257 => 'Live View', #forum12082
+           256 => 'One-shot AF (Live View)', #PH/forum15637
+           257 => 'AI Servo AF (Live View)', #PH/forum15637
+           258 => 'AI Focus AF (Live View)', #PH/forum15637
            512 => 'Movie Snap Focus', #48
            519 => 'Movie Servo AF', #PH (NC, EOS M)
         },

data/bin/lib/Image/ExifTool/Exif.pm

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.49';
+$VERSION = '4.50';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -4348,6 +4348,7 @@ my %opcodeInfo = (
         Deletable => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Jpeg2000::Main',
+            DirName => 'JUMBF',
             ByteOrder => 'BigEndian',
         },
     },

data/bin/lib/Image/ExifTool/HtmlDump.pm

@@ -13,7 +13,7 @@ use vars qw($VERSION);
 use Image::ExifTool;    # only for FinishTiffDump()
 use Image::ExifTool::HTML qw(EscapeHTML);
 
-$VERSION = '1.40';
+$VERSION = '1.41';
 
 sub DumpTable($$$;$$$$$$);
 sub Open($$$;@);
@@ -314,6 +314,8 @@ sub Print($$;$$$$$)
     $title = 'HtmlDump' unless $title;
     $level or $level = 0;
     my $tell = $raf->Tell();
+    $raf->Seek(0,2) or $$self{ERROR} = 'Seek error', return -1;
+    my $fileLen = $raf->Tell();
     my $pos = 0;
     my $dataEnd = $dataPos + ($dataPt ? length($$dataPt) : 0);
     # initialize member variables
@@ -352,6 +354,7 @@ sub Print($$;$$$$$)
         } else {
             last;
         }
+        $start = $fileLen if $start > $fileLen; # handle case of bad start offset
         my $len = $start - $pos;
         if ($len > 0 and not $wasUnused) {
             # we have a unused bytes before this data block
@@ -432,8 +435,7 @@ sub Print($$;$$$$$)
                             {
                                 $err = $msg;
                                 # reset $len to the actual length of available data
-                                $raf->Seek(0, 2);
-                                $len = $raf->Tell() - $start;
+                                $len = $fileLen - $start;
                                 $tip .= "<br>Error: Only $len bytes available!" if $tip;
                                 next;
                             }

data/bin/lib/Image/ExifTool/Jpeg2000.pm

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.38';
+$VERSION = '1.39';
 
 sub ProcessJpeg2000Box($$$);
 sub ProcessJUMD($$$);
@@ -141,10 +141,13 @@ my %j2cMarker = (
         Authenticity Initiative) JUMBF (JPEG Universal Metadata Box Format) metdata
         is currently extracted from JPEG, PNG, TIFF-based (eg. TIFF, DNG),
         QuickTime-based (eg. MP4, MOV, HEIF, AVIF), RIFF-based (eg. WAV, AVI, WebP),
-        GIF files and ID3v2 metadata.  The suggested ExifTool command-line arguments
-        for reading C2PA metadata are C<-jumbf:all -G3 -b -j -u -struct>.  This
-        metadata may be deleted from writable JPEG, PNG, WebP, TIFF-based, and
-        QuickTime-based files by deleting the JUMBF group with C<-jumbf:all=>.
+        PDF, SVG and GIF files, and ID3v2 metadata.  The suggested ExifTool
+        command-line arguments for reading C2PA metadata are C<-jumbf:all -G3 -b -j
+        -u -struct>.  This metadata may be deleted from writable JPEG, PNG, WebP,
+        TIFF-based, and QuickTime-based files by deleting the JUMBF group with
+        C<-jumbf:all=>.  The C2PA JUMBF metadata may be extracted as a block via the
+        JUMBF tag.  See L<https://c2pa.org/specifications/> for the C2PA
+        specification.
     },
 #
 # NOTE: ONLY TAGS WITH "Format" DEFINED ARE EXTRACTED!
@@ -419,7 +422,7 @@ my %j2cMarker = (
         Flags => [ 'Binary', 'Protected' ],
         SubDirectory => { TagTable => 'Image::ExifTool::CBOR::Main' },
     },
-    bfdb => { # used in JUMBF (see  # (used when tag is renamed according to JUMDLabel)
+    bfdb => { # used in JUMBF
         Name => 'BinaryDataType',
         Notes => 'JUMBF, MIME type and optional file name',
         Format => 'undef',
@@ -748,6 +751,7 @@ my %j2cMarker = (
         },
         # seen:
         # cacb/cast/caas/cacl/casg/json-00110010800000aa00389b71
+        #   (also brob- but not yet tested)
         # 6579d6fbdba2446bb2ac1b82feeb89d1 - JPEG image
     },
     'label' => { Name => 'JUMDLabel' },
@@ -821,6 +825,7 @@ sub ProcessJUMD($$$)
             $name =~ tr/-_a-zA-Z0-9//dc;    # remove other illegal characters
             $name =~ s/__/_/;               # collapse double underlines
             $name = ucfirst $name;          # capitalize first letter
+            $name =~ s/C2pa/C2PA/;          # capitalize C2PA
             $name = "Tag$name" if length($name) < 2; # must at least 2 characters long
             $$et{JUMBFLabel} = $name;
         }
@@ -1017,11 +1022,23 @@ sub ProcessJpeg2000Box($$$)
     my $dirStart = $$dirInfo{DirStart} || 0;
     my $base = $$dirInfo{Base} || 0;
     my $outfile = $$dirInfo{OutFile};
+    my $dirName = $$dirInfo{DirName} || '';
     my $dirEnd = $dirStart + $dirLen;
     my ($err, $outBuff, $verbose, $doColour, $hash, $raf);
 
-    # read from RAF unless reading from buffer
-    $raf = $$dirInfo{RAF} unless $dataPt;
+    if ($dataPt) {
+        # save C2PA JUMBF as a block if requested
+        if ($dirName eq 'JUMBF' and $$et{REQ_TAG_LOOKUP}{jumbf} and not $$dirInfo{NoBlockSave}) {
+            if ($dirStart or $dirLen ne length($$dataPt)) {
+                my $dat = substr($$dataPt, $dirStart, $dirLen);
+                $et->FoundTag(JUMBF => \$dat);
+            } else {
+                $et->FoundTag(JUMBF => $dataPt);
+            }
+        }
+    } else {
+        $raf = $$dirInfo{RAF};  # read from RAF
+    }
 
     if ($outfile) {
         unless ($raf) {
@@ -1030,7 +1047,7 @@ sub ProcessJpeg2000Box($$$)
             $outfile = \$outBuff;
         }
         # determine if we will be writing colr box
-        if ($$dirInfo{DirName} and $$dirInfo{DirName} eq 'JP2Header') {
+        if ($dirName eq 'JP2Header') {
             $doColour = 2 if defined $et->GetNewValue('ColorSpecMethod') or $et->GetNewValue('ICC_Profile') or
                              defined $et->GetNewValue('ColorSpecPrecedence') or defined $et->GetNewValue('ColorSpace') or
                              defined $et->GetNewValue('ColorSpecApproximation') or defined $et->GetNewValue('ColorSpecData');
@@ -1038,7 +1055,7 @@ sub ProcessJpeg2000Box($$$)
     } else {
         # (must not set verbose flag when writing!)
         $verbose = $$et{OPTIONS}{Verbose};
-        $et->VerboseDir($$dirInfo{DirName}) if $verbose;
+        $et->VerboseDir($dirName) if $verbose;
         # do hash if requested, but only for top-level image data
         $hash = $$et{ImageDataHash} if $raf;
     }
@@ -1187,7 +1204,7 @@ sub ProcessJpeg2000Box($$$)
         # create new tag for JUMBF data values with name corresponding to JUMBFLabel
         if ($tagInfo and $$et{JUMBFLabel} and (not $$tagInfo{SubDirectory} or $$tagInfo{BlockExtract})) {
             $tagInfo = { %$tagInfo, Name => $$et{JUMBFLabel} . ($$tagInfo{JUMBF_Suffix} || '') };
-            delete $$tagInfo{Description};
+            ($$tagInfo{Description} = Image::ExifTool::MakeDescription($$tagInfo{Name})) =~ s/C2 PA/C2PA/;
             AddTagToTable($tagTablePtr, '_JUMBF_' . $$et{JUMBFLabel}, $tagInfo);
             delete $$tagInfo{Protected}; # (must do this so -j -b returns JUMBF binary data)
             $$tagInfo{TagID} = $boxID;
@@ -1491,6 +1508,28 @@ sub ProcessJXLCodestream($$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Read/write meta information from a C2PA/JUMBF file
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 if this wasn't a valid JUMBF file
+sub ProcessJUMBF($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $hdr;
+
+    # check to be sure this is a valid JPG2000 file
+    return 0 unless $raf->Read($hdr,20) == 20 and $raf->Seek(0,0);
+    return 0 unless $hdr =~ /^.{4}jumb\0.{3}jumd(.{4})/;
+    $et->SetFileType($1 eq 'c2pa' ? 'C2PA' : 'JUMBF');
+    my %dirInfo = (
+        RAF => $raf,
+        DirName => 'JUMBF',
+    );
+    my $tagTablePtr = GetTagTable('Image::ExifTool::Jpeg2000::Main');
+    return $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
+}
+
 #------------------------------------------------------------------------------
 # Read/write meta information from a JPEG 2000 image
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference

data/bin/lib/Image/ExifTool/MIE.pm

@@ -14,7 +14,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.53';
+$VERSION = '1.54';
 
 sub ProcessMIE($$);
 sub ProcessMIEGroup($$$);
@@ -1077,7 +1077,7 @@ sub WriteMIEGroup($$$)
                         $newVal = '';
                         %subdirInfo = (
                             OutFile => \$newVal,
-                            RAF => File::RandomAccess(\$oldVal)->new,
+                            RAF => File::RandomAccess->new(\$oldVal),
                         );
                     } elsif ($optCompress and not $$dirInfo{IsCompressed}) {
                         # write to memory so we can compress the new MIE group
@@ -1585,7 +1585,7 @@ sub ProcessMIEGroup($$$)
                 WasCompressed => $wasCompressed,
             );
             # read from uncompressed data instead if necessary
-            $subdirInfo{RAF} = File::RandomAccess(\$value)->new if $valLen;
+            $subdirInfo{RAF} = File::RandomAccess->new(\$value) if $valLen;
 
             my $oldOrder = GetByteOrder();
             SetByteOrder($format & 0x08 ? 'II' : 'MM');