Robin Mills
3c01ad78f3
Merge branch '0.27-maintenance' into fix_1069_0.27
5 years ago
clanmills
571d056222
fix_1091_0.27
5 years ago
clanmills
9333f0d3f5
fix_1069_0.27 #1069
5 years ago
clanmills
d0d6ff2e9b
fix_1059_0.27
5 years ago
clanmills
c49cdd6395
Code changes.
5 years ago
clanmills
18ed65a25f
fix_Sony2010e_0.27 Thanks to @sridharb1
5 years ago
clanmills
a7683f95a7
Detab src/pentaxmn_int.cpp
5 years ago
Robin Mills
0fe6817177
Merge branch '0.27-maintenance' into fix_1084_0.27
5 years ago
clanmills
8f15784314
fix_1084_0.27
5 years ago
Robin Mills
8382225850
Merge branch '0.27-maintenance' into fix_1099_0.27
5 years ago
Robin Mills
2956309afd
Merge branch '0.27-maintenance' into fix_1099_0.27
5 years ago
clanmills
7658d8aefd
fix_macOS_0.27
5 years ago
clanmills
698b418f73
fix_1097_0.27
5 years ago
clanmills
82087b58e4
fix_1099_0.27
5 years ago
dbeichl
188ddab7cc
Merge branch '0.27-maintenance' into 0.27-maintenance-makernote-update
5 years ago
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
5 years ago
Daniel Beichl
529fa8770f
Add nikon 153 point phase af
5 years ago
Daniel Beichl
b45c82e091
Add some values to panasonic focus mode attribute
5 years ago
Robin Mills
cfdd1c7b3f
Pointless change to trigger CI which is beefing about test_issue_987 which has been removed.
5 years ago
Robin Mills
8de479f83e
Merge branch '0.27-maintenance' into fix1001_rename_AFPrimaryPoint
5 years ago
clanmills
db1be4ae8e
fix_1046_pt-GPSProcessingMethod
5 years ago
Fredrik Strandin
5360d82c4a
Add ID for Tokina atx-i 11-16mm F2.8 CF (Nikon)
...
Fixes #1078
(cherry picked from commit 2870a1648e86b777afa0ae1540ea4791482d1354)
6 years ago
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
6 years ago
David-Tillmann Schaefer
b8bf9cc4fd
changes comma in aperture to dot to match the other exif entries
...
(cherry picked from commit 054bc9068b3c4e83be97e42d1a8c9829c2c83e1b)
6 years ago
derselbst
70b0c17421
Fix a memory leak in CiffHeader::read()
...
Memory for pPadding_ was allocated with new[] .
6 years ago
derselbst
ccf4b59c91
Merge remote-tracking branch 'origin/0.27-maintenance' into fix1001_rename_AFPrimaryPoint
6 years ago
Luis Díaz Más
20a9e5affe
Fix format-overflow warnings by using bigger buffer
6 years ago
clanmills
8859209b95
fix_1004_lens_exiftool_compatibility
6 years ago
Robin Mills
4852bd2ab2
fix_910_remote_io_block+1
6 years ago
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)
6 years ago
Robin Mills
05538ebea2
fix1001_rename_AFPrimaryPoint
6 years ago
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
6 years ago
clanmills
1b917c3f7d
Fix #1011 fix_1011_jp2_readmetadata_loop
6 years ago
clanmills
4cf040ac4a
Install man page from man/man1/exiv2.1
6 years ago
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.
6 years ago
sat3ll
d59d929eb2
add ID for Sigma APO MACRO 180mm F3.5 EX DG (nikon)
...
(cherry picked from commit 9852e21761d962a7deb1e5e9673b3b5f5018dbfb)
6 years ago
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)
6 years ago
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
6 years ago
Robin Mills
76d2798172
Pushing very helpful suggestion by @lantw44
6 years ago
clanmills
94a777609e
fix947_FreeBSD_BasicError_typeinfo
6 years ago
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>
6 years ago
Luis Diaz Mas
c4bfd0f0f1
Remove linkage with -ldl
...
The code using dlopen/dlclose/etc was removed from version.cpp in the past
6 years ago
Luis Díaz Más
113136e134
Replace DEBUG with EXIV2_DEBUG_MESSAGES
...
Fixes #926
6 years ago
Kevin Backhouse
cb7dc5a528
Check for integer overflows in mrwimage.cpp
6 years ago
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.
6 years ago
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>
6 years ago
Luis Díaz Más
df5054b910
Merge branch '0.27-maintenance' into 0.27-use-libssh-config
6 years ago
Andreas Sturmlechner
e85ce17fc9
Switch to libssh's own libssh-config.cmake
...
This is provided by libssh since 2013.
6 years ago
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.
6 years ago
Robin Mills
db3a260167
Changes following code review.
6 years ago
Robin Mills
b6f82a8f58
Change byte order in nikonAf22Cfg to invalidByteOrder (see #880 and #885 ).
6 years ago
Robin Mills
bd1e7522c2
Simplification of TiffDecoder::decodeTiffEntry().
6 years ago
Robin Mills
b02c80f7e4
fix646_NikonAF22
6 years ago
Luis Diaz Mas
43ed51f609
DLL information depends now on proper definition
6 years ago
clanmills
d8a513b7df
Updated following code review.
6 years ago
clanmills
742cd5885b
Fixing Windows build-breaker for EXV_UNICODE_PATH in `Protocol fileProtocol(const std::wstring& path)`
6 years ago
clanmills
ab0b97c729
fix895-ICCProfile-FalseWarning
6 years ago
Robin Mills
5a3afa9cbe
Update man page src/exiv2.1 to clarify overwrite policy with command rename
...
This fixes #662
6 years ago
sat3ll
2beefab719
Add Tamron SP 70-300mm f/4-5.6 Di VC USD (Model: A030) (Nikon Mount)
...
(cherry picked from commit 1640ac8d0ca8bbb975f7a986bf0537545423fffc)
6 years ago
Robin Mills
2451e7ba56
fix880_NikonEndian
6 years ago
clanmills
b1ed1bf246
fix743_NikonSigmaArtLens
6 years ago
Kevin Backhouse
b35c43e7c2
Remove call to atol, which might read off the end of the buffer. ( #870 )
6 years ago
Kevin Backhouse
9092b422e6
Prevent out-of-bounds read. ( #868 )
6 years ago
Kevin Backhouse
6068df4c01
Add better bounds checking in PngImage::printStructure(). ( #862 )
6 years ago
Kevin Backhouse
109d5df7ab
Check bounds of jpg_img_off and jpg_img_len. ( #858 )
6 years ago
Kevin Backhouse
1c1436e94e
Add bounds check of resourceSize. ( #856 )
6 years ago
Kevin Backhouse
80cd0d2990
Add bounds check on allocation size. ( #854 )
6 years ago
Kevin Backhouse
81ae213c71
Check bounds of allocation size. ( #848 )
6 years ago
Kevin Backhouse
7798ae2557
Throw an exception if the data location is invalid. ( #842 )
6 years ago
Kevin Backhouse
8dc87a1214
Add bounds check. ( #840 )
6 years ago
Kevin Backhouse
43f154f44b
Merge two enforces into one.
6 years ago
Kevin Backhouse
d3e69f6d2c
Add bounds check on allocation size.
6 years ago
Kevin Backhouse
c0ecc2ae36
Avoid integer overflow.
6 years ago
Robin Mills
f4a37c63f2
version.cpp Pragma removed. Platform includes simplified.
...
cmake/packaging.cmake Changed comment about VS version numbers
6 years ago
Robin Mills
b8af098285
Removed redundant _MSC_VER pragma to link psapi as the link is specified in CMakeLists.txt.
...
Simplified the platform include files required to support getLoadedLibraries()
6 years ago
Robin Mills
955962eaa8
Code revisions after review by @piponazo
6 years ago
Robin Mills
b0a9cb5624
NetBSD/FreeBSD Support
6 years ago
Kevin Backhouse
6a44698abc
Small change to comment.
6 years ago
Kevin Backhouse
3c818f49d9
Revert accidental whitespace change.
6 years ago
Kevin Backhouse
3faeaefbf5
Improve portability of bounds checks.
6 years ago
Kevin Backhouse
86816c0280
Fix signed/unsigned mismatch.
6 years ago
Kevin Backhouse
caa4e6745a
Avoid negative integer overflow when `filesize < io_->tell()`.
...
This fixes #791 .
6 years ago
clanmills
db870755b9
fix #818 . Restore 0.25 behaviour of `$ exiv2 -g image ...` to apply grep to keys.
6 years ago
Kevin Backhouse
8cd95e2218
Avoid negative integer overflow when `chunkLength == 0`.
...
This fixes #789 .
6 years ago
Luis Díaz Más
f05d100579
CURL lib and include directories private for exiv2lib
...
(cherry picked from commit 5d64a0b11c5a45dd9d58c56e946301f3f98942a7)
6 years ago
Kevin Backhouse
6fa2e31206
Avoid negative integer overflow when `iccOffset > chunkLength`.
...
This fixes #790 .
6 years ago
Robin Mills
fe3f3248dd
Fix in sidecar files #589
6 years ago
Kevin Backhouse
ae20c30805
Avoid null pointer exception due to NULL return value from strchr.
...
This fixes #793 .
6 years ago
Robin Mills
78676b2a02
Fix #798
6 years ago
Robin Mills
7a9c928efb
Fix to exiv2.1 man page for v0.27.1
6 years ago
Robin Mills
514ae0fa89
Fix #780
6 years ago
Luis Díaz Más
51f3910413
[jp2image] Limit data representation to 30 bytes
...
- fixes #744
6 years ago
D4N
adfc01f2e0
Update tests/bugfixes/github/test_issue_742.py
...
Co-Authored-By: piponazo <piponazo@gmail.com>
(cherry picked from commit 39d8904696338d5bd4a9c7e9a96a798a791d0973)
6 years ago
Luis Diaz Mas
25ddbaa6c0
Make subBox.length check in jp2image.cpp more robust
...
(cherry picked from commit a154b992ccad71a7d95a94cdedb933fa66a51b61)
6 years ago
Luis Díaz Más
8c81e1146c
clang-format Jp2Image::printStructure()
...
(cherry picked from commit b6e4ca0a8cfff1ad0f6040901382863cccee33cb)
# Conflicts:
# src/jp2image.cpp
6 years ago
Luis Díaz Más
051b5d9df1
Fix #742 by detecting incorrect subBox size
...
(cherry picked from commit 1bdd3eab5ebdde324dbfecc3fb6d6495b32d2e4d)
6 years ago
Dan Čermák
5e6c2855ce
[NikonMakerNote] Fix overread in Nikon1MakerNote::print0x0088
...
This function was printing the string from the array of strings nikonFocusArea,
but it wasn't verifying that the array index is actually valid.
Now this function will output "Invalid value" instead of crashing.
6 years ago
clanmills
282e99b6b0
Fix #610
...
(cherry picked from commit 54367e18ed0bf8bae6d8449341a6f82779f6d3c7)
6 years ago
Luis Díaz Más
9296067b95
Fix access to null pointer in TiffParser
6 years ago
Luis Díaz Más
4265ac5e0f
exiv2-xmp linked privately
6 years ago