Commit Graph

7692 Commits

Author SHA1 Message Date
Luis Díaz Más
a11e198e64
Merge pull request #618 from piponazo/fix597
Fix #597
2019-01-25 17:11:52 +01:00
Luis Diaz Mas
127c2eac0e Fix warnings on MSVC 2019-01-25 08:12:59 +01:00
Luis Díaz Más
704fc56d52 Keep the profileName from readMetadata and use it in writeMetadata 2019-01-24 23:16:25 +01:00
Luis Díaz Más
e385599067 Refactoring to make the doe more readable. Fix icc tests 2019-01-24 22:30:30 +01:00
Luis Díaz Más
436b0f87b5 Add missing header when -DDEBUG is present 2019-01-24 21:28:49 +01:00
Luis Díaz Más
d1097fab59 Factor our function to read PNG Chunk info 2019-01-24 21:21:47 +01:00
Luis Díaz Más
914a8c5585 Factor out exception throw in different places inside isPngType 2019-01-24 18:52:38 +01:00
Luis Diaz Mas
88f22e13cb Fix ICC profile in PNG images 2019-01-21 23:10:12 +01:00
Luis Díaz Más
2aaefbaf71
Merge pull request #660 from piponazo/InstallCompilerDetectionHeader
Install new file exiv2lib_compiler_detection.h
2019-01-18 17:27:53 +01:00
Luis Diaz Mas
6abdb7e77a Install new file exiv2lib_compiler_detection.h 2019-01-18 15:29:35 +01:00
Luis Díaz Más
c558625faa
Merge pull request #617 from piponazo/DeprecateRelics
Deprecate relics
2019-01-15 14:35:31 +01:00
Luis Diaz Mas
eca3eb711a Do not tread deprecation warnings as errors 2019-01-15 13:02:34 +01:00
Luis Díaz Más
9bfb1155b2 Appveyor: drop VS2008 which has problems with WriteCompilerDetectionHeader 2019-01-15 13:01:23 +01:00
Luis Diaz Mas
25bfeb4245 Print deprecation warning in CMake report 2019-01-15 13:01:23 +01:00
Luis Diaz Mas
42d79e87aa Deprecate SshIo, Video, EPS and SSH classes 2019-01-15 12:58:06 +01:00
Luis Diaz Mas
9d62998973 cmake: compile video sources conditionally 2019-01-15 12:58:06 +01:00
Luis Diaz Mas
0e02d46aa8 CMake: add mechanism to deprecate code 2019-01-14 18:52:25 +01:00
Luis Díaz Más
c383abfdb2
Merge pull request #657 from Exiv2/fix604_0.27
Fix #604 (0.27)
2019-01-13 11:06:38 +01:00
Luis Diaz Mas
dbed8472b9 conan: update gtest version and way in which we create the conan profile
- use default profile
- Use libstc+11 for the conan profile
- gtest-1.8.0 for MSVC < 12.
2019-01-13 10:11:00 +01:00
Luis Diaz Mas
598646943a travis: move images from trusty to xenial 2019-01-13 08:12:40 +01:00
Luis Díaz Más
4a9667071e conan: do not bring libcurl on Mac OSX 2019-01-12 23:19:08 +01:00
Luis Díaz Más
798396e71a cmake: use CONAN_PKG::OpenSSL only if NOT APPLE 2019-01-12 23:18:54 +01:00
Luis Diaz Mas
06c41eab35 conan: update conan version to 1.11.2 2019-01-12 23:18:44 +01:00
Luis Díaz Más
635f21e4f7 conan: update libcurl version 2019-01-12 23:16:51 +01:00
Luis Díaz Más
08478c3217 Fix SSL linking issues on Windows 2019-01-12 23:16:26 +01:00
Luis Diaz Mas
b26d43358b appveyor: enable webready/curl 2019-01-12 23:16:11 +01:00
Luis Diaz Mas
0810af3ea5 travis: enable webready/curl 2019-01-12 23:15:19 +01:00
Luis Díaz Más
4fa2bc7008 Propagate CURL linkage when it is enabled 2019-01-12 23:13:24 +01:00
Luis Díaz Más
2432b7a057
Merge pull request #652 from Exiv2/ExportBasicErrorSpecializations_0.27
Export basic error specializations 0.27
2019-01-12 19:48:43 +01:00
Luis Díaz Más
04c9b181cc Fix #644. Export specializations of BasicError
- Only export BasicError::setMsg which is the only implementation present in the .cpp
- Only export BasicError specialization on __APPLE__

