Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
omnibus-heptapod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
heptapod
omnibus-heptapod
Commits
0946391d93d1
Commit
0946391d93d1
authored
8 months ago
by
DEPS_GITLAB_TOKEN - For deps.io to create MRs
Browse files
Options
Downloads
Patches
Plain Diff
Update exiftool from 12.87 to 12.89
Changelog: changed
parent
7de237caa81f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!153
heptapod#1722: making 17.3 the new stable
,
!151
Merge upstream Omnibus GitLab into Omnibus Heptapod
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
config/patches/exiftool/allowlist-types.patch
+14
-10
14 additions, 10 deletions
config/patches/exiftool/allowlist-types.patch
config/software/exiftool.rb
+1
-1
1 addition, 1 deletion
config/software/exiftool.rb
with
15 additions
and
11 deletions
config/patches/exiftool/allowlist-types.patch
+
14
−
10
View file @
0946391d
diff --git a/lib/Image/ExifTool.pm b/lib/Image/ExifTool.pm
index
4108ad09..100068fc
100644
index
9782d281..c588042d
100644
--- a/lib/Image/ExifTool.pm
+++ b/lib/Image/ExifTool.pm
...
...
@@ -3,6 +3,6 @@
--- a/lib/Image/ExifTool.pm
+++ b/lib/Image/ExifTool.pm
@@ -19
1
,19 +19
1
,10 @@
$defaultLang = 'en'; # default language
@@ -19
2
,19 +19
2
,10 @@
$defaultLang = 'en'; # default language
# 2) Put types with weak file signatures at end of list to avoid false matches
# 3) PLIST must be in this list for the binary PLIST format, although it may
# cause a file to be checked twice for XML
...
...
@@ -24,7 +24,7 @@
my %writeTypes; # lookup for writable file types (hash filled if required)
# file extensions that we can't write for various base types
@@ -22
5
,351 +21
6
,9 @@
my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
@@ -22
6
,351 +21
7
,9 @@
my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
# (if extension may be more than one type, the type is a list where
# the writable type should come first if it exists)
%fileTypeLookup = (
...
...
@@ -229,7 +229,7 @@
- # NDPI => ['TIFF', 'Hamamatsu NanoZoomer Digital Pathology Image'],
- NEF => ['TIFF', 'Nikon (RAW) Electronic Format'],
- NEWER => 'COS',
- NKA => ['NKA', 'Nikon NX Studio
Setting
s'],
- NKA => ['NKA', 'Nikon NX Studio
Adjustment
s'],
- NKSC => ['XMP', 'Nikon Sidecar'],
- NMBTEMPLATE => ['ZIP','Apple Numbers Template'],
- NRW => ['TIFF', 'Nikon RAW (2)'],
...
...
@@ -378,6 +378,6 @@
# typical extension for each file type (if different than FileType)
diff --git a/lib/Image/ExifTool/AIFF.pm b/lib/Image/ExifTool/AIFF.pm
deleted file mode 100644
index
f2c7a68
d..00000000
index
5c2ffde
d..00000000
--- a/lib/Image/ExifTool/AIFF.pm
+++ /dev/null
...
...
@@ -382,6 +382,6 @@
--- a/lib/Image/ExifTool/AIFF.pm
+++ /dev/null
@@ -1,31
2
+0,0 @@
@@ -1,31
6
+0,0 @@
-#------------------------------------------------------------------------------
-# File: AIFF.pm
-#
...
...
@@ -402,7 +402,7 @@
-use Image::ExifTool qw(:DataAccess :Utils);
-use Image::ExifTool::ID3;
-
-$VERSION = '1.1
2
';
-$VERSION = '1.1
3
';
-
-# information for time/date-based tags (time zero is Jan 1, 1904)
-my %timeInfo = (
...
...
@@ -610,9 +610,13 @@
- # AIFF chunks are padded to an even number of bytes
- my $len2 = $len + ($len & 0x01);
- if ($len2 > 100000000) {
- if ($len2 >= 0x80000000 and not $et->Options('LargeFileSupport')) {
- $et->Warn('End of processing at large chunk (LargeFileSupport not enabled)');
- last;
- if ($len2 >= 0x80000000) {
- if (not $et->Options('LargeFileSupport')) {
- $et->Warn('End of processing at large chunk (LargeFileSupport not enabled)');
- last;
- } elsif ($et->Options('LargeFileSupport') eq '2') {
- $et->WarnOnce('Skipping large chunk (LargeFileSupport is 2)');
- }
- }
- if ($tagInfo) {
- $et->Warn("Skipping large $$tagInfo{Name} chunk (> 100 MB)");
...
...
This diff is collapsed.
Click to expand it.
config/software/exiftool.rb
+
1
−
1
View file @
0946391d
...
...
@@ -15,7 +15,7 @@
#
name
'exiftool'
version
=
Gitlab
::
Version
.
new
(
'exiftool'
,
'12.8
7
'
)
version
=
Gitlab
::
Version
.
new
(
'exiftool'
,
'12.8
9
'
)
default_version
version
.
print
(
false
)
license
'GPL-1.0 or Artistic'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment