Commit Graph

3597 Commits

Author SHA1 Message Date
Jim Easterbrook
02ce7e9aff Restore modified tags after TZ manipulation
This ensures that Xmp date/times that have been set by the user aren't
over written by the TZ restoration efforts. This fixes bug #1998
2021-11-15 10:18:05 +00:00
Kevin Backhouse
fde8ed07b3
Merge pull request #1967 from kevinbackhouse/ReadOrThrow
Add readOrThrow and seekOrThrow to BasicIo
2021-11-08 22:33:23 +00:00
Peter
1ae9f42cd8
Add camera models for NikonFl3 makernotes group (#1994)
* Add camera models for NikonFl3

* Python test for new NikonFl3 camera models
2021-11-08 17:45:14 +01:00
postscript-dev
562b10f2c7
Fix Exif.NikonFl7.FlashCompensation 2021-11-03 17:39:05 +00:00
postscript-dev
277b1875f7
Fix Exif.NikonFl7.FlashGroupBCControlData output 2021-11-02 16:02:24 +00:00
postscript-dev
b3ca98c1e7
Fix Exif.NikonFl7.FlashCompensation pretty print 2021-11-02 16:02:23 +00:00
postscript-dev
8ebf10f921
Fix condition in Exif.NikonFl7.FlashCompensation 2021-11-02 16:02:23 +00:00
postscript-dev
f23d965643
Add limits check: Exif.NikonFl7.FlashCompensation 2021-11-02 16:02:23 +00:00
postscript-dev
f0f3c7e8a2
Fix compile issues for NikonFl7 makernotes group
+ Fix fuzzing CI errors of `exp2` and `round` not being in `std` by adding
  `#include <cmath>`
+ Fix Windows CI warning C4305 by explicitly defining value as a float
2021-11-02 16:02:22 +00:00
postscript-dev
eb134d1946
Add testing for NikonFl7 makernotes group 2021-11-02 16:02:21 +00:00
Kevin Backhouse
ab90d430c7
Merge pull request #1979 from postscript-dev/fix_exiv2_sample_thumb_stdout
Add exiv2 extract thumb to stdout (#1934)
2021-10-26 11:56:33 +01:00
Kevin Backhouse
68473d9d10
Remove static functions readOrThrow and seekOrThrow. 2021-10-21 10:18:21 +01:00
Kevin Backhouse
44542a9f94
Add readOrThrow and seekOrThrow to BasicIo. 2021-10-21 10:18:21 +01:00
Miloš Komarčević
8b7d8729b7 Expose unsupported CR3 previews as binary 2021-10-20 22:15:44 +02:00
postscript-dev
31a2467a61
Add exiv2 extract thumb to stdout (#1934): src 2021-10-20 15:33:25 +01:00
Miloš Komarčević
40e5021577 Limit CR3 previews to JPEG only 2021-10-20 16:17:24 +02:00
Kevin Backhouse
0ae85cc4ca
Merge pull request #1974 from dhoulder/skip-isobmff-boxes
Performance boost: don't read boxes we're not interested in
2021-10-20 11:35:46 +01:00
mergify[bot]
2d80891837
Only include expat.h when XMP is enabled. (#1973)
(cherry picked from commit 03cc59122249e79c5a72982b25dad88f4c2803d6)

Co-authored-by: Kevin Backhouse <kevinbackhouse@github.com>
2021-10-20 10:21:52 +02:00
David Houlder
4e587fa931 Performance boost: don't read boxes we're not interested in 2021-10-19 22:44:55 +11:00
David Houlder
b385f2db1c
Canon cr3 previews (#1958)
* Extract THMB and PRVW images from Canon CR3 file

* Added test for Canon CR3 preview extraction.

Added test data Canon-R6-pruned.CR3 (first 492016 bytes of https://raw.pixls.us/getfile.php/4659/nice/Canon%20-%20Canon%20EOS%20R6%20-%203:2.CR3).

See https://github.com/Exiv2/exiv2/issues/1893

* Fixed format specifier

* Update src/bmffimage.cpp

Co-authored-by: Miloš Komarčević <4973094+kmilos@users.noreply.github.com>

* Update src/bmffimage.cpp

Co-authored-by: Miloš Komarčević <4973094+kmilos@users.noreply.github.com>

* retrigger checks

Co-authored-by: Miloš Komarčević <4973094+kmilos@users.noreply.github.com>
2021-10-17 22:28:05 +01:00
Kevin Backhouse
71744d5f7f
Merge pull request #1944 from Exiv2/nikon_colorbalance
Extending Nikon3.ColorBalance version coverage
2021-10-15 21:46:59 +01:00
Kevin Backhouse
81cfc162c1
Use std::move to transfer ownership of DataBufs. 2021-10-10 23:56:00 +01:00
Kevin Backhouse
4901c5dba6
Merge pull request #1930 from kevinbackhouse/CiffComponent-pData-ownership
Clarify ownership model of CiffComponent::pData_
2021-10-10 19:15:38 +01:00
Kevin Backhouse
3b0d827047
More =default changes. 2021-10-10 10:43:07 +01:00
Kevin Backhouse
5fdd9da3d3
Use =default. 2021-10-09 21:39:15 +01:00
Miloš Komarčević
2074f82344 Fold into common 02xx versions 2021-10-05 15:39:47 +02:00
Miloš Komarčević
4205e03c43 Extending Nikon3.ColorBalance version coverage 2021-10-05 15:04:24 +02:00
Kevin Backhouse
be5a01f0b2
Merge pull request #1921 from kevinbackhouse/FixIssue1920
Fix UBSAN failure caused by left-shift of negative number
2021-10-04 10:59:27 +01:00
Kevin Backhouse
83b9944cdd
We only need to extract one byte. 2021-10-04 10:09:11 +01:00
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
482cb2ded5
Clarify ownership model of CiffComponent::pData_ 2021-09-26 15:52:58 +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
Kevin Backhouse
a71bb64fe9
Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=39060
Fix UBSAN failure caused by left shift of a negative number.
2021-09-22 23:55:15 +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