exiftool-vendored.pl 12.85.0 → 12.91.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/bin/Changes +87 -0
  2. package/bin/MANIFEST +1 -0
  3. package/bin/META.json +1 -1
  4. package/bin/META.yml +16 -16
  5. package/bin/README +3 -2
  6. package/bin/build_geolocation +7 -4
  7. package/bin/build_tag_lookup +29 -11
  8. package/bin/config_files/example.config +5 -0
  9. package/bin/config_files/onone.config +28 -0
  10. package/bin/exiftool +23 -15
  11. package/bin/lib/Image/ExifTool/AIFF.pm +8 -4
  12. package/bin/lib/Image/ExifTool/ASF.pm +4 -1
  13. package/bin/lib/Image/ExifTool/BuildTagLookup.pm +14 -8
  14. package/bin/lib/Image/ExifTool/Canon.pm +102 -12
  15. package/bin/lib/Image/ExifTool/CanonRaw.pm +1 -1
  16. package/bin/lib/Image/ExifTool/CanonVRD.pm +5 -2
  17. package/bin/lib/Image/ExifTool/FujiFilm.pm +46 -4
  18. package/bin/lib/Image/ExifTool/Geolocation.dat +0 -0
  19. package/bin/lib/Image/ExifTool/Geolocation.pm +6 -0
  20. package/bin/lib/Image/ExifTool/ID3.pm +39 -33
  21. package/bin/lib/Image/ExifTool/InDesign.pm +8 -4
  22. package/bin/lib/Image/ExifTool/Jpeg2000.pm +0 -1
  23. package/bin/lib/Image/ExifTool/Lang/de.pm +2 -2
  24. package/bin/lib/Image/ExifTool/Matroska.pm +66 -10
  25. package/bin/lib/Image/ExifTool/MinoltaRaw.pm +2 -2
  26. package/bin/lib/Image/ExifTool/Nikon.pm +36 -2
  27. package/bin/lib/Image/ExifTool/Olympus.pm +27 -17
  28. package/bin/lib/Image/ExifTool/PNG.pm +10 -2
  29. package/bin/lib/Image/ExifTool/Panasonic.pm +1 -0
  30. package/bin/lib/Image/ExifTool/PanasonicRaw.pm +1 -0
  31. package/bin/lib/Image/ExifTool/Pentax.pm +80 -14
  32. package/bin/lib/Image/ExifTool/QuickTime.pm +58 -13
  33. package/bin/lib/Image/ExifTool/QuickTimeStream.pl +111 -8
  34. package/bin/lib/Image/ExifTool/RIFF.pm +20 -10
  35. package/bin/lib/Image/ExifTool/Samsung.pm +56 -19
  36. package/bin/lib/Image/ExifTool/Sony.pm +21 -11
  37. package/bin/lib/Image/ExifTool/TagLookup.pm +6808 -6788
  38. package/bin/lib/Image/ExifTool/TagNames.pod +120 -55
  39. package/bin/lib/Image/ExifTool/WriteIPTC.pl +1 -1
  40. package/bin/lib/Image/ExifTool/WriteQuickTime.pl +84 -15
  41. package/bin/lib/Image/ExifTool/Writer.pl +7 -4
  42. package/bin/lib/Image/ExifTool/XMP.pm +8 -8
  43. package/bin/lib/Image/ExifTool/XMP2.pl +51 -30
  44. package/bin/lib/Image/ExifTool/ZIP.pm +8 -4
  45. package/bin/lib/Image/ExifTool.pm +65 -42
  46. package/bin/lib/Image/ExifTool.pod +28 -20
  47. package/bin/perl-Image-ExifTool.spec +1 -1
  48. package/bin/pp_build_exe.args +4 -4
  49. package/package.json +3 -3
package/bin/Changes CHANGED
@@ -7,6 +7,89 @@ RSS feed: https://exiftool.org/rss.xml
7
7
  Note: The most recent production release is Version 12.76. (Other versions are
8
8
  considered development releases, and are not uploaded to MetaCPAN.)
9
9
 