It seems that gcc automatically adds the attribute when the visibility
settings are set to hidden. See this link for more information:
https://reviews.llvm.org/D35388
2019-01-12 17:10:14 +01:00
Luis Díaz Más
3b43573536
Merge pull request #653 from Exiv2/PcFileFixes_0.27
Fixes in .pc file for being compatible with more distributions
2019-01-12 16:11:58 +01:00
Luis Diaz Mas
e706cca190 Fixes in .pc file for being compatible with more distributions 2019-01-12 13:39:12 +01:00
Luis Díaz Más
e07326fed8
Merge pull request #640 from Exiv2/IncludeExportFile_0.27
Include exiv2lib_export.h where needed and cleanup headers
2019-01-11 17:50:15 +01:00
Luis Diaz Mas
6f8d8e3da6 cleanup header inclusions in API 2019-01-11 15:55:25 +01:00
Luis Diaz Mas
4bd7e9ef1f Include exiv2lib_export.h in all public headers 2019-01-11 15:55:25 +01:00
Luis Díaz Más
95fd61b24e
Merge pull request #639 from Exiv2/ExpatAdapter-0.27
sync changes to ExpatAdapter from master to 0.27 (removes compiler wa…
2019-01-07 20:47:30 +01:00
Robin Mills
eebf6e982e
Merge branch '0.27' into ExpatAdapter-0.27 2019-01-07 14:04:21 +00:00
clanmills
c261db2b5f sync changes to ExpatAdapter from master to 0.27 (removes compiler warnings) 2019-01-07 11:47:03 +00:00
Luis Diaz Mas
acc9fa012d Reliable detection of strerror_r variants 2019-01-06 23:59:40 +01:00
Luis Díaz Más
13c066dbb0
Merge pull request #634 from cryptomilk/0.27
Fixes for installing exiv2
2019-01-06 09:50:16 +01:00
Andreas Schneider
189da93480 xmpsdk: Build with -DBanAllEntityUsage=1
Prevent a denial-service-attack related to XML entity expansion
("billion laughs attack").
See https://bugzilla.redhat.com/show_bug.cgi?id=888769

Search for BanAllEntityUsage in xmpsdk/src/ExpatAdapter.cpp

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit e44d1dbe769f3b60a3d671be310f4af4f9490e6b)
2019-01-05 13:08:49 +01:00
Andreas Schneider
ad95969a08 cmake: Use correct installation dir for generated docs
Fixes #623

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit f8f63a8b4033549d47384c6e2b1972ae1a2775fc)
2019-01-05 13:08:49 +01:00
Andreas Schneider
ed3a0f1341 cmake: Install header files without globbing
Fixes #627

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 0b34ccb9a3b26cd1c5267c6a5c15e9fa1a665adb)
2019-01-05 13:08:49 +01:00
Andreas Schneider
6062b1b803 cmake: Rename xmp to exiv2-xmp to avoid name conflicts
There is already a libxmp file by the xmp project on https://xmp.sf.net.
To avoid issues prefix with exiv2.

Fixes #624

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 89509d7a3915ba474cbc3f8c85ab9bec4954ceda)
2019-01-05 13:08:49 +01:00
Luis Díaz Más
661e3fa4bf
Merge pull request #630 from Exiv2/CanonLensesIds_0.27
Canon lenses ids 0.27
2019-01-04 11:05:08 +01:00
Alexander Steffen
8453ef0466 Add Tamron SP 24-70mm f/2.8 Di VC USD G2 for Canon
Fixes #330.
2019-01-04 09:41:14 +01:00
Alexander Steffen
f586d57bb1 Add various Sigma and Canon lenses 2019-01-04 09:41:06 +01:00
Alexander Steffen
cf4f14c67b Add new IDs for Sigma lenses with firmware 2.00
The firmware update changed the IDs, so that the same lens may now be known
under different IDs.
2019-01-04 09:40:58 +01:00
Luis Díaz Más
2b59f5be32
Merge pull request #616 from piponazo/FixMuslLibc_0.27
Fix musl libc 0.27
2018-12-25 16:36:34 +01:00
Natanael Copa
63f1fde85b Fix path for errno.h
Fix warnings when built with musl libc by using the correct path for
errno.h as defined in POSIX.

Fixes the following warning:
In file included from /home/ncopa/src/exiv2/src/http.cpp:74:
/usr/include/sys/errno.h:1:2: warning: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Wcpp]
 #warning redirecting incorrect #include <sys/errno.h> to <errno.h>
  ^~~~~~~
2018-12-25 16:09:00 +01:00