Commit Graph

3069 Commits

Author SHA1 Message Date
clanmills
c51573c92e fix_1049_0.27 2020-04-06 11:45:16 +01:00
clanmills
d0d6ff2e9b fix_1059_0.27 2020-04-06 09:16:47 +01:00
clanmills
c49cdd6395 Code changes. 2020-03-30 13:07:09 +01:00
clanmills
18ed65a25f fix_Sony2010e_0.27 Thanks to @sridharb1 2020-03-29 17:55:37 +01:00
clanmills
a7683f95a7 Detab src/pentaxmn_int.cpp 2020-03-28 11:01:33 +00:00
Robin Mills
0fe6817177
Merge branch '0.27-maintenance' into fix_1084_0.27 2020-03-28 10:39:33 +00:00
clanmills
8f15784314 fix_1084_0.27 2020-03-28 09:35:31 +00:00
Robin Mills
8382225850
Merge branch '0.27-maintenance' into fix_1099_0.27 2020-03-28 09:19:42 +00:00
Robin Mills
2956309afd
Merge branch '0.27-maintenance' into fix_1099_0.27 2020-03-28 08:37:54 +00:00
clanmills
7658d8aefd fix_macOS_0.27 2020-03-28 08:08:28 +00:00
clanmills
698b418f73 fix_1097_0.27 2020-03-27 17:25:28 +01:00
clanmills
82087b58e4 fix_1099_0.27 2020-03-27 15:57:10 +00:00
dbeichl
188ddab7cc
Merge branch '0.27-maintenance' into 0.27-maintenance-makernote-update 2020-03-26 19:35:55 +01:00
Daniel Beichl
3fe4460a23 Add various attributes for canon maker note
- Decode Attributes CameraType, AEB, SlowShutter, AutoISO,
  CameraTemperature, FlashGuideNumber, BulbDuration and AutoRotate
- Small signedness fix to decode printFiFocusDistance to return Infinite
2020-03-25 17:05:44 +01:00
Daniel Beichl
529fa8770f Add nikon 153 point phase af 2020-03-25 16:55:58 +01:00
Daniel Beichl
b45c82e091 Add some values to panasonic focus mode attribute 2020-03-25 16:55:51 +01:00
Robin Mills
cfdd1c7b3f Pointless change to trigger CI which is beefing about test_issue_987 which has been removed. 2020-03-25 14:02:55 +00:00
Robin Mills
8de479f83e
Merge branch '0.27-maintenance' into fix1001_rename_AFPrimaryPoint 2020-03-25 13:56:23 +00:00
clanmills
db1be4ae8e fix_1046_pt-GPSProcessingMethod 2020-03-22 20:56:38 +00:00
Fredrik Strandin
5360d82c4a Add ID for Tokina atx-i 11-16mm F2.8 CF (Nikon)
Fixes #1078

(cherry picked from commit 2870a1648e86b777afa0ae1540ea4791482d1354)
2020-01-15 09:07:31 +01:00
Andreas Sturmlechner
0890d66a6e EXIV2_ENABLE_SSH: Fix compatibility with >=libssh-0.9.2
0.9.1 remains broken regardless and is beyond fixing in this place.

Build-tested with both libssh 0.9.0 and 0.9.2.

Solution copied from KDE's kio-extras commit 24506c2af8d1904a99538543804306c6c2b81ca2
2019-11-14 17:15:53 +01:00
David-Tillmann Schaefer
b8bf9cc4fd changes comma in aperture to dot to match the other exif entries
(cherry picked from commit 054bc9068b3c4e83be97e42d1a8c9829c2c83e1b)
2019-11-14 09:18:56 +01:00
derselbst
70b0c17421 Fix a memory leak in CiffHeader::read()
Memory for pPadding_ was allocated with new[] .
2019-11-03 07:25:45 +01:00
derselbst
ccf4b59c91 Merge remote-tracking branch 'origin/0.27-maintenance' into fix1001_rename_AFPrimaryPoint 2019-11-02 17:36:47 +01:00
Luis Díaz Más
20a9e5affe Fix format-overflow warnings by using bigger buffer 2019-10-09 12:37:38 +02:00
clanmills
8859209b95 fix_1004_lens_exiftool_compatibility 2019-10-09 09:00:14 +02:00
Robin Mills
4852bd2ab2 fix_910_remote_io_block+1 2019-10-08 14:42:41 +02:00
Jens Georg
b7890776c6 crwimage: Check offset and size against total size
Corrupted or specially crafted CRW images might exceed the overall
buffersize.

Fixes #1019

(cherry picked from commit 683451567284005cd24e1ccb0a76ca401000968b)
2019-10-07 22:14:15 +00:00
Robin Mills
05538ebea2 fix1001_rename_AFPrimaryPoint 2019-10-06 21:44:04 +02:00
Robin Mills
7844b11e4b
[xmpsdk] Add XMP Initialisation/Cleanup code to all main() programs
- update documentation
- Removed redundant calls to Exiv2::XmpParser::terminate() (legacy of our
  discusssion with @tester0077).
- this fixes #976
2019-10-05 10:19:53 +02:00
clanmills
1b917c3f7d Fix #1011 fix_1011_jp2_readmetadata_loop 2019-10-05 07:50:59 +02:00
clanmills
4cf040ac4a
Install man page from man/man1/exiv2.1 2019-09-15 23:00:07 +02:00
clanmills
90f9f0bc19
Add support for Exif.Canon.AF tags to be read from images
This PR (and fix981_canonAutoFocus2) use a decoder listed in TiffMappingInfo to
decode Exif.Canon.AFInfo. The decoding function "manufactures" Exif tags such as
Exif.Canon.AFNumPoints from the data in Exif.Canon.AFInfo. These tags must never
be written to file and are removed from the metadata in
exif.cpp/ExifParser::encode().