10
+ July 24, 2024 - Version 12.91
11
+
12
+ - Fixed 2 test files that were causing failed tests (ExifTool itself is
13
+ unchanged)
14
+
15
+ July 24, 2024 - Version 12.90
16
+
17
+ - Added support for reading Samsung trailer from PNG images
18
+ - Decode two more formats of timed GPS from MP4 videos
19
+ - Decode a few more Samung trailer tags (thanks Neal Krawetz)
20
+ - Decode Canon AntiFlicker tag
21
+ - Drop Nikon ShotInfo record when copying MakerNotes from NEF to JPG if it is
22
+ larger than 50000 bytes (then MakerNotes would be too large for a single
23
+ JPEG segment)
24
+ - Changed exiftool shebang from "#!/usr/bin/perl" to "#!/usr/bin/env perl"
25
+ - Revert change of 12.84 to iterate through sub-documents with the -p option
26
+ only if -ee is used
27
+
28
+ July 12, 2024 - Version 12.89
29
+
30
+ - Added new Sony lenses and updated decoding of some tags (thanks Jos Roost)
31
+ - Minor change to description of NKA files
32
+ - Fixed Archive::Zip problem in Windows executable version
33
+
34
+ July 11, 2024 - Version 12.88 - "New Windows/MacOS packages"
35
+
36
+ - NOTE: The install procedure for the Windows executable has changed!
37
+ - Windows EXE version now uses Oliver Betz's bundle with Strawberry Perl and
38
+ comes in 32- and 64-bit versions
39
+ - MacOS distribution now uses a flattened package
40
+ - Added ability to read/write deflate-compressed XMP in HEIC files
41
+ - Added a new Canon LensType (thanks Norbert Wasser)
42
+ - Added a new XMP-GCamera tag (thanks Herb)
43
+ - Added a new Nikon LensID
44
+ - Added a few new Canon AFAreaMode values (thanks Wernfried)
45
+ - Added config_files/onone.config to the distribution
46
+ - Decode timed accelerometer readings from NextBase 622GW videos
47
+ - Decode Pentax K-3III CameraOrentation (thanks Peter)
48
+ - Improved German translation for LensModel
49
+ - Enhanced the API StructFormat JSONQ setting to quote all JSON values, even
50
+ if they aren't in a structure
51
+ - Changed -geolocate option so specifying the Keys group writes
52
+ Keys:GPSPosition only if an input city is specified, and Keys:LocationName
53
+ only for input GPS coordinates
54
+ - Tweaked API Geolocation option recognized space-separated lat/lon even when
55
+ there is no decimal point in the numbers
56
+ - API Changes:
57
+ - Changed LargeFileSupport default to 2 and added a warning if a large
58
+ chunk is encountered. Set to 1 to avoid the warning.
59
+
60
+ June 13, 2024 - Version 12.87
61
+
62
+ - Added ability to write Google Container XMP tags (using the namespace prefix
63
+ 'GContainer' to avoid conflict with the Google Device Container prefix)
64
+ - Decode a few new tags for the Canon EOS R5 (thanks John Moyer)
65
+ - Decode battery information for the Pentax K-3 III (thanks Peter)
66
+ - Decode RAFCompression from FujiFilm RAF images (thanks Albert Shan)
67
+ - Avoid reporting FileSize for pipes
68
+ - Updated Geolocation databases from current geonames.org files
69
+ - Enhanced Geolocation feature to allow lat/lon to be input with a space
70
+ separator instead of a comma
71
+ - Skip over Matroska Cluster if necessary to read Tags when referenced from
72
+ SeekHead
73
+ - Changed conversion for Matroska SeekID (now in hex with tag name in
74
+ brackets) and SeekPosition (now returns an absolute offset)
75
+ - Fixed problem writing XMP-Device:EarthPos coordinates
76
+ - Fixed typo in a value of Canon:DigitalLensOptimizer (thanks Martin B.)
77
+ - Fixed decoding of Matroska VideoScanType
78
+ - Fixed misleading error message when -o option was used to write to an
79
+ unsupported file type
80
+
81
+ June 7, 2024 - Version 12.86
82
+
83
+ - Added a new value for a couple of Olympus tags (thanks Herb)
84
+ - Improved handling of ID3 user-defined tags
85
+ - Decode all JPEG segments from RICO box in Ricoh MOV videos
86
+ - Decode a few new values for some tags written by Canon EOS R cameras (thanks
87
+ John Moyer and Martin B.)
88
+ - Patched some Olympus WB_RBLevels tags to allow 4 values to be written as per
89
+ some newer models
90
+ - Fixed issue when writing IPTC date tags with a date/time value containing
91
+ subseconds with 4 or more digits
92
+
10
93
  May 21, 2024 - Version 12.85
