exiftool-vendored.exe 12.62.0 → 12.67.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 (52) hide show
  1. package/LICENSE +254 -254
  2. package/bin/exiftool_files/Changes +96 -1
  3. package/bin/exiftool_files/Makefile.PL +7 -1
  4. package/bin/exiftool_files/README +50 -46
  5. package/bin/exiftool_files/config_files/guano.config +161 -0
  6. package/bin/exiftool_files/exiftool.pl +113 -78
  7. package/bin/exiftool_files/lib/Image/ExifTool/7Z.pm +793 -0
  8. package/bin/exiftool_files/lib/Image/ExifTool/Apple.pm +19 -8
  9. package/bin/exiftool_files/lib/Image/ExifTool/BigTIFF.pm +8 -1
  10. package/bin/exiftool_files/lib/Image/ExifTool/Canon.pm +33 -12
  11. package/bin/exiftool_files/lib/Image/ExifTool/CanonRaw.pm +4 -4
  12. package/bin/exiftool_files/lib/Image/ExifTool/CanonVRD.pm +4 -1
  13. package/bin/exiftool_files/lib/Image/ExifTool/Exif.pm +31 -14
  14. package/bin/exiftool_files/lib/Image/ExifTool/FlashPix.pm +8 -2
  15. package/bin/exiftool_files/lib/Image/ExifTool/FujiFilm.pm +6 -3
  16. package/bin/exiftool_files/lib/Image/ExifTool/GPS.pm +5 -2
  17. package/bin/exiftool_files/lib/Image/ExifTool/Geotag.pm +5 -2
  18. package/bin/exiftool_files/lib/Image/ExifTool/Jpeg2000.pm +226 -28
  19. package/bin/exiftool_files/lib/Image/ExifTool/Lang/fr.pm +1467 -202
  20. package/bin/exiftool_files/lib/Image/ExifTool/MPF.pm +2 -1
  21. package/bin/exiftool_files/lib/Image/ExifTool/Matroska.pm +16 -1
  22. package/bin/exiftool_files/lib/Image/ExifTool/MinoltaRaw.pm +2 -2
  23. package/bin/exiftool_files/lib/Image/ExifTool/Nikon.pm +948 -31
  24. package/bin/exiftool_files/lib/Image/ExifTool/NikonCustom.pm +874 -63
  25. package/bin/exiftool_files/lib/Image/ExifTool/PDF.pm +23 -5
  26. package/bin/exiftool_files/lib/Image/ExifTool/PLIST.pm +8 -1
  27. package/bin/exiftool_files/lib/Image/ExifTool/PLUS.pm +19 -4
  28. package/bin/exiftool_files/lib/Image/ExifTool/PNG.pm +6 -6
  29. package/bin/exiftool_files/lib/Image/ExifTool/Pentax.pm +3 -1
  30. package/bin/exiftool_files/lib/Image/ExifTool/PhaseOne.pm +5 -5
  31. package/bin/exiftool_files/lib/Image/ExifTool/QuickTime.pm +91 -30
  32. package/bin/exiftool_files/lib/Image/ExifTool/QuickTimeStream.pl +20 -19
  33. package/bin/exiftool_files/lib/Image/ExifTool/README +2 -2
  34. package/bin/exiftool_files/lib/Image/ExifTool/RIFF.pm +11 -9
  35. package/bin/exiftool_files/lib/Image/ExifTool/Samsung.pm +227 -227
  36. package/bin/exiftool_files/lib/Image/ExifTool/Shortcuts.pm +2 -1
  37. package/bin/exiftool_files/lib/Image/ExifTool/SigmaRaw.pm +4 -4
  38. package/bin/exiftool_files/lib/Image/ExifTool/Sony.pm +229 -30
  39. package/bin/exiftool_files/lib/Image/ExifTool/TagLookup.pm +4758 -4633
  40. package/bin/exiftool_files/lib/Image/ExifTool/TagNames.pod +715 -23
  41. package/bin/exiftool_files/lib/Image/ExifTool/Validate.pm +17 -1
  42. package/bin/exiftool_files/lib/Image/ExifTool/WriteExif.pl +9 -7
  43. package/bin/exiftool_files/lib/Image/ExifTool/WriteQuickTime.pl +21 -9
  44. package/bin/exiftool_files/lib/Image/ExifTool/WriteXMP.pl +2 -2
  45. package/bin/exiftool_files/lib/Image/ExifTool/Writer.pl +36 -12
  46. package/bin/exiftool_files/lib/Image/ExifTool/XMP.pm +14 -2
  47. package/bin/exiftool_files/lib/Image/ExifTool/XMP2.pl +33 -1
  48. package/bin/exiftool_files/lib/Image/ExifTool/XMPStruct.pl +96 -28
  49. package/bin/exiftool_files/lib/Image/ExifTool/ZIP.pm +5 -5
  50. package/bin/exiftool_files/lib/Image/ExifTool.pm +184 -132
  51. package/bin/exiftool_files/lib/Image/ExifTool.pod +124 -58
  52. package/package.json +3 -2
