Commit Graph

2576 Commits

Author SHA1 Message Date
mfg92
97d7a04ea8 Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD A012' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'.
But there is no distinction between the F004 and the F017 Versions of the 90mm.
Fixed Bug #1306 and #1304 (partly)
2017-09-20 15:36:29 +02:00
Robin Mills
f9d0be42b5 Merge pull request #69 from marisn/master
Fix crash on undefined metadata on some Nikon images
2017-09-19 10:20:18 +01:00
clanmills
21ac4ac61a Test suite changes due to https://github.com/Exiv2/exiv2/pull/68 2017-09-19 10:17:46 +01:00
Māris Nartišs
591dea579a Fix crash on undefined metadata on some Nikon images.
Identical to commit:5405d61623e82896e498c5c8342dd6f42e689115
2017-09-18 23:37:40 +03:00
Michał Walenciak
dff941ad7f Do not print offset when it is used as tag's value 2017-09-18 22:32:52 +02:00
Tobias C. Berner
0ed456ca4d Use CMAKE_DL_LIBS instead of dl
cmake provides a wrapper to link against 'dl' which evalutes to nothing on FreeBSD and to dl on Linux for example.
https://cmake.org/cmake/help/v3.6/variable/CMAKE_DL_LIBS.html
2017-09-13 13:07:21 +02:00
clanmills
5405d61623 Fix http://dev.exiv2.org/issues/1305 2017-09-12 09:14:42 +01:00
Ray
ddbbbc7653 attempt to determine lens name from in:value object (represents lensID) when in:metadata == NULL 2017-09-07 18:51:03 +01:00
Luis Díaz Más
68d2c49fc5 Fix typo 2017-09-03 18:40:58 +02:00
Luis Diaz Mas
1af1ce0229 Fix CMake + Conan integration on Windows 2017-09-03 17:51:33 +02:00
Luis Diaz Mas
960335faea Use conan in travis 2017-09-03 16:35:41 +02:00
Luis Diaz Mas
2221a5c630 Make CMake code work with conan 2017-09-03 16:35:41 +02:00
clanmills
9586164a8f Fix: https://github.com/Exiv2/exiv2/issues/45 Thank You to Steve for reporting, providing the patch and giving feedback that modifying ~/.exiv2 worked. 2017-09-03 16:35:41 +02:00
Luis Díaz Más
dc79df8ee6 Only use CURL and SSH when their support is enabled 2017-09-03 16:35:41 +02:00
Luis Diaz Mas
c2350a3cb9 Make CMake code work with conan 2017-09-03 16:35:41 +02:00
Michał Walenciak
20582a93c6 Marking members in a proper way. 2017-09-02 08:02:00 +02:00
Michał Walenciak
4e25435afb Changing return type of Image::tagName to std::string 2017-09-02 08:00:07 +02:00
Michał Walenciak
ddb87fe0cf Moving static tagName() into Image class to prevent multithread crashes.
static variables inside of tagName() were not protected against multithread access.
It could cause a crash in case of simultaneous initialization of map of tags.
2017-09-01 18:29:51 +02:00
clanmills
0f72599121 https://github.com/Exiv2/exiv2/issues/45 Fixing blank line typo. 2017-08-30 15:32:28 +01:00
clanmills
cf36ff3372 Fix: https://github.com/Exiv2/exiv2/issues/45 Thank You to Steve for reporting, providing the patch and giving feedback that modifying ~/.exiv2 worked. 2017-08-29 21:09:44 +01:00
Luis Díaz Más
9761f0ee1f ICONV include directories only used by exiv2lib 2017-08-25 18:07:42 +02:00
Luis Díaz Más
31a51fda8a Replace EXIV2_ENABLE_SHARED by BUILD_SHARED_LIBS. Also use EXV_HAVE_DLL only for the exiv2lib target 2017-08-24 17:59:41 +02:00
Robin Mills
b5cac373b1 Merge pull request #39 from Exiv2/autotoolsMacLink
./configure --with-adobe[=2016|2014|2013] for MacOSX
2017-08-23 08:04:48 +01:00
Andreas Sturmlechner
a768b85191 Lowercase target_link_libraries 2017-08-22 18:21:28 +02:00
Andreas Sturmlechner
20c7ad6c59 Lowercase include{,_directories} 2017-08-22 18:21:28 +02:00
Andreas Sturmlechner
1fc319c0e4 Lowercase add_custom_target, configure_file, install macros 2017-08-22 18:21:28 +02:00
Andreas Sturmlechner
40565761d1
Lowercase add_{definitions,subdirectory}, set{_*} and option macros 2017-08-22 18:21:18 +02:00
Andreas Sturmlechner
06b20523f7 Lowercase if/else/endif/foreach/endforeach 2017-08-22 18:11:46 +02:00
clanmills
573b2cfcd2 XMPsdk fixes. 2013 and 2016 build and (mostly) pass the test suite. 2017-08-22 14:34:01 +01:00
clanmills
95c5e92365 Support for Adobe XMPsdk 2013. Build xmpsdk using Adobe scripts. 2017-08-22 09:30:41 +01:00
Luis Díaz Más
50fad7327c Merge pull request #33 from a17r/localedirundefined
LOCALEDIR is used by EXIV2_ENABLE_BUILD_PO so make sure it is defined
2017-08-22 08:20:58 +02:00
Luis Diaz Mas
90e8ad8a72 Only set CMAKE_RUNTIME_OUTPUT_DIRECTORY once 2017-08-21 23:24:19 +02:00
Luis Diaz Mas
3a45a375d8 Simplify CMake code related with PNG and ZLIB (ZLib is required is PNG=ON) 2017-08-21 23:21:57 +02:00
Luis Diaz Mas
c735bc5ae2 Relative paths to current directory 2017-08-21 23:20:04 +02:00
Luis Díaz Más
6a00d4b282 Move code from CMake_msvc.txt to config/compilerFlags.cmake 2017-08-21 22:39:26 +02:00
Luis Díaz Más
a2bb29011d Move compiler flags configuration to a new file (config/compilerFlags.cmake).
Also define the PSAPI_VERSION only for the exiv2lib target (It's not needed for the rest of targets)
2017-08-21 22:18:36 +02:00
Luis Díaz Más
3736707015 Merge branch 'master' into localedirundefined 2017-08-21 22:07:55 +02:00
Andreas Sturmlechner
a8e55c4d9e Drop LOCALEDIR, use CMAKE_INSTALL_LOCALEDIR directly
It is always properly defined by GNUInstallDirs. Otherwise it was
possible to install translations in / if EXIV2_ENABLE_NLS=OFF.

Thanks-to: Luis Díaz Más
2017-08-21 17:55:19 +02:00
Andreas Sturmlechner
b81f493024 Add option to disable tools (currently exiv2 binary)
In a multiarch build, one may want to build binaries only for native arch.
2017-08-21 17:20:59 +02:00
Andreas Sturmlechner
aa6374b202
Use more GNUInstallDirs
Conveniently fixes multiarch install dir issues.
2017-08-21 00:12:33 +02:00
Luis Diaz Mas
c415e7f509 Fix CMake configuration when XMP is disabled. Check XMP variable instead LIBXMP 2017-08-20 16:54:49 +02:00
Robin Mills
afba52e042 Remove include tags_int.hpp from include/exiv2/*video.hpp files 2017-08-18 13:52:05 +01:00
Luis Diaz Mas
35c3e31958 Fixes for MSVC case 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
27cde135d9 Remove more useless include_directories 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
93e603e031 Fix linking problems with pthreads 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
9808c3bf2d Simplify CMake code to identify FreeBSD systems 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
f5f5826c03 Use target_sources to extend the list of sources in exceptional situations 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
45807ca03d Do not include SSH and CURL include dirs globally. Do it properly for the exiv2lib target 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
c50702612d Simplify CMake code for handling SSH and CURL cases 2017-08-18 13:55:45 +02:00
Luis Díaz Más
57cd78b517 Put all the CMake related with the exiv app together 2017-08-18 13:55:45 +02:00