11
94
 
12
95
  - Added GeolocationFeatureType tag
@@ -36,6 +119,10 @@ Apr. 23, 2024 - Version 12.84
36
119
  - Decode a few more Apple tags and a new CanonVRD tag
37
120
  - Enhanced Geolocation feature with the ability to return any number of nearby
38
121
  cities
122
+ - Allow coordinates to be entered without comma separator for the Geolocation
123
+ feature as long as both coordinates have a decimal point
124
+ - Changed -p option to iterate through sub-documents if they exist even if -ee
125
+ isn't used
39
126
  - Fixed long-standing bug in Windows version that didn't properly handle dates
40
127
  older than 50 years when writing FileModifyDate or FileCreateDate
41
128
  - Fixed API TimeZone option to work in Windows
package/bin/MANIFEST CHANGED
@@ -28,6 +28,7 @@ config_files/frameCount.config
28
28
  config_files/gps2utm.config
29
29
  config_files/guano.config
30
30
  config_files/nksc.config
31
+ config_files/onone.config
31
32
  config_files/photoshop_paths.config
32
33
  config_files/picasa_faces.config
33
34
  config_files/pix4d.config
package/bin/META.json CHANGED
@@ -50,5 +50,5 @@
50
50
  }
51
51
  },
52
52
  "release_status" : "stable",
53
- "version" : "12.85"
53
+ "version" : "12.91"
54
54
  }
package/bin/META.yml CHANGED
@@ -3,32 +3,32 @@ abstract: 'Read and write meta information'
3
3
  author:
4
4
  - 'Phil Harvey (philharvey66 at gmail.com)'
5
5
  build_requires:
6
- ExtUtils::MakeMaker: 0
6
+ ExtUtils::MakeMaker: '0'
7
7
  configure_requires:
8
- ExtUtils::MakeMaker: 0
8
+ ExtUtils::MakeMaker: '0'
9
9
  dynamic_config: 0
10
10
  generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.143240, CPAN::Meta::Converter version 2.133380'
11
11
  license: perl
12
12
  meta-spec:
13
13
  url: http://module-build.sourceforge.net/META-spec-v1.4.html
14
- version: 1.4
14
+ version: '1.4'
15
15
  name: Image-ExifTool
16
16
  no_index:
17
17
  directory:
18
18
  - t
19
19
  - inc
20
20
  recommends:
21
- Archive::Zip: 0
22
- Compress::Raw::Lzma: 0
23
- Compress::Zlib: 0
24
- Digest::MD5: 0
25
- Digest::SHA: 0
26
- IO::Compress::Brotli: 0
27
- IO::Compress::RawDeflate: 0
28
- IO::Uncompress::Brotli: 0
29
- IO::Uncompress::RawInflate: 0
30
- POSIX::strptime: 0
31
- Time::HiRes: 0
21
+ Archive::Zip: '0'
22
+ Compress::Raw::Lzma: '0'
23
+ Compress::Zlib: '0'
24
+ Digest::MD5: '0'
25
+ Digest::SHA: '0'
26
+ IO::Compress::Brotli: '0'
27
+ IO::Compress::RawDeflate: '0'
28
+ IO::Uncompress::Brotli: '0'
29
+ IO::Uncompress::RawInflate: '0'
30
+ POSIX::strptime: '0'
31
+ Time::HiRes: '0'
32
32
  requires:
33
- perl: 5.004
34
- version: 12.85
33
+ perl: '5.004'
34
+ version: '12.91'
package/bin/README CHANGED
@@ -109,8 +109,8 @@ your home directory, then you would type the following commands in a
109
109
  terminal window to extract and run ExifTool:
