Commit Graph

3566 Commits

Author SHA1 Message Date
Kevin Backhouse
887acd098a
Merge pull request #1926 from postscript-dev/fix_sony_temperature_tags
Add conditions to 2 Sony temperature tags
2021-09-29 22:26:08 +01:00
John55h
02d40734a1
Update canonmn_int.cpp
Correct Exif.CanonCs.LensType 38 for "Canon EF 80-200mm f/4.5-5.6 II"
2021-09-27 11:14:07 +01:00
Kevin Backhouse
b27aa0b82c
Merge pull request #1922 from postscript-dev/fix_sony_tags
Add SonyMisc(2b|3c) Groups for Sony TIFF files
2021-09-25 18:14:00 +01:00
postscript-dev
54ee165261
Add conditions to 2 Sony temperature tags
Only certain camera models are supported.

Source: https://github.com/exiftool/exiftool/blob/master/lib/Image/ExifTool/Sony.pm
2021-09-24 16:14:05 +01:00
postscript-dev
7ace96263e
Add SonyMisc(2b|3c) Groups in TIFF files
- Previous version only supported JPEGs.
- Update Python test to use more specific grep, as this prevents
  SonyMisc(2b|3c) from being included. Regression test to be added
  in a different commit.
2021-09-23 12:00:48 +01:00
Heiko Bauke
8a1e949bff fix out of range access, minor performance improvement 2021-09-22 19:48:00 +02:00
Kevin Backhouse
7d2eb4ad09
Merge pull request #1905 from postscript-dev/update_website_docs
Update website docs
2021-09-22 10:14:52 +01:00
Kevin Backhouse
be296814c1
Merge pull request #1913 from kevinbackhouse/FixIssue1912
Fix integer overflow in print0x0007
2021-09-21 10:52:14 +01:00
Kevin Backhouse
cd4316c4f5
Do the calculation in floating point to avoid integer overflow. 2021-09-20 22:06:07 +01:00
Evan Miller
04f4624718
Explicitly test for libproc.h (#1916)
This change adds support for ancient macOS lacking libproc. It also
eliminates a bug where exiv2 could not be built on case-sensitive
file systems (the header file is properly TargetConditionals.h).
2021-09-20 14:42:40 +02:00
Kevin Backhouse
801e20123a
Merge pull request #1902 from kevinbackhouse/FixIssue1901
Comment out bogus code in XMPUtils.cpp
2021-09-19 21:49:56 +01:00
Kevin Backhouse
d92b0a6717
Merge pull request #1910 from kevinbackhouse/PentaxQuadraticPrint
Fix quadratic loops in pentaxmn_int.cpp
2021-09-19 15:40:11 +01:00
Kevin Backhouse
7cb65d1e25
Merge pull request #1872 from postscript-dev/update_exiv2_manpage
Update exiv2 program and manpage
2021-09-18 13:28:59 +01:00
Kevin Backhouse
9f1e3e3e72
Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38887
Fix quadratic loops.
2021-09-17 22:31:12 +01:00
Colin Watson
f643d9bb5e Annotate some strings with xgettext:no-c-format
Some descriptions of location properties contain the text "100%
overlap".  When extracting text for translation, `xgettext`
misidentifies this as containing the C format string "% o", and tags it
as `c-format`.  Translation tools that are sensitive to this will
require that translations contain matching format strings; since in this
case the format string is nonsensical, that is often not reasonably
possible.  See:

  https://answers.launchpad.net/launchpad/+question/698762

The description of the DotRange tag contains the text "0% dot and 100%
dot", which is similarly misidentified.

To fix this, inform `xgettext` that the messages do not contain C format
strings, as documented here (towards the end):

  https://www.gnu.org/software/gettext/manual/html_node/c_002dformat-Flag.html
2021-09-17 11:35:28 +01:00
Peter
098283c1f8
Merge branch 'Exiv2:main' into update_website_docs 2021-09-16 21:42:20 +01:00
postscript-dev
c4e73831f2
Add missing MpfInfo group to taglist.exe Exif 2021-09-16 21:38:05 +01:00
Kevin Backhouse
e1e7dddfbd
Fix test failure. 2021-09-15 16:32:18 +01:00
postscript-dev
795cfe90ce
Update exiv2 program, --help and usage 2021-09-15 14:27:55 +01:00
Kevin Backhouse
bb9ff53ebe
Throw an exception on integer overflow. 2021-09-13 21:43:59 +01:00
Kevin Backhouse
e71b99b236
Merge pull request #1886 from kevinbackhouse/private-pData
Make fields of DataBuf private
2021-09-09 22:21:02 +01:00
Kevin Backhouse
bd211a90ac
Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=37889
Avoid reading 1 byte off the end when the string does not contain a '\0' byte.
2021-09-02 10:26:08 +01:00
Kevin Backhouse
9ff72e5ca5
Make offset=0 the default parameter. 2021-08-30 12:41:08 +01:00
Kevin Backhouse
61a14c45d1
Fix build failure. 2021-08-29 17:13:15 +01:00
Kevin Backhouse
e41f0c2cce
Fix build failure on Windows. 2021-08-29 15:49:12 +01:00
Kevin Backhouse
c9d0cf3643
Make fields of DataBuf private. 2021-08-29 15:43:10 +01:00
Kevin Backhouse
cb16324bcf
Merge pull request #1882 from kevinbackhouse/FixIssue1881
Throw an error if the size of the preview is greater than 1MB
2021-08-27 18:17:14 +01:00
Kevin Backhouse
ccfdcf84ea
Merge pull request #1824 from 1div0/JPEG XL
Corrected JPEG XL file type
2021-08-27 17:47:35 +01:00
Kevin Backhouse
67746dee73
Merge pull request #1874 from neheb/emp
remove most usages of std::make_pair
2021-08-27 17:47:08 +01:00
Kevin Backhouse
ce02361a64
Only build XMLValidator when XMP is enabled. 2021-08-27 17:03:35 +01:00
Kevin Backhouse
60144df557
Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=37492
Throw an error if the size of the preview is greater than 1MB.
2021-08-27 16:56:45 +01:00
Kevin Backhouse
b35cc5ffa6
Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=37363
Do some basic XML validation before running the xmpsdk library to avoid bugs in xmpsdk.
2021-08-21 12:42:24 +01:00
Rosen Penev
e7eddfc2f5 use more emplace_back
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-08-17 19:19:56 -07:00
Rosen Penev
f3fcffd6e6 remove most usages of std::make_pair
Better alternatives exist with C++11.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-08-17 19:11:28 -07:00
postscript-dev
fbdb38b959
Add missing --extract option to exiv2 program
The long option version of `-e` was missing.
2021-08-17 14:29:01 +01:00
Kevin Backhouse
64fe77673f
Decouple EXIV2_BUILD_FUZZ_TESTS from EXIV2_TEAM_USE_SANITIZERS. 2021-08-11 15:11:01 +01:00
Kevin Backhouse
a1b65a7928
Merge pull request #1849 from Exiv2/mergify/bp/main/pr-1848
Replace assertion with an error message (backport #1848)
2021-08-06 13:47:11 +01:00
Kevin Backhouse
0dc5cdd910
Merge pull request #1852 from Exiv2/mergify/bp/main/pr-1846
Replace assertion with error message in TiffDirectory::writeDirEntry() (backport #1846)
2021-08-06 13:46:14 +01:00
Kevin Backhouse
330483a859
Merge pull request #1843 from Exiv2/mergify/bp/main/pr-1840
Check that the float is within the range of an int before casting (backport #1840)
2021-08-06 13:45:25 +01:00
Kevin Backhouse
9fd8b40a4e Replace assertion with an error message.
(cherry picked from commit cb32b809c80163c2392543dfb830dffe44e47f91)
2021-08-06 12:13:38 +00:00
mergify[bot]
66259b1c71
Check if embedded RAF image is really a TIFF (backport #1796) (#1851)
* Check if embedded RAF image is really a TIFF

(cherry picked from commit be12ae6f9e2f053bf101902865deadfe7c937f8d)

* Clarify comment on old vs new RAF

Co-authored-by: Christoph Hasse <hassec@users.noreply.github.com>
(cherry picked from commit 30f39ac98c1671547aa0b4021081e374864f1f04)

* Check I/O read result on RAF inspection

Co-authored-by: Kevin Backhouse <kevinbackhouse@github.com>
(cherry picked from commit 09de8dc901a38555151bd87d89ada3bd931451ea)

* Add test

(cherry picked from commit 9c3db7f3c3cb48fe0669061e627174402f366816)

Co-authored-by: Miloš Komarčević <miloskomarcevic@aim.com>
Co-authored-by: Miloš Komarčević <4973094+kmilos@users.noreply.github.com>
2021-08-06 11:22:05 +02:00
Kevin Backhouse
9e160a453b
Replace assertion with an error message. 2021-08-05 22:31:41 +01:00
Peter Kovář
1d095cf751 Removed tag handled separately 2021-08-05 10:04:51 +02:00
Kevin Backhouse
5bc444ff00
Use DataBuf rather than raw malloc. 2021-08-04 20:55:20 +01:00
Kevin Backhouse
7c2ab1d7de
Check that the float is within the range of an int before casting. 2021-08-04 15:21:31 +01:00
Christoph Hasse
0fab606e90 fix: incorrectly triggered enforce check during preview extraction in LoaderTiff::getData(), closes #1829 2021-08-04 00:12:26 +02:00
Kevin Backhouse
e34e150f22 Replace assertion with an error message.
(cherry picked from commit 4ec1768415ba015041a9bb28ab17c1ccf6a8c63e)
2021-08-03 21:08:53 +00:00
Kevin Backhouse
ed1db4ace2
Use std::round for rounding to nearest. 2021-08-03 14:44:09 +01:00
Kevin Backhouse
8d5e70379e Update src/tags_int.cpp
Co-authored-by: Christoph Hasse <hassec@users.noreply.github.com>
(cherry picked from commit ad2e7221b498258bd04188b66f6da5cefd101e73)
2021-08-03 13:30:56 +00:00
Kevin Backhouse
52d70c8924 Check value is in range before casting from double to uint32_t, to avoid undefined behavior.
(cherry picked from commit 1455cc88466a14d8ea49935005e9de097984f012)
2021-08-03 13:30:55 +00:00