@@ -412,7 +412,7 @@ numerical, and generated automatically otherwise.
412
412
  'IsComposite' - flag set for Composite tags
413
413
 
414
414
  'IsImageData' - flag set if this is an image data offset to
415
- be included in ImageDataMD5 calculation. Must have an
415
+ be included in ImageDataHash calculation. Must have an
416
416
  OffsetPair entry which is the ID of the corresponding size.
417
417
 
418
418
  'IsOffset' - flag set if the tag represents an offset to some
@@ -637,7 +637,7 @@ numerical, and generated automatically otherwise.
637
637
  RawConv instead to return undef if it is necessary to test the
638
638
  value for validity, otherwise an undef tag may hide a
639
639
  previously defined value when the Duplicates option is not
640
- enabled. If this isn't possible (as with Composite tags where
640
+ enabled. If this isn't possible (as with Composite tags where
641
641
  the converted values of the source tags are needed), set the
642
642
  Priority to 0 to avoid taking priority over a valid tag. If
643
643
  ValueConv is not specified, the Raw value is not converted.
@@ -30,7 +30,7 @@ use strict;
30
30
  use vars qw($VERSION $AUTOLOAD);
31
31
  use Image::ExifTool qw(:DataAccess :Utils);
32
32
 
33
- $VERSION = '1.64';
33
+ $VERSION = '1.65';
34
34
 
35
35
  sub ConvertTimecode($);
36
36
  sub ProcessSGLT($$$);
@@ -38,7 +38,7 @@ sub ProcessSLLT($$$);
38
38
  sub ProcessLucas($$$);
39
39
  sub WriteRIFF($$);
40
40
 
41
- # RIFF chunks containing image data (to include in ImageDataMD5 digest)
41
+ # RIFF chunks containing image data (to include in ImageDataHash digest)
42
42
  my %isImageData = (
43
43
  LIST_movi => 1, # (AVI: contains ##db, ##dc, ##wb)
44
44
  data => 1, # (WAV)
@@ -652,6 +652,7 @@ my %code2charset = (
652
652
  Name => 'Acidizer',
653
653
  SubDirectory => { TagTable => 'Image::ExifTool::RIFF::Acidizer' },
654
654
  },
655
+ guan => 'Guano', #forum14831
655
656
  );
656
657
 
657
658
  # the maker notes used by some digital cameras
@@ -1987,7 +1988,7 @@ sub ProcessRIFF($$)
1987
1988
  my $unknown = $et->Options('Unknown');
1988
1989
  my $validate = $et->Options('Validate');
1989
1990
  my $ee = $et->Options('ExtractEmbedded');
1990
- my $md5 = $$et{ImageDataMD5};
1991
+ my $hash = $$et{ImageDataHash};
1991
1992
 
1992
1993
  # verify this is a valid RIFF file
1993
1994
  return 0 unless $raf->Read($buff, 12) == 12;
@@ -2045,6 +2046,7 @@ sub ProcessRIFF($$)
2045
2046
  } else {
2046
2047
  next;
2047
2048
  }
2049
+ last;
2048
2050
  }
2049
2051
  # stop when we hit the audio data or AVI index or AVI movie data
2050
2052
  # --> no more because Adobe Bridge stores XMP after this!!
@@ -2067,9 +2069,9 @@ sub ProcessRIFF($$)
2067
2069
  # (in LIST_movi chunk: ##db = uncompressed DIB, ##dc = compressed DIB, ##wb = audio data)
