Skip to content

Commit f97260d

Browse files
balasankarcpursultanidependencies-bot
committed
Merge branch 'deps/e771939-5067ce4' into 'master'
Update exiftool/exiftool from 12.69 to 12.70 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7258 Merged-by: Balasankar 'Balu' C <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: Hossein Pursultani <[email protected]> Co-authored-by: deps <[email protected]>
2 parents b1be90b + 3c6ab49 commit f97260d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

config/patches/exiftool/allowlist-types.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/lib/Image/ExifTool.pm b/lib/Image/ExifTool.pm
2-
index e9377841..c0d72b2c 100644
2+
index 6c3a6292..90b57c2e 100644
33
--- a/lib/Image/ExifTool.pm
44
+++ b/lib/Image/ExifTool.pm
55
@@ -190,19 +190,10 @@ $defaultLang = 'en'; # default language
@@ -24,7 +24,7 @@ index e9377841..c0d72b2c 100644
2424
my %writeTypes; # lookup for writable file types (hash filled if required)
2525

2626
# file extensions that we can't write for various base types
27-
@@ -223,345 +214,9 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
27+
@@ -223,346 +214,9 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
2828
# (if extension may be more than one type, the type is a list where
2929
# the writable type should come first if it exists)
3030
%fileTypeLookup = (
@@ -170,6 +170,7 @@ index e9377841..c0d72b2c 100644
170170
- JPC => 'J2C',
171171
- JPE => 'JPEG',
172172
JPEG => ['JPEG', 'Joint Photographic Experts Group'],
173+
- JPH => ['JP2', 'High-throughput JPEG 2000'],
173174
- JPF => 'JP2',
174175
JPG => 'JPEG',
175176
- JPM => ['JP2', 'JPEG 2000 compound image'],

config/software/exiftool.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616

1717
name 'exiftool'
18-
version = Gitlab::Version.new('exiftool', '12.69')
18+
version = Gitlab::Version.new('exiftool', '12.70')
1919
default_version version.print(false)
2020

2121
license 'GPL-1.0 or Artistic'

0 commit comments

Comments
 (0)