Commit Graph

5216 Commits

Author SHA1 Message Date
Jonathan
2ff0bb9a6a Fix URL to wiki in README.md 2017-10-09 18:01:27 +02:00
Luis Díaz Más
0670b35f56 Merge pull request #111 from piponazo/travisCache
Travis cache
2017-10-08 09:12:03 +02:00
Luis Diaz Mas
f454c375a0 Disable bash -ex to not fail with commands returning non-0 values 2017-10-07 19:47:30 +02:00
Luis Díaz Más
1067978216 Adding caching support in travis-ci builds 2017-10-07 19:39:26 +02:00
Luis Díaz Más
4beb08e219 Merge pull request #105 from Kicer86/bigtiff
Work in progress - improvements for bigtiff
2017-10-07 09:38:49 +02:00
Michał Walenciak
2e535d8a27 trying to fix windows build 2017-10-07 08:58:58 +02:00
Luis Díaz Más
8e4aff29c2 Merge pull request #107 from D4N/tiffvisitor_nullptr_check
Use nullptr check instead of assertion, by Raphaël Hertzog
2017-10-06 15:57:55 +02:00
Michał Walenciak
2402a693fd adding missing include for numeric_limits 2017-10-06 11:27:46 +02:00
Luis Díaz Más
93bbf0cab1 Merge pull request #104 from piponazo/removeCpp11Feature
Remove cpp11 features
2017-10-06 05:40:39 +02:00
Dan Čermák
e026160556 Use nullptr check instead of assertion, by Raphaël Hertzog
Source:
https://github.com/Exiv2/exiv2/issues/57#issuecomment-333086302

tc can be a null pointer when the TIFF tag is unknown (the factory
then returns an auto_ptr(0)) => as this can happen for corrupted
files, an explicit check should be used because an assertion can be
turned of in release mode (with NDEBUG defined)

This also fixes #57
2017-10-06 00:43:31 +02:00
Luis Díaz Más
bef6dad6c5 Merge pull request #103 from AdelieLinux/master
Amend fix for #9 to apply to other Unix systems
2017-10-05 14:45:05 +02:00
Michał Walenciak
b1a5d615c5 removing debug message 2017-10-04 22:46:43 +02:00
Michał Walenciak
64e05c0a7a improving fixes for #55 and #56 2017-10-04 22:46:20 +02:00
Luis Díaz Más
1a1a61b63d Remove reference to regex & c++11 from the man page 2017-10-04 19:42:11 +02:00
Luis Díaz Más
5b8894908b Remove all references to EXV_HAVE_REGEX and related code 2017-10-04 19:27:01 +02:00
Luis Díaz Más
bfd61bd0f1 Merge pull request #96 from Kicer86/master
Adding comment for issue #56
2017-10-04 09:27:54 +02:00
A. Wilcox
d775683f57
Amend fix for #9 to apply to other Unix systems
At least the musl libc on Linux has the same issue as Mac OS X: the
PTHREAD_RECURSIVE_* static initialiser does not exist.  This is a
documented and purposeful omission:

http://www.openwall.com/lists/musl/2017/02/20/3

This commit uses similar logic to the Apple test on other Unixes.
2017-10-04 00:17:48 -05:00
Luis Díaz Más
6db39b08a5 Merge pull request #102 from piponazo/removeObjectLibrary
Remove EXIV2_ENABLE_LIBXMP variable, always build static XMP library,…
2017-10-04 07:15:51 +02:00
Luis Díaz Más
3dbc7c1969 Fix compilation on Windows 2017-10-03 21:07:43 +02:00
Luis Diaz Mas
2784b1f7f7 Remove EXIV2_ENABLE_LIBXMP variable, always build static XMP library, remove cmake OBJECT library 2017-10-03 19:54:57 +02:00
Robin Mills
d9e9f71918 Merge pull request #98 from D4N/testsuite
Add POC3, POC4, POC5, POC6, POC9, POC11, POC12 & POC13 to the test suite
2017-10-03 01:28:27 +01:00
Dan Čermák
751905ccde Add POC3, POC4, POC5, POC6, POC9, POC11, POC12 & POC13 to the test suite
These are files which reproduce the github issues #50, #51, #52, #53,
 #54, #58, #59 and #60