110
110
 
111
111
  cd ~/Desktop
112
- gzip -dc Image-ExifTool-12.85.tar.gz | tar -xf -
113
- cd Image-ExifTool-12.85
112
+ gzip -dc Image-ExifTool-12.91.tar.gz | tar -xf -
113
+ cd Image-ExifTool-12.91
114
114
  ./exiftool t/images/ExifTool.jpg
115
115
 
116
116
  Note: These commands extract meta information from one of the test images.
@@ -209,6 +209,7 @@ distribution package:
209
209
  gps2utm.config - Generate UTM coordinate tags from GPS info
210
210
  guano.config - Decode individual tags from Guano metadata
211
211
  nksc.config - Decode tags in Nikon ViewNX NKSC files
212
+ onone.config - Definitions for writing On1 XMP tags
212
213
  photoshop_paths.config - For extracting or copying Photoshop paths
213
214
  picasa_faces.config - Convert from Picasa to MWG/MP face regions
214
215
  pix4d.config - Definitions for writing Pix4D XMP tags
@@ -1,4 +1,4 @@
1
- #!/usr/bin/perl -w
1
+ #!/usr/bin/env perl
2
2
  #-------------------------------------------------------------------------------
3
3
  # File: build_geolocation
4
4
  #
@@ -15,6 +15,7 @@
15
15
  # 2024-04-24 - PH Fixed problem with population exponent when run
16
16
  # under ActivePerl
17
17
  # 2024-04-29 - PH Added feature types and default to db v1.03
18
+ # 2024-06-13 - PH Tweaked case of imported feature types
18
19
  #
19
20
  # Notes: Requires these files from https://download.geonames.org/export/
20
21
  #
@@ -208,8 +209,9 @@ Syntax: build_geolocation [OPTIONS] [DBFILE] ...
208
209
  Options:
209
210
  DBFILE - Input database file name or directory. Multiple input database
210
211
  files may be specified. The -p, -c and -cp options apply to
211
- the database that comes after them on the command line.
212
- Default is "$dbFile".
212
+ the database that comes after them on the command line. The
213
+ other input files are assumed to be in the same directory as
214
+ the first database file. Default is "$dbFile".
213
215
  -p POP - Minimum population for cities to include. POP may be a number
214
216
  or be of the form "CC[,C2...]=###" to set different limits for
215
217
  specific countries/regions, where CC and C2 are country codes