2068
2070
  if ($tagInfo or (($verbose or $unknown) and $tag !~ /^(data|idx1|LIST_movi|RIFF|\d{2}(db|dc|wb))$/)) {
2069
2071
  $raf->Read($buff, $len2) == $len2 or $err=1, last;
2070
- if ($md5 and $isImageData{$tag}) {
2071
- $md5->add($buff);
2072
- $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: '${tag}' chunk, $len2 bytes)\n");
2072
+ if ($hash and $isImageData{$tag}) {
2073
+ $hash->add($buff);
2074
+ $et->VPrint(0, "$$et{INDENT}(ImageDataHash: '${tag}' chunk, $len2 bytes)\n");
2073
2075
  }
2074
2076
  my $setGroups;
2075
2077
  if ($tagInfo and ref $tagInfo eq 'HASH' and $$tagInfo{SetGroups}) {
@@ -2099,10 +2101,10 @@ sub ProcessRIFF($$)
2099
2101
  next; # (must not increment $pos)
2100
2102
  } else {
2101
2103
  my $rewind;
2102
- # do MD5 if required
2103
- if ($md5 and $isImageData{$tag}) {
2104
+ # do hash if required
2105
+ if ($hash and $isImageData{$tag}) {
2104
2106
  $rewind = $raf->Tell();
2105
- $et->ImageDataMD5($raf, $len2, "'${tag}' chunk");
2107
+ $et->ImageDataHash($raf, $len2, "'${tag}' chunk");
2106
2108
  }
2107
2109
  if ($tag eq 'LIST_movi' and $ee) {
2108
2110
  $raf->Seek($rewind, 0) or $err = 1, last if $rewind;
@@ -22,7 +22,7 @@ use vars qw($VERSION %samsungLensTypes);
22
22
  use Image::ExifTool qw(:DataAccess :Utils);
23
23
  use Image::ExifTool::Exif;
24
24
 
25
- $VERSION = '1.53';
25
+ $VERSION = '1.54';
26
26
 
27
27
  sub WriteSTMN($$$);
28
28
  sub ProcessINFO($$$);
@@ -1004,232 +1004,232 @@ my %formatMinMax = (
1004
1004
  Name => 'MCCData',
1005
1005
  Groups => { 2 => 'Location' },
1006
1006
  PrintConv => {
1007
- 202 => 'Greece',
1008
- 204 => 'Netherlands',
1009
- 206 => 'Belgium',
1010
- 208 => 'France',
1011
- 212 => 'Monaco',
1012
- 213 => 'Andorra',
1013
- 214 => 'Spain',
1014
- 216 => 'Hungary',
1015
- 218 => 'Bosnia & Herzegov.',
1016
- 219 => 'Croatia',
1017
- 220 => 'Serbia',
1018
- 221 => 'Kosovo',
1019
- 222 => 'Italy',
1020
- 226 => 'Romania',
1021
- 228 => 'Switzerland',
1022
- 230 => 'Czech Rep.',
1023
- 231 => 'Slovakia',
1024
- 232 => 'Austria',
1025
- 234 => 'United Kingdom',
1026
- 235 => 'United Kingdom',
1027
- 238 => 'Denmark',
1028
- 240 => 'Sweden',
1029
- 242 => 'Norway',
1030
- 244 => 'Finland',
1031
- 246 => 'Lithuania',
1032
- 247 => 'Latvia',
1033
- 248 => 'Estonia',
1034
- 250 => 'Russian Federation',
1035
- 255 => 'Ukraine',
1036
- 257 => 'Belarus',
1037
- 259 => 'Moldova',
1038
- 260 => 'Poland',
1039
- 262 => 'Germany',
1040
- 266 => 'Gibraltar',
1041
- 268 => 'Portugal',
1042
- 270 => 'Luxembourg',
1043
- 272 => 'Ireland',
1044
- 274 => 'Iceland',
1045
- 276 => 'Albania',
1046
- 278 => 'Malta',
1047
- 280 => 'Cyprus',
1048
- 282 => 'Georgia',
1049
- 283 => 'Armenia',
1050
- 284 => 'Bulgaria',
1051
- 286 => 'Turkey',
1052
- 288 => 'Faroe Islands',
1053
- 289 => 'Abkhazia',
1054
- 290 => 'Greenland',
1055
- 292 => 'San Marino',
1056
- 293 => 'Slovenia',
1057
- 294 => 'Macedonia',
1058
- 295 => 'Liechtenstein',
1059
- 297 => 'Montenegro',
1060
- 302 => 'Canada',
1061
- 308 => 'St. Pierre & Miquelon',
1062
- 310 => 'United States / Guam',
1063
- 311 => 'United States / Guam',
1064
- 312 => 'United States',
1065
- 316 => 'United States',
1066
- 330 => 'Puerto Rico',
1067
- 334 => 'Mexico',
1068
- 338 => 'Jamaica',
1069
- 340 => 'French Guiana / Guadeloupe / Martinique',
1070
- 342 => 'Barbados',
1071
- 344 => 'Antigua and Barbuda',
1072
- 346 => 'Cayman Islands',
1073
- 348 => 'British Virgin Islands',
1074
- 350 => 'Bermuda',
1075
- 352 => 'Grenada',
1076
- 354 => 'Montserrat',
1077
- 356 => 'Saint Kitts and Nevis',
1078
- 358 => 'Saint Lucia',
1079
- 360 => 'St. Vincent & Gren.',
1080
- 362 => 'Bonaire, Sint Eustatius and Saba / Curacao / Netherlands Antilles',
1081
- 363 => 'Aruba',
1082
- 364 => 'Bahamas',
1083
- 365 => 'Anguilla',
1084
- 366 => 'Dominica',
1085
- 368 => 'Cuba',
1086
- 370 => 'Dominican Republic',
1087
- 372 => 'Haiti',
1088
- 374 => 'Trinidad and Tobago',
1089
- 376 => 'Turks and Caicos Islands / US Virgin Islands',
1090
- 400 => 'Azerbaijan',
1091
- 401 => 'Kazakhstan',
1092
- 402 => 'Bhutan',
1093
- 404 => 'India',
1094
- 405 => 'India',
1095
- 410 => 'Pakistan',
1096
- 412 => 'Afghanistan',
1097
- 413 => 'Sri Lanka',
1098
- 414 => 'Myanmar (Burma)',
1099
- 415 => 'Lebanon',
1100
- 416 => 'Jordan',
1101
- 417 => 'Syrian Arab Republic',
1102
- 418 => 'Iraq',
1103
- 419 => 'Kuwait',
1104
- 420 => 'Saudi Arabia',
1105
- 421 => 'Yemen',
1106
- 422 => 'Oman',
1107
- 424 => 'United Arab Emirates',
1108
- 425 => 'Israel / Palestinian Territory',
1109
- 426 => 'Bahrain',
1110
- 427 => 'Qatar',
1111
- 428 => 'Mongolia',
1112
- 429 => 'Nepal',
1113
- 430 => 'United Arab Emirates',
1114
- 431 => 'United Arab Emirates',
1115
- 432 => 'Iran',
1116
- 434 => 'Uzbekistan',
1117
- 436 => 'Tajikistan',
1118
- 437 => 'Kyrgyzstan',
1119
- 438 => 'Turkmenistan',
1120
- 440 => 'Japan',
1121
- 441 => 'Japan',
1122
- 450 => 'South Korea',
1123
- 452 => 'Viet Nam',
1124
- 454 => 'Hongkong, China',
1125
- 455 => 'Macao, China',
1126
- 456 => 'Cambodia',
1127
- 457 => 'Laos P.D.R.',
1128
- 460 => 'China',
1129
- 466 => 'Taiwan',
1130
- 467 => 'North Korea',
1131
- 470 => 'Bangladesh',
1132
- 472 => 'Maldives',
1133
- 502 => 'Malaysia',
1134
- 505 => 'Australia',
1135
- 510 => 'Indonesia',
1136
- 514 => 'Timor-Leste',
1137
- 515 => 'Philippines',
1138
- 520 => 'Thailand',
1139
- 525 => 'Singapore',
1140
- 528 => 'Brunei Darussalam',
1141
- 530 => 'New Zealand',
1142
- 537 => 'Papua New Guinea',
1143
- 539 => 'Tonga',
1144
- 540 => 'Solomon Islands',
1145
- 541 => 'Vanuatu',
1146
- 542 => 'Fiji',
1147
- 544 => 'American Samoa',
1148
- 545 => 'Kiribati',
1149
- 546 => 'New Caledonia',
1150
- 547 => 'French Polynesia',
1151
- 548 => 'Cook Islands',
1152
- 549 => 'Samoa',
1153
- 550 => 'Micronesia',
1154
- 552 => 'Palau',
1155
- 553 => 'Tuvalu',
1156
- 555 => 'Niue',
1157
- 602 => 'Egypt',
1158
- 603 => 'Algeria',
1159
- 604 => 'Morocco',
1160
- 605 => 'Tunisia',
1161
- 606 => 'Libya',
1162
- 607 => 'Gambia',
1163
- 608 => 'Senegal',
1164
- 609 => 'Mauritania',
1165
- 610 => 'Mali',
1166
- 611 => 'Guinea',
1167
- 612 => 'Ivory Coast',
1168
- 613 => 'Burkina Faso',
1169
- 614 => 'Niger',
1170
- 615 => 'Togo',
1171
- 616 => 'Benin',
1172
- 617 => 'Mauritius',
1173
- 618 => 'Liberia',
1174
- 619 => 'Sierra Leone',
1175
- 620 => 'Ghana',
1176
- 621 => 'Nigeria',
1177
- 622 => 'Chad',
1178
- 623 => 'Central African Rep.',
1179
- 624 => 'Cameroon',
1180
- 625 => 'Cape Verde',
1181
- 626 => 'Sao Tome & Principe',
1182
- 627 => 'Equatorial Guinea',
1183
- 628 => 'Gabon',
1184
- 629 => 'Congo, Republic',
1185
- 630 => 'Congo, Dem. Rep.',
1186
- 631 => 'Angola',
1187
- 632 => 'Guinea-Bissau',
1188
- 633 => 'Seychelles',
1189
- 634 => 'Sudan',
1190
- 635 => 'Rwanda',
1191
- 636 => 'Ethiopia',
1192
- 637 => 'Somalia',
1193
- 638 => 'Djibouti',
1194
- 639 => 'Kenya',
1195
- 640 => 'Tanzania',
1196
- 641 => 'Uganda',
1197
- 642 => 'Burundi',
1198
- 643 => 'Mozambique',
1199
- 645 => 'Zambia',
1200
- 646 => 'Madagascar',
1201
- 647 => 'Reunion',
1202
- 648 => 'Zimbabwe',
1203
- 649 => 'Namibia',
1204
- 650 => 'Malawi',
1205
- 651 => 'Lesotho',
1206
- 652 => 'Botswana',
1207
- 653 => 'Swaziland',
1208
- 654 => 'Comoros',
1209
- 655 => 'South Africa',
1210
- 657 => 'Eritrea',
1211
- 659 => 'South Sudan',
1212
- 702 => 'Belize',
1213
- 704 => 'Guatemala',
1214
- 706 => 'El Salvador',
1215
- 708 => 'Honduras',
1216
- 710 => 'Nicaragua',
1217
- 712 => 'Costa Rica',
1218
- 714 => 'Panama',
1219
- 716 => 'Peru',
1220
- 722 => 'Argentina Republic',
1221
- 724 => 'Brazil',
1222
- 730 => 'Chile',
1223
- 732 => 'Colombia',
1224
- 734 => 'Venezuela',
1225
- 736 => 'Bolivia',
1226
- 738 => 'Guyana',
1227
- 740 => 'Ecuador',
1228
- 744 => 'Paraguay',
1229
- 746 => 'Suriname',
1230
- 748 => 'Uruguay',
1231
- 750 => 'Falkland Islands (Malvinas)',
1232
- 901 => 'International Networks / Satellite Networks',
1007
+ 202 => 'Greece (202)',
1008
+ 204 => 'Netherlands (204)',
1009
+ 206 => 'Belgium (206)',
1010
+ 208 => 'France (208)',
1011
+ 212 => 'Monaco (212)',
1012
+ 213 => 'Andorra (213)',
1013
+ 214 => 'Spain (214)',
1014
+ 216 => 'Hungary (216)',
1015
+ 218 => 'Bosnia & Herzegov. (218)',
1016
+ 219 => 'Croatia (219)',
1017
+ 220 => 'Serbia (220)',
1018
+ 221 => 'Kosovo (221)',
1019
+ 222 => 'Italy (222)',
1020
+ 226 => 'Romania (226)',
1021
+ 228 => 'Switzerland (228)',
1022
+ 230 => 'Czech Rep. (230)',
1023
+ 231 => 'Slovakia (231)',
1024
+ 232 => 'Austria (232)',
1025
+ 234 => 'United Kingdom (234)',
1026
+ 235 => 'United Kingdom (235)',
1027
+ 238 => 'Denmark (238)',
1028
+ 240 => 'Sweden (240)',
1029
+ 242 => 'Norway (242)',
1030
+ 244 => 'Finland (244)',
1031
+ 246 => 'Lithuania (246)',
1032
+ 247 => 'Latvia (247)',
1033
+ 248 => 'Estonia (248)',
1034
+ 250 => 'Russian Federation (250)',
1035
+ 255 => 'Ukraine (255)',
1036
+ 257 => 'Belarus (257)',
1037
+ 259 => 'Moldova (259)',
1038
+ 260 => 'Poland (260)',
1039
+ 262 => 'Germany (262)',
1040
+ 266 => 'Gibraltar (266)',
1041
+ 268 => 'Portugal (268)',
1042
+ 270 => 'Luxembourg (270)',
1043
+ 272 => 'Ireland (272)',
1044
+ 274 => 'Iceland (274)',
1045
+ 276 => 'Albania (276)',
1046
+ 278 => 'Malta (278)',
1047
+ 280 => 'Cyprus (280)',
1048
+ 282 => 'Georgia (282)',
1049
+ 283 => 'Armenia (283)',
1050
+ 284 => 'Bulgaria (284)',
1051
+ 286 => 'Turkey (286)',
1052
+ 288 => 'Faroe Islands (288)',
1053
+ 289 => 'Abkhazia (289)',
1054
+ 290 => 'Greenland (290)',
1055
+ 292 => 'San Marino (292)',
1056
+ 293 => 'Slovenia (293)',
1057
+ 294 => 'Macedonia (294)',
1058
+ 295 => 'Liechtenstein (295)',
1059
+ 297 => 'Montenegro (297)',
1060
+ 302 => 'Canada (302)',
1061
+ 308 => 'St. Pierre & Miquelon (308)',
1062
+ 310 => 'United States / Guam (310)',
1063
+ 311 => 'United States / Guam (311)',
1064
+ 312 => 'United States (312)',
1065
+ 316 => 'United States (316)',
1066
+ 330 => 'Puerto Rico (330)',
1067
+ 334 => 'Mexico (334)',
1068
+ 338 => 'Jamaica (338)',
1069
+ 340 => 'French Guiana / Guadeloupe / Martinique (340)',
1070
+ 342 => 'Barbados (342)',
1071
+ 344 => 'Antigua and Barbuda (344)',
1072
+ 346 => 'Cayman Islands (346)',
1073
+ 348 => 'British Virgin Islands (348)',
1074
+ 350 => 'Bermuda (350)',
1075
+ 352 => 'Grenada (352)',
1076
+ 354 => 'Montserrat (354)',
1077
+ 356 => 'Saint Kitts and Nevis (356)',
1078
+ 358 => 'Saint Lucia (358)',
1079
+ 360 => 'St. Vincent & Gren. (360)',
1080
+ 362 => 'Bonaire, Sint Eustatius and Saba / Curacao / Netherlands Antilles (362)',
1081
+ 363 => 'Aruba (363)',
1082
+ 364 => 'Bahamas (364)',
1083
+ 365 => 'Anguilla (365)',
1084
+ 366 => 'Dominica (366)',
1085
+ 368 => 'Cuba (368)',
1086
+ 370 => 'Dominican Republic (370)',
1087
+ 372 => 'Haiti (372)',
1088
+ 374 => 'Trinidad and Tobago (374)',
1089
+ 376 => 'Turks and Caicos Islands / US Virgin Islands (376)',
1090
+ 400 => 'Azerbaijan (400)',
1091
+ 401 => 'Kazakhstan (401)',
1092
+ 402 => 'Bhutan (402)',
1093
+ 404 => 'India (404)',
1094
+ 405 => 'India (405)',
1095
+ 410 => 'Pakistan (410)',
1096
+ 412 => 'Afghanistan (412)',
1097
+ 413 => 'Sri Lanka (413)',
1098
+ 414 => 'Myanmar (Burma) (414)',
1099
+ 415 => 'Lebanon (415)',
1100
+ 416 => 'Jordan (416)',
1101
+ 417 => 'Syrian Arab Republic (417)',
1102
+ 418 => 'Iraq (418)',
1103
+ 419 => 'Kuwait (419)',
1104
+ 420 => 'Saudi Arabia (420)',
1105
+ 421 => 'Yemen (421)',
1106
+ 422 => 'Oman (422)',
1107
+ 424 => 'United Arab Emirates (424)',
1108
+ 425 => 'Israel / Palestinian Territory (425)',
1109
+ 426 => 'Bahrain (426)',
1110
+ 427 => 'Qatar (427)',
1111
+ 428 => 'Mongolia (428)',
1112
+ 429 => 'Nepal (429)',
1113
+ 430 => 'United Arab Emirates (430)',
1114
+ 431 => 'United Arab Emirates (431)',
1115
+ 432 => 'Iran (432)',
1116
+ 434 => 'Uzbekistan (434)',
1117
+ 436 => 'Tajikistan (436)',
1118
+ 437 => 'Kyrgyzstan (437)',
1119
+ 438 => 'Turkmenistan (438)',
1120
+ 440 => 'Japan (440)',
1121
+ 441 => 'Japan (441)',
1122
+ 450 => 'South Korea (450)',
1123
+ 452 => 'Viet Nam (452)',
1124
+ 454 => 'Hongkong, China (454)',
1125
+ 455 => 'Macao, China (455)',
1126
+ 456 => 'Cambodia (456)',
1127
+ 457 => 'Laos P.D.R. (457)',
1128
+ 460 => 'China (460)',
1129
+ 466 => 'Taiwan (466)',
1130
+ 467 => 'North Korea (467)',
1131
+ 470 => 'Bangladesh (470)',
1132
+ 472 => 'Maldives (472)',
1133
+ 502 => 'Malaysia (502)',
1134
+ 505 => 'Australia (505)',
1135
+ 510 => 'Indonesia (510)',
1136
+ 514 => 'Timor-Leste (514)',
1137
+ 515 => 'Philippines (515)',
1138
+ 520 => 'Thailand (520)',
1139
+ 525 => 'Singapore (525)',
1140
+ 528 => 'Brunei Darussalam (528)',
1141
+ 530 => 'New Zealand (530)',
1142
+ 537 => 'Papua New Guinea (537)',
1143
+ 539 => 'Tonga (539)',
1144
+ 540 => 'Solomon Islands (540)',
1145
+ 541 => 'Vanuatu (541)',
1146
+ 542 => 'Fiji (542)',
1147
+ 544 => 'American Samoa (544)',
1148
+ 545 => 'Kiribati (545)',
1149
+ 546 => 'New Caledonia (546)',
1150
+ 547 => 'French Polynesia (547)',
1151
+ 548 => 'Cook Islands (548)',
1152
+ 549 => 'Samoa (549)',
1153
+ 550 => 'Micronesia (550)',
1154
+ 552 => 'Palau (552)',
1155
+ 553 => 'Tuvalu (553)',
1156
+ 555 => 'Niue (555)',
1157
+ 602 => 'Egypt (602)',
1158
+ 603 => 'Algeria (603)',
1159
+ 604 => 'Morocco (604)',
1160
+ 605 => 'Tunisia (605)',
1161
+ 606 => 'Libya (606)',
1162
+ 607 => 'Gambia (607)',
1163
+ 608 => 'Senegal (608)',
1164
+ 609 => 'Mauritania (609)',
1165
+ 610 => 'Mali (610)',
1166
+ 611 => 'Guinea (611)',
1167
+ 612 => 'Ivory Coast (612)',
1168
+ 613 => 'Burkina Faso (613)',
1169
+ 614 => 'Niger (614)',
1170
+ 615 => 'Togo (615)',
1171
+ 616 => 'Benin (616)',
1172
+ 617 => 'Mauritius (617)',
1173
+ 618 => 'Liberia (618)',
1174
+ 619 => 'Sierra Leone (619)',
1175
+ 620 => 'Ghana (620)',
1176
+ 621 => 'Nigeria (621)',
1177
+ 622 => 'Chad (622)',
1178
+ 623 => 'Central African Rep. (623)',
1179
+ 624 => 'Cameroon (624)',
1180
+ 625 => 'Cape Verde (625)',
1181
+ 626 => 'Sao Tome & Principe (626)',
1182
+ 627 => 'Equatorial Guinea (627)',
1183
+ 628 => 'Gabon (628)',
1184
+ 629 => 'Congo, Republic (629)',
1185
+ 630 => 'Congo, Dem. Rep. (630)',
1186
+ 631 => 'Angola (631)',
1187
+ 632 => 'Guinea-Bissau (632)',
1188
+ 633 => 'Seychelles (633)',
1189
+ 634 => 'Sudan (634)',
1190
+ 635 => 'Rwanda (635)',
1191
+ 636 => 'Ethiopia (636)',
1192
+ 637 => 'Somalia (637)',
1193
+ 638 => 'Djibouti (638)',
1194
+ 639 => 'Kenya (639)',
1195
+ 640 => 'Tanzania (640)',
1196
+ 641 => 'Uganda (641)',
1197
+ 642 => 'Burundi (642)',
1198
+ 643 => 'Mozambique (643)',
1199
+ 645 => 'Zambia (645)',
1200
+ 646 => 'Madagascar (646)',
1201
+ 647 => 'Reunion (647)',
1202
+ 648 => 'Zimbabwe (648)',
1203
+ 649 => 'Namibia (649)',
1204
+ 650 => 'Malawi (650)',
1205
+ 651 => 'Lesotho (651)',
1206
+ 652 => 'Botswana (652)',
1207
+ 653 => 'Swaziland (653)',
1208
+ 654 => 'Comoros (654)',
1209
+ 655 => 'South Africa (655)',
1210
+ 657 => 'Eritrea (657)',
1211
+ 659 => 'South Sudan (659)',
1212
+ 702 => 'Belize (702)',
1213
+ 704 => 'Guatemala (704)',
1214
+ 706 => 'El Salvador (706)',
1215
+ 708 => 'Honduras (708)',
1216
+ 710 => 'Nicaragua (710)',
1217
+ 712 => 'Costa Rica (712)',
1218
+ 714 => 'Panama (714)',
1219
+ 716 => 'Peru (716)',
1220
+ 722 => 'Argentina Republic (722)',
1221
+ 724 => 'Brazil (724)',
1222
+ 730 => 'Chile (730)',
1223
+ 732 => 'Colombia (732)',
1224
+ 734 => 'Venezuela (734)',
1225
+ 736 => 'Bolivia (736)',
1226
+ 738 => 'Guyana (738)',
1227
+ 740 => 'Ecuador (740)',
1228
+ 744 => 'Paraguay (744)',
1229
+ 746 => 'Suriname (746)',
1230
+ 748 => 'Uruguay (748)',
1231
+ 750 => 'Falkland Islands (Malvinas) (750)',
1232
+ 901 => 'International Networks / Satellite Networks (901)',
1233
1233
  },
1234
1234
  },
1235
1235
  # 0x0ab0-name - seen 'DualShot_Meta_Info'
@@ -19,7 +19,7 @@ package Image::ExifTool::Shortcuts;
19
19
  use strict;
20
20
  use vars qw($VERSION);
21
21
 
22
- $VERSION = '1.67';
22
+ $VERSION = '1.68';
23
23
 
24
24
  # this is a special table used to define command-line shortcuts
25
25
  # (documentation Notes may be added for these via %shortcutNotes in BuildTagLookup.pm)
@@ -276,6 +276,7 @@ $VERSION = '1.67';
276
276
  'FileModifyDate',
277
277
  'FileName',
278
278
  ],
279
+ ImageDataMD5 => [ 'ImageDataHash' ], # (for backward compatibilty)
279
280
  );
280
281
 
281
282
  #------------------------------------------------------------------------------
@@ -16,7 +16,7 @@ use vars qw($VERSION);
16
16
  use Image::ExifTool qw(:DataAccess :Utils);
17
17
  use Image::ExifTool::Sigma;
18
18
 
19
- $VERSION = '1.30';
19
+ $VERSION = '1.31';
20
20
 
21
21
  sub ProcessX3FHeader($$$);
22
22
  sub ProcessX3FDirectory($$$);
@@ -549,9 +549,9 @@ sub ProcessX3FDirectory($$$)
549
549
  $len -= 28;
550
550
  # ignore all image data but JPEG compressed (version 2.0, type 2, format 18)
551
551
  unless ($buff =~ /^SECi\0\0\x02\0\x02\0\0\0\x12\0\0\0/) {
552
- # do MD5 on non-preview data if requested
553
- if ($$et{ImageDataMD5} and substr($buff,8,1) ne "\x02") {
554
- $et->ImageDataMD5($raf, $len, 'SigmaRaw IMAG');
552
+ # do hash on non-preview data if requested
553
+ if ($$et{ImageDataHash} and substr($buff,8,1) ne "\x02") {
554
+ $et->ImageDataHash($raf, $len, 'SigmaRaw IMAG');
555
555
  }
556
556
  next;
557
557
  }