2017-10-03 00:27:20 +02:00
Michał Walenciak
7e90668011 Adding comment for issue #56 2017-10-02 21:45:05 +02:00
Luis Díaz Más
df3c77516c Merge pull request #94 from piponazo/configFileInBuildDirectory
Generate exv_conf.h file out of the source tree.
2017-10-02 11:38:22 +02:00
Luis Díaz Más
a9e3f17f31 Generate exv_conf.h file out of the source tree. Install it in the include folder. 2017-10-02 10:29:36 +02:00
Luis Díaz Más
4f4add2cdc Merge pull request #89 from piponazo/ExportConfigFile
Add exiv2Config file that is automatically generated by CMake
2017-10-02 07:41:32 +02:00
Luis Díaz Más
4a519c8917 Merge pull request #90 from piponazo/removeUselessCMakeVariable
Remove useless HAVE_XMP_TOOLKIT
2017-10-01 20:05:21 +02:00
Luis Díaz Más
0448415ff2 Remove useless HAVE_XMP_TOOLKIT 2017-10-01 18:48:27 +02:00
Luis Díaz Más
686edde5ef Provide exiv2Config file automatically generated by CMake 2017-10-01 18:21:52 +02:00
Luis Díaz Más
30e76211b2 Remove hand-made FindExiv2.cmake that was out of date 2017-10-01 18:21:20 +02:00
Luis Díaz Más
c9afa0a3ee Merge pull request #87 from piponazo/fixCMakeWindowsBuild
Fix the default configuration CMake+Windows
2017-10-01 17:24:14 +02:00
Luis Díaz Más
96bb10f38e Fix the default configuration CMake+Windows 2017-10-01 16:39:39 +02:00
clanmills
327b3f6c4d Fix https://github.com/Exiv2/exiv2/issues/83 2017-09-29 13:59:12 +01:00
clanmills
c48f7c8e5b Fix https://github.com/Exiv2/exiv2/issues/57 2017-09-29 13:48:14 +01:00
Robin Mills
1f71667b43 Jenkins maintenance 2017-09-29 13:23:51 +01:00
Robin Mills
907326673e Jenkins maintenance 2017-09-29 12:35:56 +01:00
Robin Mills
c71322bff7 Correction for buildbreaker in 2f010487 2017-09-29 11:04:17 +01:00
Robin Mills
2f0104879a Merge pull request #81 from piponazo/robinChanges
Robin changes
2017-09-29 10:15:21 +01:00
clanmills
d43cd82002 Fix #80 2017-09-29 10:01:22 +01:00
clanmills
7fa8d31302 #49 and #79 Thanks to Dan and Raffael for working with me on this. 2017-09-29 10:00:30 +01:00
Robin Mills
272fc46502 Merge pull request #79 from D4N/fix_76
Fixed wrong brackets: size*count + pad can overflow before the cast
2017-09-29 09:38:55 +01:00
Luis Díaz Más
8ad49f6d73 Robin changes in sync with master changes 2017-09-28 19:42:57 +02:00
Dan Čermák
74cb5bab13 Fixed wrong brackets: size*count + pad can overflow before the cast
=> Should fix #76 (most of the work has been done by Robin Mills in
   6e3855aed7)

The problem with #76 is the contents of the 26th IFD, with the
following contents:
tag: 0x8649
type: 0x1
count: 0xffff ffff
offset: 0x4974

The issue is the size of count (uint32_t), as adding anything to it
causes an overflow. Especially the expression:
(size*count + pad+20)
results in an overflow and gives 20 as a result instead of
0x100000014, thus the condition in the if in the next line is false
and the program continues to run (until it crashes at io.read).

To properly account for the overflow, the brackets have to be removed,
as then the result is saved in the correctly sized type and not cast
after being calculated in the smaller type.

The brackets have also been removed from bigtiffimage.cpp, where the
same issue is present.
2017-09-27 23:38:49 +02:00
Robin Mills
d8ae4484ae msvc support for bigtiffimage.cpp 2017-09-27 12:24:41 +01:00
Robin Mills
e1948c7ff9 msvc/bigtiffimage support 2017-09-27 11:17:11 +01:00
clanmills
6e3855aed7 Fix https://github.com/Exiv2/exiv2/issues/55 2017-09-27 09:20:13 +01:00
clanmills
ae253b95d1 Adding missing test file. 2017-09-26 22:54:49 +01:00
clanmills
9aad5cd6df Adding missing test file. 2017-09-26 22:53:45 +01:00
clanmills
e3298ab5e1 Integrating #55 and #78 2017-09-26 22:32:27 +01:00
Robin Mills
81f22c7335 Merge pull request #78 from D4N/gcc_fix
Added missing include for INT_MIN & INT_MAX constants
2017-09-26 22:27:53 +01:00