@@ -250,7 +252,7 @@ Input files (download from https://download.geonames.org/export/dump/):
250
252
  $countryFile - mandatory country names file
251
253
  $regionFile - mandatory region names file
252
254
  $admin2File - mandatory subregion names file
253
- $featureFile - optional feature codes file
255
+ $featureFile - optional feature codes file(s)
254
256
  $altNamesFile - optional alternate names file (must exist to
255
257
  to generate $outAltNames and $geoLang files)
256
258
 
@@ -478,6 +480,7 @@ if (open INFILE, '<', "$dbdir/$featureFile") {
478
480
  next unless $featureCodes{$items[0]};
479
481
  my $name = ucfirst $items[1];
480
482
  $name =~ s/ ([a-z])/ \U$1/g;
483
+ $name =~ s/(.)\b(Of|Or|A|An|On|In|The|By|For|And)\b/$1\L$2/g;
481
484
  $featureNames{$items[0]} = $name;
482
485
  }
483
486
  close INFILE;
@@ -4,19 +4,18 @@
4
4
  #
5
5
  # Syntax: build_tag_lookup [-p] [-v]
6
6
  #
7
- # Options: -p - preserve existing revision date in html files
7
+ # Options: -c - check dates and only build if necessary
8
+ # -p - preserve existing revision date in html files
8
9
  # -v - verbose mode
9
10
  #
10
11
  # Created: 12/31/04 - P. Harvey
11
12
  #
12
13
  use strict;
13
14
 
14
- print "Building tag lookup...\n";
15
-
16
15
  my $file = 'lib/Image/ExifTool/TagLookup.pm';
17
16
  my $podFile = 'lib/Image/ExifTool/TagNames.pod';
18
17
  my $htmldir = 'html';
19
- my $verbose;
18
+ my ($verbose, $check, $preserve);
20
19
 
21
20
  BEGIN {
22
21
  # get exe directory (and change to forward slashes)
@@ -25,22 +24,39 @@ BEGIN {
25
24
  unshift @INC, "$exeDir/lib";
26
25
  }
27
26
 
28
- require Image::ExifTool::BuildTagLookup;
29
-
30
- my $builder = new Image::ExifTool::BuildTagLookup;
31
-
32
27
  foreach (@ARGV) {
33
28
  if ($_ eq '-p') {
34
- $$builder{PRESERVE_DATE} = 1;
35
- print("(preserving revision dates)\n");
36
- next;
29
+ $preserve = 1;
37
30
  } elsif ($_ eq '-v') {
38
31
  $verbose = 1;
32
+ } elsif ($_ eq '-c') {
33
+ $check = 1;
39
34
  } else {
40
35
  die "Unknown option '$_'\n";
41
36
  }
42
37
  }
43
38
 
39
+ if ($check and -e '.built_tag_lookup') {
40
+ # find most recent .p? file
41
+ my $latest = 1e6;
42
+ $latest > -M and $latest = -M foreach <lib/Image/ExifTool/*.p?>;
43
+ if ($latest > -M '.built_tag_lookup') {
44
+ print "Tag Lookup is up-to-date\n";
45
+ exit 0;
46
+ }
47
+ }
48
+
49
+ print "Building tag lookup...\n";
50
+
51
+ require Image::ExifTool::BuildTagLookup;
52
+
53
+ my $builder = new Image::ExifTool::BuildTagLookup;
54
+
55
+ if ($preserve) {
56
+ $$builder{PRESERVE_DATE} = 1;
57
+ print("(preserving revision dates)\n");
58
+ }
59
+
44
60
  my $count = $builder->{COUNT};
45
61
  foreach (sort keys %$count) {
46
62
  printf "%5d %s\n", $$count{$_}, $_;
@@ -78,6 +94,8 @@ if ($diff > $same) {
78
94
  printf "%5d HTML files changed\n", $diff;
79
95
  }
80
96
 
97
+ system 'echo `date` > .built_tag_lookup';
98
+
81
99
  exit(0);
82
100
 
83
101
  # end
@@ -293,6 +293,11 @@
293
293
  NewXMPxxxStructX => { Name => 'SomeOtherName', Flat => 1 },
294
294
  );
295
295
 
296
+ # the namespace may be registered so ExifTool generates the expected family 1
297
+ # group names when reading if the UserDefined namespace uses a different prefix
298
+ require Image::ExifTool::XMP;
299
+ Image::ExifTool::XMP::RegisterNamespace(\%Image::ExifTool::UserDefined::xxx);
300
+
296
301
  # Adding a new MIE group requires a few extra definitions
297
302
  use Image::ExifTool::MIE;
298
303
  %Image::ExifTool::UserDefined::MIETest = (
@@ -0,0 +1,28 @@
1
+ #------------------------------------------------------------------------------
2
+ # File: onone.config
3
+ #
4
+ # Description: This config file defines On1 XMP tags for writing.
5
+ #
6
+ # Usage: exiftool -config onone.config -UserFlag=VALUE FILE ...
7
+ #
8
+ # Requires: ExifTool version 10.28 or later
9
+ #
10
+ # Revisions: 2024/07/10 - P. Harvey Created
11
+ #------------------------------------------------------------------------------
12
+
13
+ %Image::ExifTool::UserDefined = (
14
+ 'Image::ExifTool::XMP::Main' => {
15
+ onone => {
16
+ SubDirectory => { TagTable => 'Image::ExifTool::UserDefined::onone' },
17
+ },
18
+ },
19
+ );
20
+
21
+ %Image::ExifTool::UserDefined::onone = (
22
+ GROUPS => { 0 => 'XMP', 1 => 'XMP-onone', 2 => 'Other' },
23
+ NAMESPACE => { 'onone' => 'http://www.ononesoftware.com/vcb/1.0/' },
24
+ WRITABLE => 'string',
25
+ UserFlag => { },
26
+ );
27
+
28
+ 1; #end
package/bin/exiftool CHANGED
@@ -1,4 +1,4 @@
1
- #!/usr/bin/perl -w
1
+ #!/usr/bin/env perl
2
2
  #------------------------------------------------------------------------------
3
3
  # File: exiftool
4
4
  #
@@ -11,7 +11,7 @@ use strict;
11
11
  use warnings;
12
12
  require 5.004;
13
13
 
14
- my $version = '12.85';
14
+ my $version = '12.91';
15
15
 
16
16
  # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
17
17
  my $exePath;
@@ -51,7 +51,7 @@ sub CleanXML($);
51
51
  sub EncodeXML($);
52
52
  sub FormatXML($$$);
53
53
  sub EscapeJSON($;$);
54
- sub FormatJSON($$$);
54
+ sub FormatJSON($$$;$);
55
55
  sub PrintCSV();
56
56
  sub AddGroups($$$$);
57
57
  sub ConvertBinary($);
@@ -1802,7 +1802,12 @@ if ($outOpt) {
1802
1802
  my $type = GetFileType($outOpt);
1803
1803
  if ($type) {
1804
1804
  # (must test original file name because we can write .webp but not other RIFF types)
1805
- unless (CanWrite($outOpt)) {
1805
+ my $canWrite = CanWrite($outOpt);
1806
+ unless ($canWrite) {
1807
+ if (defined $canWrite and $canWrite eq '') {
1808
+ $type = Image::ExifTool::GetFileExtension($outOpt);
1809
+ $type = uc($outOpt) unless defined $type;
1810
+ }
1806
1811
  Warn "Can't write $type files\n";
1807
1812
  $rtnVal = 1;
1808
1813
  next;
@@ -2305,8 +2310,8 @@ sub GetImageInfo($$)
2305
2310
  # output using print format file (-p) option
2306
2311
  my ($type, $doc, $grp, $lastDoc, $cache);
2307
2312
  $fileTrailer = '';
2308
- # repeat for each sub-document if necessary
2309
- if ($$et{DOC_COUNT}) {
2313
+ # repeat for each embedded document if necessary (only if -ee used)
2314
+ if ($et->Options('ExtractEmbedded')) {
2310
2315
  # (cache tag keys if there are sub-documents)
2311
2316
  $lastDoc = $$et{DOC_COUNT} and $cache = { };
2312
2317
  } else {
@@ -2366,7 +2371,7 @@ sub GetImageInfo($$)
2366
2371
  my $errs = $et->GetInfo('Warning', 'Error');
2367
2372
  PrintErrors($et, $errs, $file) and EFile($file);
2368
2373
  } elsif (not $disableOutput) {
2369
- my ($tag, $line, %noDups, %csvInfo, $bra, $ket, $sep);
2374
+ my ($tag, $line, %noDups, %csvInfo, $bra, $ket, $sep, $quote);
2370
2375
  if ($fp) {
2371
2376
  # print file header (only once)
2372
2377
  if ($fileHeader) {
@@ -2409,6 +2414,7 @@ sub GetImageInfo($$)
2409
2414
  } elsif ($json) {
2410
2415
  # set delimiters for JSON or PHP output
2411
2416
  ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
2417
+ $quote = 1 if $$et{OPTIONS}{StructFormat} and $$et{OPTIONS}{StructFormat} eq 'JSONQ';
2412
2418
  print $fp ",\n" if $comma;
2413
2419
  print $fp qq($bra\n "SourceFile"$sep ), EscapeJSON(MyConvertFileName($et,$file),1);
2414
2420
  $comma = 1;
@@ -2702,7 +2708,7 @@ TAG: foreach $tag (@foundTags) {
2702
2708
  }
2703
2709
  }
2704
2710
  }
2705
- FormatJSON($fp, $val, $ind);
2711
+ FormatJSON($fp, $val, $ind, $quote);
2706
2712
  $comma = 1;
2707
2713
  next;
2708
2714
  }
@@ -3494,17 +3500,17 @@ sub EscapeJSON($;$)
3494
3500
 
3495
3501
  #------------------------------------------------------------------------------
3496
3502
  # Print JSON or PHP value
3497
- # Inputs: 0) file reference, 1) value, 2) indentation
3498
- sub FormatJSON($$$)
3503
+ # Inputs: 0) file reference, 1) value, 2) indentation, 3) true to quote numbers
3504
+ sub FormatJSON($$$;$)
3499
3505
  {
3500
3506
  local $_;
3501
- my ($fp, $val, $ind) = @_;
3507
+ my ($fp, $val, $ind, $quote) = @_;
3502
3508
  my $comma;
3503
3509
  if (not ref $val) {
3504
- print $fp EscapeJSON($val);
3510
+ print $fp EscapeJSON($val, $quote);
3505
3511
  } elsif (ref $val eq 'ARRAY') {
3506
3512
  if ($joinLists and not ref $$val[0]) {
3507
- print $fp EscapeJSON(join $listSep, @$val);
3513
+ print $fp EscapeJSON(join($listSep, @$val), $quote);
3508
3514
  } else {
3509
3515
  my ($bra, $ket) = $json == 1 ? ('[',']') : ('Array(',')');
3510
3516
  print $fp $bra;
@@ -5678,7 +5684,7 @@ with this command:
5678
5684
 
5679
5685
  produces output like this:
5680
5686
 
5681
- -- Generated by ExifTool 12.85 --
5687
+ -- Generated by ExifTool 12.91 --
5682
5688
  File: a.jpg - 2003:10:31 15:44:19
5683
5689
  (f/5.6, 1/60s, ISO 100)
5684
5690
  File: b.jpg - 2006:05:23 11:57:38
@@ -6119,7 +6125,9 @@ B<-if> and B<-fileOrder> options for details.
6119
6125
  =item B<-fileOrder>[I<NUM>] [-]I<TAG>
6120
6126
 
6121
6127
  Set file processing order according to the sorted value of the specified
6122
- I<TAG>. For example, to process files in order of date:
6128
+ I<TAG>. Without this option, files are processed in the order returned by
6129
+ the system, which is commonly by file name, but this is filesystem
6130
+ dependent. For example, to process files in order of date:
6123
6131
 
6124
6132
  exiftool -fileOrder DateTimeOriginal DIR
6125
6133
 
@@ -18,7 +18,7 @@ use vars qw($VERSION);
18
18
  use Image::ExifTool qw(:DataAccess :Utils);
19
19
  use Image::ExifTool::ID3;
20
20
 
21
- $VERSION = '1.12';
21
+ $VERSION = '1.13';
22
22
 
23
23
  # information for time/date-based tags (time zero is Jan 1, 1904)
24
24
  my %timeInfo = (
@@ -226,9 +226,13 @@ sub ProcessAIFF($$)
226
226
  # AIFF chunks are padded to an even number of bytes
227
227
  my $len2 = $len + ($len & 0x01);
228
228
  if ($len2 > 100000000) {
229
- if ($len2 >= 0x80000000 and not $et->Options('LargeFileSupport')) {
230
- $et->Warn('End of processing at large chunk (LargeFileSupport not enabled)');
231
- last;
229
+ if ($len2 >= 0x80000000) {
230
+ if (not $et->Options('LargeFileSupport')) {
231
+ $et->Warn('End of processing at large chunk (LargeFileSupport not enabled)');
232
+ last;
233
+ } elsif ($et->Options('LargeFileSupport') eq '2') {
234
+ $et->WarnOnce('Skipping large chunk (LargeFileSupport is 2)');
235
+ }
232
236
  }
233
237
  if ($tagInfo) {
234
238
  $et->Warn("Skipping large $$tagInfo{Name} chunk (> 100 MB)");
@@ -17,7 +17,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
17
17
  use Image::ExifTool::Exif;
18
18
  use Image::ExifTool::RIFF;
19
19
 
20
- $VERSION = '1.25';
20
+ $VERSION = '1.26';
21
21
 
22
22
  sub ProcessASF($$;$);
23
23
  sub ProcessContentDescription($$$);
@@ -780,6 +780,9 @@ sub ProcessASF($$;$)
780
780
  if ($size > 0x7fffffff * 4294967296) {
781
781
  $err = 'Invalid ASF object size';
782
782
  } elsif ($et->Options('LargeFileSupport')) {
783
+ if ($et->Options('LargeFileSupport') eq '2') {
784
+ $et->WarnOnce('Skipping large ASF object (LargeFileSupport is 2)');
785
+ }
783
786
  if ($raf->Seek($size, 1)) {
784
787
  $et->VPrint(0, " Skipped large ASF object ($size bytes)\n");
785
788
  $pos += $size;
@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
35
35
  use Image::ExifTool::Validate;
36
36
  use Image::ExifTool::MacOS;
37
37
 
38
- $VERSION = '3.56';
38
+ $VERSION = '3.58';
39
39
  @ISA = qw(Exporter);
40
40
 
41
41
  sub NumbersFirst($$);
@@ -98,6 +98,8 @@ my %tweakOrder = (
98
98
  GIMP => 'Microsoft',
99
99
  DarwinCore => 'AFCP',
100
100
  MWG => 'Shortcuts',
101
+ 'FujiFilm::RAF' => 'FujiFilm::RAFHeader',
102
+ 'FujiFilm::RAFData' => 'FujiFilm::RAF',
101
103
  );
102
104
 
103
105
  # list of all recognized Format strings
@@ -423,11 +425,11 @@ parameters, as well as proprietary information written by many camera
423
425
  models. Tags with a question mark after their name are not extracted unless
424
426
  the L<Unknown|../ExifTool.html#Unknown> option is set.
425
427
 
426
- When writing, ExifTool creates both QuickTime and XMP tags by default, but
427
- the group may be specified to write one or the other separately. If no
428
- location is specified, newly created QuickTime tags are added in the
429
- L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> location if
430
- possible, otherwise in
428
+ When writing video files, ExifTool creates both QuickTime and XMP tags by
429
+ default, but the group may be specified to write one or the other
430
+ separately. If no location is specified, newly created QuickTime tags are
431
+ added in the L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags>
432
+ location if possible, otherwise in
431
433
  L<UserData|Image::ExifTool::TagNames/QuickTime UserData Tags>, and
432
434
  finally in L<Keys|Image::ExifTool::TagNames/QuickTime Keys Tags>,
433
435
  but this order may be changed by setting the PREFERRED level of the
@@ -478,7 +480,7 @@ the original size by padding with nulls if necessary.
478
480
 
479
481
  See
480
482
  L<https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/>
481
- for the official specification.
483
+ for the official QuickTime specification.
482
484
  },
483
485
  Photoshop => q{
484
486
  Photoshop tags are found in PSD and PSB files, as well as inside embedded
@@ -600,7 +602,8 @@ running ExifTool the old information may be removed permanently using the
600
602
  DNG => q{
601
603
  The main DNG tags are found in the EXIF table. The tables below define only
602
604
  information found within structures of these main DNG tag values. See
603
- L<http://www.adobe.com/products/dng/> for the official DNG specification.
605
+ L<https://helpx.adobe.com/camera-raw/digital-negative.html> for the official
606
+ DNG specification.
604
607
  },
605
608
  MPEG => q{
606
609
  The MPEG format doesn't specify any file-level meta information. In lieu of
@@ -905,6 +908,9 @@ TagID: foreach $tagID (@keys) {
905
908
  @infoArray = GetTagInfoList($table,$tagID);
906
909
  }
907
910
  foreach $tagInfo (@infoArray) {
911
+ if ($binaryTable and $$tagInfo{Writable} and $$tagInfo{Writable} ne '1') {
912
+ warn("$tableName $$tagInfo{Name} Writable should be 1, not $$tagInfo{Writable}\n");
913
+ }
908
914
  my $name = $$tagInfo{Name};
909
915
  if ($$tagInfo{WritePseudo}) {
910
916
  push @writePseudo, $name;