Three of the tags created (AFPointsInFocus,AFPointsSelected, AFPrimaryPoint) are
bitmasks. As the camera can have up to 64 focus points, the tags are a 64 bit
mask to say which points are active. The function printBitmask() reports data
such as 1,2,3 or (none).

This decoding function decodeCanonAFInfo() added to TiffMappingInfo manufactures
the new tags. Normally, tags are processed by the binary tag decoder and that
approach was taken in branch fix981_canonAf. However, the binary tag decoder
cannot deal with AFInfo because the size of some metadata arrays cannot be
determined at compile time.
2019-09-14 11:28:18 +02:00
sat3ll
d59d929eb2
add ID for Sigma APO MACRO 180mm F3.5 EX DG (nikon)
(cherry picked from commit 9852e21761d962a7deb1e5e9673b3b5f5018dbfb)
2019-08-28 13:53:06 +02:00
Marek Kubica
515569030b Remove AF designator from Tamron 70-200 G1
This removes the AF from the name of the lens thus matching the name
that lensfun and exiftool determine.

(cherry picked from commit a573f9795baa1cf8a68296a80114fdc575f84319)
2019-08-27 22:12:59 +00:00
Kevin Backhouse
edb4bf78ca Add bounds check to MemIo::seek(). (#944)
- Regression test for missing bounds check in MemIo::seek()
- Add bounds check to MemIo::seek(), this fixes CVE-2019-13504

(cherry picked from commit bd0afe0390439b2c424d881c8c6eb0c5624e31d9)

Additional fixes for 0.27:
- Add fix for the linux variant of MemIo::seek
- Change type of variable from unsigned to signed
2019-07-28 12:43:06 +02:00
Robin Mills
76d2798172 Pushing very helpful suggestion by @lantw44 2019-07-17 22:30:18 +02:00
clanmills
94a777609e fix947_FreeBSD_BasicError_typeinfo 2019-07-17 22:30:18 +02:00
Luis Díaz Más
e925bc5add Fix integer overflow by checking size against header_size
Note that the problem occurs when data_size is less than header_size
what causes a buffer overflow in &data[i]

Co-Authored-By: D4N <dan.cermak@cgc-instruments.com>
2019-07-15 22:35:51 +02:00
Luis Diaz Mas
c4bfd0f0f1 Remove linkage with -ldl
The code using dlopen/dlclose/etc was removed from version.cpp in the past
2019-07-13 08:01:30 +02:00
Luis Díaz Más
113136e134 Replace DEBUG with EXIV2_DEBUG_MESSAGES
Fixes #926
2019-07-12 11:14:35 +02:00
Kevin Backhouse
cb7dc5a528 Check for integer overflows in mrwimage.cpp 2019-07-05 15:41:14 +01:00
Robin Mills
ab375fb074 Add support for FocusPosition in Sony RAW files (#906)
* Fix 582 Add support for FocusPosition in Sony RAW files
* Thanks to @boardhead sonyFpCrypt() works correctly. Removed debug code. Fixed typos.
* Update doc/templates/Makefile to process Sony2Fp
* Following review by @boardhead. Renamed sonyFpCrypt() as sonyTagDecipher().
* Fixed writing the tag thanks to @boardhead explaining encipher/decipher.
  Sadly, ArrayCfg/crpyt does not know if he's encrypting/decrypting.
  I've added a sniff in TiffEncoder::visitBinaryArrayEnd to avoid changing the API.
* Added URL to discussion concerning sonyTagCipher()
* make sonyTagCipher() a static function with no external visibility.
2019-06-26 21:36:59 +02:00
Robin Mills
0a47d93ccf Add README-SAMPLES.md and remove exiv2samples.1 (#921)
* Add README-SAMPLES.md and remove exiv2samples.1
* Remove samples man page from CMake
* Add all sample programs to Doxygen.
* Adding links to source code on exiv2.org

Authored-By: Robin Mills <robin@clanmills.com>
Authored-By: Luis Díaz Más <piponazo@gmail.com>
2019-06-25 23:06:39 +02:00
Luis Díaz Más
df5054b910
Merge branch '0.27-maintenance' into 0.27-use-libssh-config 2019-06-24 07:45:56 +02:00
Andreas Sturmlechner
e85ce17fc9
Switch to libssh's own libssh-config.cmake
This is provided by libssh since 2013.
2019-06-23 19:50:01 +02:00
Andreas Sturmlechner
6819f2ac45
Fix install path of exiv2ConfigVersion.cmake
This seems to have been caused by duplicate work between master branch
and 0.27-maintenance branch, as commit 3b48249eeb350301dfb3efa3ba6f7d7b162455be
had already got that right.
2019-06-23 19:32:29 +02:00
Robin Mills
db3a260167 Changes following code review. 2019-06-18 21:29:55 +02:00
Robin Mills
b6f82a8f58 Change byte order in nikonAf22Cfg to invalidByteOrder (see #880 and #885). 2019-06-18 21:29:55 +02:00
Robin Mills
bd1e7522c2 Simplification of TiffDecoder::decodeTiffEntry(). 2019-06-18 21:29:55 +02:00