3121 Commits (f61fa2ed9d4fee90d7c1d1930b64dd5761673dd5)

Author SHA1 Message Date
Luis Díaz Más de5b9ebf89 Remove duplication of sources in src/CMakeLists.txt 7 years ago
Luis Díaz Más ffbcaa2e6d Fix MSVC warning C4267: conversion from 'size_t' to 'long' 7 years ago
Luis Díaz Más bd40c18f1c Use variable in TimeValue::copy to remove -Wunused-variable warning 7 years ago
Luis Diaz Mas a246c73d6f Use unused variable instead of hard-coded values in DateValue::copy 7 years ago
Luis Díaz Más bf7047a71b clang-format XmpKey code 7 years ago
Luis Diaz Mas 07d75cd0e8 Check if ExifData::findKey return valid iterators 7 years ago
Luis Díaz Más 858c99b4df Add enforce before calling REPORT_MARKER with invalid marker 7 years ago
Freddie Witherden 97a7924340 Update Nikon lens database. 7 years ago
Luis Díaz Más 5e5d76ad0a clang format function 7 years ago
Dan Čermák 3c20cc06a9 Fix CVE-2017-1000126
CVE-2017-1000126 is a Stack out of bounds read in the WebP parser caused by the
parameter size & filesize being too large, causing the parser to land in an
infinite loop and eventually crash. Enforcing that the size over which the
parser iterates is smaller than the file fixes this issue.

This fixes #175.
7 years ago
Dan Čermák 49db96cd58 [webp] Fix wrong filesize parameter being extracted from the header
The webp header contains the filesize of the image starting at the 8th byte in
bytes 4 to 8 encoded as a little endian 32 bit unsigned integer. The code was
erroneously assuming that the extracted filesize is starting at the 12th byte,
i.e. at the end of the WebP file header.

Source: https://developers.google.com/speed/webp/docs/riff_container
7 years ago
Dan Čermák 5de9a7b562 Add a port of enforce() from D
enforce is a function comparable to assert(), it ensures that a condition is
true. However, while assert() should be used for conditions where we can be
certain that they are true, enforce is intended to be used for conditions that
can fail (like on invalid input). Therefore enforce() throws an exception when
the condition is false and does not abort the program's execution. Also, it is
not turned off by defining NDEBUG.

- add a new file enforce.hpp
- implement enforce()
7 years ago
HumanDynamo 22a0b32c01 Fix typo of Xmp.video.AspectRatio's value type 7 years ago
Luis Díaz Más 01a5d863ad Apply clang-format to Print::printMetadatum 7 years ago
Luis Díaz Más 45fe44aa2f Move condition in if statement to discard work earlier 7 years ago
Luis Díaz Más d82b9434e1 Only print items (Params::prValue) when size > 0 7 years ago
Robin Mills 185d0e9482 #199 Fix for getopt(). Use src/getopt_win32 code instead of libc/getopt() 7 years ago
Dan Čermák 06ec1e6984 [safe_op] Refactored addition overflow checks using functions only
- templated structs were not required, SFINAE works for functions too
  => use instead, removes some unneeded code
- fix non-usage of builtins with clang
- adjust unit tests
7 years ago
Dan Čermák 684c8c89de [safe_op] Simplified unsigned int overflow check
Simply check for overflows after the addition, as no undefined behavior can
occur here.
7 years ago
Dan Čermák 31b96b58e7 [safe_op] improved signed int overflow checks via integer promotion
The fallback signed integer overflow check is quite expensive, but the addition
can be safely performed when saved in an int due to integer promotion
rules. This makes the check a little less expensive.
7 years ago
Dan Čermák 029b997ca0 [safe_op] fixed typo in doc-comment 7 years ago
Dan Čermák 751fba8b54 Added dataBuf size check before calling PngChunk::decodeIHDRChunk
- cdataBuf must be at least 8 bytes long otherwise decodeIHDRChunk
  reads out of bounds
- pngImage::readMetadata now skips png chunks where the offset for
  IHDR chunks is invalid
- added assertion into PngChunk::decodeIHDRChunk() to ensure dataBuf
  size
7 years ago
Fredrik lingvall fc8b45dd12 Added the Sigma 120-300mm F2.8 DG OS HSM | S for Nikon mount. 7 years ago
Fredrik lingvall 34a3be025e Added Sigma 50mm F1.4 DG HSM | A mount/UPC code (for Nikon mount). 7 years ago
Fredrik Lingvall 215227024d Added Sigma 20mm F1.4 DG HSM | A mount/UPC code (for Nikon mount). 7 years ago
Dan Čermák efe2ccdcb6 Replaced all hardcoded error codes with ker... constants 7 years ago
Dan Čermák d3c3c036b8 Incorporated error codes into errList 7 years ago
Robin Mills 55001c8ddf
Merge pull request #222 from Exiv2/fix-220
Fix 220
7 years ago
Dan Čermák fcb4257051 Add check for DataBuf.size_ in Jp2Image::readMetadata()
When parsing a subBox that is a ColorHeader, a length is extracted
from the input file and fed directly into DataBuf() (which calls
malloc). A crafted input file can provide arbitrarily (up to
max(uint32_t)-8) large values and result in excessive memory
allocation.

This commit adds a check for the new size of DataBuf so that it is not
larger than the remaining size of the file.

This fixes #202 aka CVE-2018-4868
7 years ago
Robin Mills a1f1989cb5
Merge branch 'master' into master 7 years ago
clanmills c082537967 Fix #220 https://github.com/Exiv2/exiv2/issues/220 8 years ago
Dan Čermák 4429b962e1 Fix out of bounds read in src/pngchunk_int.cpp by @brianmay
- consider that key is advanced by 8 bytes if stripHeader is true
  => length is reduced by same amount
  Fixed by adding offset to the check in the loop
- Rewrote loop so that keysize is checked before the next
  iteration (preventing an out of bounds read)
8 years ago
Robin Mills df4113b765 changes to MemIo::reserve() for #200 (#213)
* changes to MemIo::reserve() for #200

* Changes following review by Dan (thanks, Dan).
8 years ago
Michał Walenciak d219e61586 be more error prone 8 years ago
Michał Walenciak 24348e85ca checks for valid reads 8 years ago
Michał Walenciak 421c6d6723 improvements for issue #208 8 years ago
Michał Walenciak 1647908e00 fix for crash in bigtiff (issue #208) 8 years ago
Robin Mills 7d42da94d0 Removed wrong ExifData::const_iterator that shadowed the correct one 8 years ago
Luis Díaz Más 00f32316b2 Add missing header 8 years ago
Luis Díaz Más 14ff034fb4 Catch std::overflow_error exception in Print::run 8 years ago
Luis Diaz Mas d09c4bb7cd Fix arithmetic operation overflow 8 years ago
Luis Díaz Más a1023c39ab Add safe_op.hpp to LIBEXIV2_PRIVATE_HDR (to be shown in IDEs) 8 years ago
Dan Čermák 7c00e9128d Fix compilation error with gcc < 5
- overflow builtins were added with gcc 5.0
8 years ago
Dan Čermák ca7c699aa1 Added overflow safe addition function 8 years ago
Robin Mills 8f5b795eaa Fixes to autotools build to respect mn_int.cpp files (#186)
* Fixes to autotools build to respect mn_int.cpp files

* Changes following Luis' code review.
8 years ago
Luis Díaz Más f36bea3801 exiv2::getEnv throws std::out_of_range on unexpected EnVar
This change define explicitly the behavior that exiv2::getEnv should have
on response to unexpected inputs.

There are some other minor changes:

- Use _putenv_s for the unit tests on Windows
- Add todo comment
- Remove deprecated note about freeing memory
8 years ago
Luis Díaz Más 8dc3c1f0a0 Replace malloc/free by new/delete. Use const char* for input arg 8 years ago
Luis Díaz Más bfe057ca20 Auto-formatting done by the IDE while touching code in the previous commits 8 years ago
Luis Díaz Más 8b049922d7 Change exiv2::urlencode signature to return std::string
The goal of this change is to remove the responsibility from the client code to
free the memory of the returned string.
8 years ago
Luis Díaz Más 8c010c903b Compile private part as an OBJECT library (CMake concept) 8 years ago
Luis Díaz Más d3748152a7 add _int suffix to all the internal files 8 years ago
Luis Díaz Más 44fc9ec528 Move Cr2Header to a new .cpp file 8 years ago
Luis Diaz Mas d48abab718 Apply clang-format to some lines of the file canonmn.cpp 8 years ago
Luis Diaz Mas d0a1c6d19d Apply clang-format to bmpimage.cpp 8 years ago
tbeu 2efc2e79da Remove obsolete id 8 years ago
tbeu 5b5987a596 Remove obsolete EXIV2_RCSID 8 years ago
tbeu 5df8b01b77 Remove obsolete svn revision 8 years ago
Robin Mills e96e0daa8a Jp2Image::printStructure: Corrected used DataBuf for output 8 years ago
Robin Mills befe8c64e3 Jp2Image::printStructure: only print output when bPrint is set 8 years ago
Robin Mills 13db7fdec2 Formatting changes 8 years ago
Luis Díaz Más 87a83c89d5
Merge branch 'master' into stringFormat_update 8 years ago
Luis Díaz Más 1fe8d5ba7f Fix conversion issue detected by MSVC 8 years ago
Dan Čermák 36df4bc997 Fixed potential out of bounds file access
This commit adds a out-of-bounds protection in the case that the
extracted values for offset & count are summed up larger than the size
of the file. Also this function checks for overflows before performing
the addition.

This fixes #159
8 years ago
Dan Čermák cfa5073a2c Added short explanation to internal function stringFormat 8 years ago
Dan Čermák 06cafadf4f Added assertion that call to vsnprintf succeeds 8 years ago
tbeu c0ea5f4fba Rewrite the reallocation the C++ way
* Fix handling of the return value of vsnprintf
* In C++11 we could use buffer.data instead of &buffer[0]
8 years ago
tbeu 22dbd632bb Find single character 8 years ago
tbeu d1f73aa237 Make it floats 8 years ago
tbeu 849f416771 Avoid self-assignment 8 years ago
tbeu 867343b46f Utilize const Value reference 8 years ago
tbeu fd64d53e4b Remove superfluous variable declarations 8 years ago
tbeu d7297a2c2c Pass argument as constant reference 8 years ago
Luis Díaz Más 4ad4323685 Add new CMake options to use compiler flags to detect issues in the code (Gcc, Clang & MSVC) 8 years ago
Andreas Sturmlechner 57883ee664
Fix build with EXIV2_BUILD_EXIV2_COMMAND=OFF 8 years ago
Dan Čermák c686843e20 Added exception throw on Value pointer being null
v can be null if the typeId is invalid => throw an exception notifying
the user that his file is corrupted instead of the assertion
8 years ago
Dan Čermák 75940da0a6 Added check for overflows in calculation of size 8 years ago
Dan Čermák 8a586c74bb Fix for CVE-2017-14864, CVE-2017-14862 and CVE-2017-14859
The invalid memory dereference in
Exiv2::getULong()/Exiv2::StringValueBase::read()/Exiv2::DataValue::read()
is caused further up the call-stack, by
v->read(pData, size, byteOrder) in TiffReader::readTiffEntry()
passing an invalid pData pointer (pData points outside of the Tiff
file). pData can be set out of bounds in the (size > 4) branch where
baseOffset() and offset are added to pData_ without checking whether
the result is still in the file. As offset comes from an untrusted
source, an attacker can craft an arbitrarily large offset into the
file.

This commit adds a check into the problematic branch, whether the
result of the addition would be out of bounds of the Tiff
file. Furthermore the whole operation is checked for possible
overflows.
8 years ago
Dan Čermák 6c1ba331b9 Added arithmetic operation overflow error 8 years ago
Dan Čermák ff18fec24b Fix for CVE-2017-14860
A heap buffer overflow could occur in memcpy when icc.size_ is larger
than data.size_ - pad, as then memcpy would read out of bounds of data.

This commit adds a sanity check to iccLength (= icc.size_): if it is
larger than data.size_ - pad (i.e. an overflow would be caused) an
exception is thrown.

This fixes #71.
8 years ago
Dan Čermák 65f45a3505 Added new error message to warn about corrupted metadata 8 years ago
Luis Díaz Más 4beb08e219 Merge pull request #105 from Kicer86/bigtiff
Work in progress - improvements for bigtiff
8 years ago
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
8 years ago
Michał Walenciak 2402a693fd adding missing include for numeric_limits 8 years ago
Luis Díaz Más 93bbf0cab1 Merge pull request #104 from piponazo/removeCpp11Feature
Remove cpp11 features
8 years ago
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
8 years ago
Luis Díaz Más bef6dad6c5 Merge pull request #103 from AdelieLinux/master
Amend fix for #9 to apply to other Unix systems
8 years ago
Michał Walenciak b1a5d615c5 removing debug message 8 years ago
Michał Walenciak 64e05c0a7a improving fixes for #55 and #56 8 years ago
Luis Díaz Más 1a1a61b63d Remove reference to regex & c++11 from the man page 8 years ago
Luis Díaz Más 5b8894908b Remove all references to EXV_HAVE_REGEX and related code 8 years ago
Luis Díaz Más bfd61bd0f1 Merge pull request #96 from Kicer86/master
Adding comment for issue #56
8 years ago
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.
8 years ago
Luis Diaz Mas 2784b1f7f7 Remove EXIV2_ENABLE_LIBXMP variable, always build static XMP library, remove cmake OBJECT library 8 years ago
Michał Walenciak 7e90668011 Adding comment for issue #56 8 years ago
Luis Díaz Más df3c77516c Merge pull request #94 from piponazo/configFileInBuildDirectory
Generate exv_conf.h file out of the source tree.
8 years ago
Luis Díaz Más a9e3f17f31 Generate exv_conf.h file out of the source tree. Install it in the include folder. 8 years ago
Luis Díaz Más 686edde5ef Provide exiv2Config file automatically generated by CMake 8 years ago
clanmills 327b3f6c4d Fix https://github.com/Exiv2/exiv2/issues/83 8 years ago
Robin Mills 2f0104879a Merge pull request #81 from piponazo/robinChanges
Robin changes
8 years ago
clanmills d43cd82002 Fix #80 8 years ago
Luis Díaz Más 8ad49f6d73 Robin changes in sync with master changes 8 years ago
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.
8 years ago
Robin Mills d8ae4484ae msvc support for bigtiffimage.cpp 8 years ago
Robin Mills e1948c7ff9 msvc/bigtiffimage support 8 years ago
clanmills 6e3855aed7 Fix https://github.com/Exiv2/exiv2/issues/55 8 years ago
Robin Mills 197375dfa4 Merge pull request #72 from Kicer86/bigtiff
Some improvements, crash fix.
8 years ago
Michał Walenciak 9acc1c56a7 adding ifd8 and long longs to is8ByteType() 8 years ago
Michał Walenciak 4837d8cf58 changing header + some warning fix 8 years ago
Robin Mills 6fd0bc9e10 Adding ./configure support for bigtiffimage.cpp 8 years ago
clanmills 678e2b8517 Explicitly list files to be processed CMake generated builds [remove file(GLOB...)] 8 years ago
Michał Walenciak 734a2c3d57 fixing TODO 8 years ago
Michał Walenciak e3ff1ba694 fixing indent 8 years ago
Michał Walenciak 4629227358 fix for IPTCNAA
dir_offset was used instead of offset
8 years ago
Michał Walenciak 4f6f5b4946 removing conditional_byte_swap* functions 8 years ago
Michał Walenciak b6e79357de Adding 8-byte swap functions + consts 8 years ago
Michał Walenciak f96d84ba8c dropping dead code 8 years ago
Michał Walenciak 50ecf672b5 using Internal::indent() 8 years ago
Michał Walenciak f8ac7a5dc3 renaming Tiff to StandardTiff 8 years ago
Michał Walenciak d460bbdb3f fix for standard tiff case 8 years ago
Michał Walenciak 81aa8828e0 applying dff941ad7f 8 years ago
Michał Walenciak 874daede53 fixing broken print for 'offset' column 8 years ago
Michał Walenciak 8b07982bf2 variable names cleanup 8 years ago
Michał Walenciak 1a1dc3afd4 simplifying code 8 years ago
Michał Walenciak c6cbf69c49 first attempt to read both - standard and big tiff 8 years ago
Michał Walenciak 972e302cba some cleanups 8 years ago
Michał Walenciak 3c9817339a Dropping BasicIo& io parameter.
We already have acces to it via Image class
8 years ago
Michał Walenciak 65722a0020 dropping bSwap parameter
Member is better.
8 years ago
Michał Walenciak 7e291ef226 Encapsulating Header's members 8 years ago
Michał Walenciak cb3857c675 removing useles code 8 years ago
Michał Walenciak ff21b5a962 restore position if necessary 8 years ago
Michał Walenciak cc8c470620 fix header read + tag name dump 8 years ago
Michał Walenciak 5ab1a0809d adopt to style 8 years ago
Michał Walenciak 5fa328737a moving implementation from stand alone parser 8 years ago
Michał Walenciak c008ad2403 making tag related functions private 8 years ago
Michał Walenciak 307faae830 introducing tiff Header + header builder function 8 years ago
Michał Walenciak ab27bfab3c introducing getULongLong() 8 years ago
Michał Walenciak dc331ee44a implementing isBigTiffType 8 years ago
Michał Walenciak b3aa2adf31 initial implementation of newBigTiffInstance() 8 years ago
Michał Walenciak bc6eed0b03 registering new file type 8 years ago
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)
8 years ago
Robin Mills f9d0be42b5 Merge pull request #69 from marisn/master
Fix crash on undefined metadata on some Nikon images
8 years ago
clanmills 21ac4ac61a Test suite changes due to https://github.com/Exiv2/exiv2/pull/68 8 years ago
Māris Nartišs 591dea579a Fix crash on undefined metadata on some Nikon images.
Identical to commit:5405d61623e82896e498c5c8342dd6f42e689115
8 years ago
Michał Walenciak dff941ad7f Do not print offset when it is used as tag's value 8 years ago
Robin Mills 22aaff8682 Fix cmakeBuild.cmd --static to use zlibstatic.lib 8 years ago
clanmills d366943297 Refactoring EXV_USE_CURL and EXV_USE_SSH 8 years ago
clanmills 012d630125 Polish options. Move exv_conf.h to directory include/exiv2 8 years ago
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
8 years ago
clanmills 5405d61623 Fix http://dev.exiv2.org/issues/1305 8 years ago
clanmills 2828b11cf7 Build changes to support EXV_HAVE_REGEX and EXV_HAVE_REGEX_H 8 years ago
Ray ddbbbc7653 attempt to determine lens name from in:value object (represents lensID) when in:metadata == NULL 8 years ago
Robin Mills 60d436c969 Many changes to CMakeLists.txt and cmakeBuild.cmd to support unicode, static linking, passing shared library build flags. 8 years ago
Luis Díaz Más 68d2c49fc5 Fix typo 8 years ago
Luis Diaz Mas 1af1ce0229 Fix CMake + Conan integration on Windows 8 years ago
Luis Diaz Mas 960335faea Use conan in travis 8 years ago
Luis Diaz Mas 2221a5c630 Make CMake code work with conan 8 years ago
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. 8 years ago
Luis Díaz Más dc79df8ee6 Only use CURL and SSH when their support is enabled 8 years ago
Luis Diaz Mas c2350a3cb9 Make CMake code work with conan 8 years ago
Michał Walenciak 20582a93c6 Marking members in a proper way. 8 years ago
Michał Walenciak 4e25435afb Changing return type of Image::tagName to std::string 8 years ago
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.
8 years ago
clanmills 0f72599121 https://github.com/Exiv2/exiv2/issues/45 Fixing blank line typo. 8 years ago
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. 8 years ago
Luis Díaz Más 9761f0ee1f ICONV include directories only used by exiv2lib 8 years ago
Luis Díaz Más 31a51fda8a Replace EXIV2_ENABLE_SHARED by BUILD_SHARED_LIBS. Also use EXV_HAVE_DLL only for the exiv2lib target 8 years ago
clanmills 426cb8f354 Fix Visual Studio build breaker. 8 years ago
Robin Mills b5cac373b1 Merge pull request #39 from Exiv2/autotoolsMacLink
./configure --with-adobe[=2016|2014|2013] for MacOSX
8 years ago
Andreas Sturmlechner a768b85191 Lowercase target_link_libraries 8 years ago
Andreas Sturmlechner 20c7ad6c59 Lowercase include{,_directories} 8 years ago
Andreas Sturmlechner 1fc319c0e4 Lowercase add_custom_target, configure_file, install macros 8 years ago
Andreas Sturmlechner 40565761d1
Lowercase add_{definitions,subdirectory}, set{_*} and option macros 8 years ago
Andreas Sturmlechner 06b20523f7 Lowercase if/else/endif/foreach/endforeach 8 years ago
clanmills 573b2cfcd2 XMPsdk fixes. 2013 and 2016 build and (mostly) pass the test suite. 8 years ago
clanmills 95c5e92365 Support for Adobe XMPsdk 2013. Build xmpsdk using Adobe scripts. 8 years ago
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
8 years ago
Luis Diaz Mas 90e8ad8a72 Only set CMAKE_RUNTIME_OUTPUT_DIRECTORY once 8 years ago
Luis Diaz Mas 3a45a375d8 Simplify CMake code related with PNG and ZLIB (ZLib is required is PNG=ON) 8 years ago
Luis Diaz Mas c735bc5ae2 Relative paths to current directory 8 years ago
Luis Díaz Más 6a00d4b282 Move code from CMake_msvc.txt to config/compilerFlags.cmake 8 years ago
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)
8 years ago
Luis Díaz Más 3736707015 Merge branch 'master' into localedirundefined 8 years ago
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
8 years ago
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.
8 years ago
Andreas Sturmlechner aa6374b202
Use more GNUInstallDirs
Conveniently fixes multiarch install dir issues.
8 years ago
Luis Diaz Mas c415e7f509 Fix CMake configuration when XMP is disabled. Check XMP variable instead LIBXMP 8 years ago
Robin Mills afba52e042 Remove include tags_int.hpp from include/exiv2/*video.hpp files 8 years ago
Luis Diaz Mas 35c3e31958 Fixes for MSVC case 8 years ago
Luis Diaz Mas 27cde135d9 Remove more useless include_directories 8 years ago
Luis Diaz Mas 93e603e031 Fix linking problems with pthreads 8 years ago
Luis Diaz Mas 9808c3bf2d Simplify CMake code to identify FreeBSD systems 8 years ago
Luis Diaz Mas f5f5826c03 Use target_sources to extend the list of sources in exceptional situations 8 years ago
Luis Diaz Mas 45807ca03d Do not include SSH and CURL include dirs globally. Do it properly for the exiv2lib target 8 years ago
Luis Diaz Mas c50702612d Simplify CMake code for handling SSH and CURL cases 8 years ago
Luis Díaz Más 57cd78b517 Put all the CMake related with the exiv app together 8 years ago
Luis Díaz Más ee61c24459 Remove inclusion of many useless include_directories 8 years ago
Luis Díaz Más 1c03767391 Move inclusion of private header from .hpp to .cpp (not needed in the .hpp) 8 years ago
Luis Díaz Más 73f53cc6f9 Move sample applications from src/CMakeLists.txt to samples/CMakeLists.txt 8 years ago
Robin Mills aefa3e3d34 MacOSX --with-adobe link issue. Work in progress. Code and documentation update. 8 years ago
Robin Mills 2a61392766 Merge pull request #27 from piponazo/master-CMakeObjectLibraryForXmp
New way to generate the XMP library (Using the CMake OBJECT LIBRARY concept)
8 years ago
Luis Diaz Mas b387d58507 Remove EXPAT_LIBRARIES from where it is not needed (already inherited from exiv2lib target) 8 years ago
Luis Diaz Mas 40d10639e2 Reuse XMP OBJECT library in the exiv2lib when EXIV2_ENABLE_LIBXMP=OFF 8 years ago
clanmills 935421c855 Refactoring autotools to support ADOBE_XMPSDK (Work in Progress) 8 years ago
Luis Diaz Mas 64bbe802e2 Install exv_conf.h properly 8 years ago
Luis Diaz Mas b4a2b822c2 Remove usage of global variable INSTALL_TARGET_STANDARD_ARGS. Specify install destinitions in each target 8 years ago
clanmills 2e816165ea Changes to autotools to support C++11 (work in progress) 8 years ago
Luis Díaz Más b6885c8028 Since we are requiring CMake 3.1 we can remove the usage of PRIVATE_VAR and use directly PRIVATE or PUBLIC 8 years ago
clanmills e2862ba764 #1300 and #1301 (583cfd6e and 3bbba3f8). These fixes were accidentally lost on 2017-08-07. 8 years ago
clanmills 1505b4c3aa #11 Integrating fix into master (accidentally lost on 2017-08-07 by rebase -force) 8 years ago
clanmills 122cd5737f Cosmetic modifications to Pull-21. Fix to ensure Cygwin uses #include <unistd.h> 8 years ago
Robin Mills 8592c10a3e Merge pull request #21 from piponazo/configFileFromCMake
New way to generate the include/exiv2/exv_conf.h file
8 years ago
Luis Díaz Más e474b0fbd3 localtime.c and getopt_win32.c added unconditionally for the exiv2 app 8 years ago
clanmills 011f2b5259 Fixing bug in test harness on Linux. 8 years ago
Luis Diaz Mas 22efdffd1d Use #ifdef instead of #if for EXV_HAVE_REGEX 8 years ago
Luis Diaz Mas 252d738b6c Include xmpsdk/include only in the needed target. Remove other uneeded usages of INCLUDE_DIRECTORIES and LINK_DIRECTORIES 8 years ago
Luis Diaz Mas 1d327fba21 Correct usage of HAVE_REGEX 8 years ago
Luis Diaz Mas 911832d70a Handle HAVE_TIMEGM variable in the new cmake file 8 years ago
Luis Diaz Mas 5c78c82f20 Handle ENABLE_WEBREADY variable in the new cmake file 8 years ago
Luis Diaz Mas 93835cd680 Handle correctly ENABLE_VIDEO the config.h.cmake file 8 years ago
Luis Diaz Mas bba3cbb7fd Remove unused definition EXV_HAVE_DECL_STRERROR_R 8 years ago
clanmills 24130dbbb2 Cast to avoid compiler warning with MSVC2005 8 years ago
clanmills 882c825f1a Fix https://github.com/Exiv2/exiv2/issues/16 8 years ago
kiekerjan b35903e4c8 Spelling error
Small error in camera name ICLA-68 instead of ILCA-68
8 years ago
Robin Mills b8bbacd196 Fix submitted. https://github.com/Exiv2/exiv2/issues/10
This is not a good fix because temporaryFile() is a bad idea and requires a lock to be thread safe.  However, the lock is in the sample code and not in the library.  I considered in v0.26 to rewrite this to use a temporary (MemIo) file and decided against that to save time.  My sin.  The correct fix usually requires less effort in the long run.
8 years ago
Robin Mills 82dbe6199d https://github.com/Exiv2/exiv2/issues/11 Closed. Coincidentally Raphael reported issues with Visual Studio 2015 Community Edition. Issue 11 and Raphael's issues should now be resolved. 8 years ago
clanmills 620ef04e96 https://github.com/Exiv2/exiv2/issues/9 Fix submitted. 8 years ago
clanmills d3c2b99385 #1297 Fix submitted. 8 years ago
clanmills ef64de084c Removing msvc2003 support 8 years ago
clanmills a9c9e8ff8e Remove svn_version.h 8 years ago
clanmills 290164d1b6 Work in progress: https://github.com/Exiv2/exiv2/issues/3
Tested on MacOS-X.  I'll test Linux/Cygwin/MSVC and close if good.
8 years ago
Bernd Kuhls 8af901ce05 cmake: always depend on threads, not only in the xmp case 8 years ago
Bernd Kuhls 3af0d1a6b2 cmake: fix gettext support
Building exiv2 with uclibc and gettext fails currently as detected
by the buildroot autobuilders:
http://autobuild.buildroot.net/results/def/defcdd3dd57b031c31bb16c0075f079a482bf52d/build-end.log
8 years ago
clanmills 2f8681e120 #1296 Fix submitted. 8 years ago
clanmills 9be72eecec #1294 Fix. 8 years ago
Robin Mills 559ace375b #1291 Reverting change in r4763 relating to windows.h as they break the Cygwin build. Retain changes in exiv2/exiv2.hpp and exv_msvc.h 8 years ago
Robin Mills f36cccefa2 #1291 include header simplification 8 years ago
Robin Mills 73572aa54d #1291 Fix submitted. Thank You to T Modes for reporting this issue. 8 years ago
Robin Mills 44da4724b3 #1175 Correction to r4756 Another three casts required to build with Visual Studio (size_t code ripple) 8 years ago
Robin Mills 67859f4f4e #1175 I'm going to accept the recommendation to change BasicIo::size() to return size_t. This passes the test suite. The only "ripple" outside of basicio is to iotest.cpp. This change enables several casts to be removed. 8 years ago
Robin Mills 7da3ad2e41 #1175. Thanks to LaserSoft for reporting this and providing a patch. 8 years ago
Robin Mills 77616c3204 #1289 Thanks to Asdiel (AlienSkin) for reporting this and providing a test file. Thanks to Ben for investigation and patch. 8 years ago
Robin Mills 307c9e266c #1286 Correction to r4752 8 years ago
Robin Mills 5a5f7dc1ac #1286 Fix submitted. 8 years ago
Robin Mills 73047ce568 #1279 Correction to r4748 which broke the CMake build. 8 years ago
Robin Mills 54408bac2f #1279 Move src/ini_int.hpp to include/exiv2/ini.hpp to reveal class Exiv2:INIReader in API 8 years ago
nkbj 788caad7de Updated Nikon Lens lookup table to v4.4.527.01 of Robert Rottmerhusen's fmountlens list. 8 years ago
nkbj e8c2c7ba01 Update various lists to match ExifTool version 10.47. 8 years ago
Robin Mills 0051366df4 #1279 Removing unused code. 8 years ago
Robin Mills 8b90afa94e #1279 Almost done! 8 years ago
Robin Mills be0945016b #1269 Thank You to Ben for reporting this and providing the patch. 8 years ago
Robin Mills 192a2a83cf #1279 Cleaned up doxygen warnings for doc and website. 8 years ago
Robin Mills 11993b3b55 #1271 Thanks to Ben for reporting this and providing the patch. 8 years ago
Robin Mills 809009f174 #1279 Better man page pagination for pdf. 8 years ago
Robin Mills 6d5c2c3256 Getting ready to release v0.26 8 years ago
Robin Mills 54cfc47346 class RWLock should not be in the Exiv2::Internal namespace 8 years ago
Robin Mills 2ebacb6b0b #1272 Use in-memory temporary files. 8 years ago
nkbj 40dbbf6373 Update various lists to match ExifTool version 10.44. 8 years ago
Robin Mills 012c544704 #1268 Fix submitted. Ben and Robin both discovered and fixed this independantly with the same fix! 8 years ago
Robin Mills 9f06ff2971 #1272 Submitting modified version of Ben's patch. 8 years ago
Robin Mills dd4faaf831 #1277 Fix submitted. Thank You to Ben for reporting this and providing a patch. 8 years ago
Robin Mills bc1f8f7e84 #1275 Fix issue with Exiv2::Key.familyName() for key.ifdId_ == mpfId 8 years ago
Robin Mills b668455721 #1275 Fix submitted. 8 years ago
nkbj 5c308319b7 Update Pentax camera list to match ExifTool version 10.41. 9 years ago
Robin Mills cc2594004b #1271 CMake support for FreeBSD. Requires -DEXIV2_ENABLE_NLS=OFF 9 years ago
Robin Mills 91bfda349d #1273 Correction to r4699 9 years ago
Robin Mills 720b94bb5e #1273 Fix for linking on FreeBSD 9 years ago
nkbj f3fe69ea18 Update Canon lens list to match ExifTool version 10.40. 9 years ago
nkbj 1cfdba23ff Update Nikon lens list to match ExifTool version 10.38. 9 years ago
draekko a82be7c98d #1266 Add path to zlib for cmake msvc to src/CMakeList.txt to fix debug buildtype build issues 9 years ago
Robin Mills fe6c71d0fa #1108 exiv2 -pR to dump type == tiffIfd 9 years ago
Robin Mills 49fbd1d761 #1108 Add support to dump MakerNote IFDs with exiv2 -pR 9 years ago
Robin Mills 461b431bc1 #1231 Thank You to Ayke for providing the patch. 9 years ago
nkbj 8ec062cc46 Updated Nikon Lens lookup table to v4.4.520.01 of Robert Rottmerhusen's fmountlens list. 9 years ago
nkbj eea1e67062 Update Minolta lens list to match ExifTool version 10.36. 9 years ago
Robin Mills 9ad811150d #1230 Removing incorrect 2-byte pad following JPEG ICC_PROFILE. 9 years ago
Robin Mills 1a0095ff4a #1252 Patch submitted. Thank You to Markus for the patch and test files. Test suite updated appropriately. 9 years ago
nkbj 597a1bf650 Update Nikon lens list to match ExifTool version 10.33. 9 years ago
Robin Mills 81265684f0 #1108 Fixed bugs in printStructure(kpsRecursive) handling of RATIONAL data. 9 years ago
Robin Mills 0c57b55035 #1230 Fix msvc build breaker when building using configure.bat -W (with WebReady) 9 years ago
Robin Mills ba785b2a02 #1230 Fix msvc build breaker when building using configure -x (without xmp) 9 years ago
Robin Mills dd0a22814c #1247 Another correction to r4655 concerning clang/apple. 9 years ago
Robin Mills 9853ca55bd #1247. Correction to r4655 to handle clang on plaforms other than MacOS-X. 9 years ago
nkbj db3af9720a Update various lists to match ExifTool version 10.31. 9 years ago
Robin Mills 6ea3b00b02 #1249 Fixes 9 years ago
Robin Mills 92659f24c8 #1247 Restrict clang pragma to __APPLE__ 9 years ago
Robin Mills 4abb560cf7 #1243. Fixing compilation warnings from clang in jp2image.cpp 9 years ago
Robin Mills dd39d165e2 #1247 Fix Linux/GCC compilation warning. Added Hanno's file to the test suite. 9 years ago
Robin Mills 764f079dff #1243 Fixing typo/build breaker. 9 years ago
Robin Mills 021bf5c237 #1247 Thank You Hanno for reporting this and providing a patch. 9 years ago
Robin Mills 6a1b7d262f #1243 Correction to msvc build breaker in r4648 9 years ago
Robin Mills e7229f4ea5 #855 Remove compiler signed/unsigned warning. 9 years ago
Robin Mills 18ecd0e890 #1243 Adding ICC Profile support to jp2image.cpp 9 years ago
Robin Mills 54ac67d9db #1080 Fix submitted. 9 years ago
Robin Mills 5664393767 #1246 Fix submitted. 9 years ago
Robin Mills b9f584fbbf #1430 Correcting MSVC build breaker in r4639 9 years ago
Robin Mills 022e18dc6f #1244 Fix crwimage.cpp to read into memory (to make CRW work with RemoteIo). 9 years ago
Robin Mills a057af1616 #1244. Removing experimental APIs introduced by r4637. I submitted those APIs just to retain the code somewhere. I have no plan to release such as API. 9 years ago
Robin Mills f5956d5db2 #1230 Fixes to read tiff with web-ready. Includes the BasicIo expiremental API readUnmarked() and markRead() which I will remove later. 9 years ago
Robin Mills 2f86b6bbc0 #1244 Fix submitted. 9 years ago
Robin Mills 774f96094c #1243 Work-in-progress on iccProfile related code. 9 years ago
Robin Mills 163f3ce7f1 #1243 Work-in-progress on writing ICC profiles. Fixed elusive issue in exiv2 -pS foo.jp2 9 years ago
Robin Mills 05f56e95af #1242 Issue warning when we encounter erroneous Exif\0\0 in the Exif UUID box. 9 years ago
Robin Mills 099dd70c59 #1230 Fix bigEndian issue in toAscii() 9 years ago
Robin Mills 67efb34461 #1243. Correction to r4627 9 years ago
Robin Mills 3d77c41e31 #1243 Work-in-progress. 9 years ago
Robin Mills 2e9138cf91 #1243 Work-in-progress. Still to add code to writeMetadata for icc profiles. 9 years ago
Robin Mills ebea8991e5 #1243 Work-in-progress. Added test/data/relax.jp2 which has an embedded ICC profile. 9 years ago
Robin Mills 442b0155d0 #1243 Added XMP and IPTC data to Reagan.jp2. Corrected printStructure() appropriately.
Will add jp2image::writeMetadata()/iccProfile tomorrow and update tests.
9 years ago
Robin Mills 699e1c744e #1243 Work in progress. Implemented jp2image::printStructure. Still to add iccProfile support to jp2image::writeMetadata() 9 years ago
Robin Mills ed63a113e1 #1242 Work in progress. Fixing src/jp2image.cpp. Added test file. Test suite to be updated to use Reagan.jp2 (and hopefully additional test files) 9 years ago
Robin Mills 957f71f6a6 #1230 Fix MinGW stdin-test breaker 9 years ago
Robin Mills 5b38d4528a #1108 Added code to dump Exif, IPTC and iTXt/zTXt comment/description blocks for PNG files. 9 years ago
Robin Mills 5282bc2120 #1230 More changes to pacify MinGW (the nightmare environment). 9 years ago
Robin Mills 4c2f943bd1 #1230 exiv2.cpp #include <string> breaks the build on MinGW/32. 9 years ago
Robin Mills bea89ba81a #1230. Rollback 4604. I knew webp-test was sometimes failing. Fixed. Always use runTest exiv2 to be sure of executing the hot build of exiv2(.exe). 9 years ago
Robin Mills ceaa92704f #1230 Adding --verbose to print action to dump more information (to debug something on the buildserver) 9 years ago
Robin Mills 2d5dc284e2 #1230 CMake Maintenance. Adding EXIV2_HDR to exiv2/headers and LIBEXIV2_PRIVATE_HDR to libexiv2/headers. 9 years ago
Robin Mills 0abf56f71b #1236 CMake build on MinGW. 9 years ago
Robin Mills b1a9d4493f #1230 Eliminate linux compiler warning. 9 years ago
Robin Mills c10bc003a7 #1023 Fix getDataByRange CURLOPT_SSL_VERIFYHOST. Fix http-test.sh (and associated test/data/http-test.out). 9 years ago
nkbj 133174a6b1 Update various lists to match ExifTool version 10.28. 9 years ago
Robin Mills 5b21deda93 #1234 Corrections to r4577 9 years ago
Robin Mills 3811ceb930 #1234 Corrections to r4577 based on testing on PPC. 9 years ago
Robin Mills cf284286d8 #1234 Fix submitted. Passes test suite littleEndian. To be tested on Mac Powerbook PPC bigEndian. 9 years ago
Robin Mills a1877c04e2 #1230 and #1199 Correction to r4575 9 years ago
Robin Mills 681acc7901 #1199 and #1230 webpImage::printStructure(). Reporting Offset == 0 on Tiger (32bit). 9 years ago
Robin Mills b0ff549cb7 #1230 Correction to r4565 to fix msvc build breaker. 9 years ago
Robin Mills 3cfecd4918 #1230 Extended test/stdin-test.sh to pipe .exv and .icc file structures 9 years ago
Robin Mills 5f1d52e497 #1230 Added stdin-test and fixing issue identified by the test. 9 years ago
nkbj 1f7f82c7d9 Add support for the Olympus M.Zuiko Digital ED 12-100mm F4.0 IS Pro lens. 9 years ago
nkbj 52f3e100c2 Update various lists to match ExifTool version 10.27. 9 years ago
Robin Mills e46907cb1b Man page review for v0.26 9 years ago
Robin Mills e808cdff3e #1109 MinGW/32. Correction to r4543 for systems which are neither MINGW nor MSVC 9 years ago
Robin Mills 66cfbe3214 #1109 MinGW/32. Correction to r4543 for systems which are neither MINGW nor MSVC 9 years ago
Robin Mills c78a76c45c #1109 MinGW/32. Correction to r4538 for all versions of msvc. 9 years ago
Robin Mills b8021f4517 #1074 Correction to r4540. Rollback changes to actions.cpp which should not have been submitted. Resubmitted test/data/icc-test.out 9 years ago
Robin Mills 88b3f77796 #1074 Fix bug in TiffImage printStructure() for large icc profiles. 9 years ago
Robin Mills f4feff0864 #1229. Fix submitted (and appropriate update to test harness). Fix an error in jpgimage::doWriteMetadata for large (>64k) ICC profiles. 9 years ago
Robin Mills 52f0bd2ea1 #1109 Work in Progress on MinGW/32. Put stdout into binary mode for options -pC -pX, -eABC-, -eABC- 9 years ago
Robin Mills 793bd6ca63 #1109 MinGW/32 daily build. Fix GCC warning on MinGW/32 gcc 4.9.2 9 years ago
nkbj 56faaba0b1 Add support for two new Olympus lenses. 9 years ago
Robin Mills 3c675f8e53 Build trigger. 9 years ago
nkbj d733056375 Fix issue #1215: Exif.CanonSi.SubjectDistance unit. 9 years ago
nkbj 7915183af7 Fix issue #1217: Missing values for Exif.CanonCs.ISOSpeed tag 0x0010. 9 years ago
nkbj f260b163ad Update Canon and Nikon lens lists to match ExifTool version 10.26. 9 years ago
Robin Mills d321dad695 #1108 Fixing issue with pngimage::printStructure() and the "Software" string in test/data/imagemagick.png 9 years ago
Robin Mills b46cac7790 #1126 Fixes submitted for msvc2003 9 years ago
Robin Mills 1bea0c6aeb #1108 Better string formatting (and associated test/data changes). Tweaks to code layout for r4497. 9 years ago
Robin Mills 458580373a #1108 Enhanced pngimage::printStructure() to display checksum 9 years ago
Robin Mills f2ec4ce36a #1074 Work in progress. fixed pngimage.cpp doWriteMetadata(). 9 years ago
Robin Mills 7bd874049e #1074 Work in progress. -eC -pC -eC- work for JPG/PNG/TIFF/WEBP. pngimage::doWriteMetadata() does not update iCCP chunk. 9 years ago
Robin Mills 5edc759cc9 #1074 For discussion see: http://dev.exiv2.org/issues/1074#note-23 9 years ago
Robin Mills a8c51889b8 #1074. Fix bug in jpgimage.cpp/readMetadata() concerning ICC profile 9 years ago
Robin Mills 3d57bbc6e6 #1074 Work in progress. ICC Jpeg/Png/Tiff exiv2 -eC foo.xxx writes good foo.icc profiles. icc-test.sh is broken and to be investigated. 9 years ago
Robin Mills 9d06081616 #1225 Correction to r4480 to respect the endianness of file and platform 9 years ago
nkbj 44e51a9069 Whitespace fix in r4480. 9 years ago
Robin Mills c7bca0ce00 #1224 crw-test.sh refactored to use test/functions.source, no long reference sample program crwparse and avoid crash in crwimage.cpp 9 years ago
Robin Mills 9ff2224fd7 #1074. Rollback r4479 which has inflicted a lot harm on the test harness. 9 years ago
Robin Mills 14f64998ac #1225 Fix 9 years ago
Robin Mills 3aaebf50f7 #1074 Added ICC support to tiffimage.writeMetadata(). pngimage.readMetadata() is not complete. 9 years ago
Robin Mills 925fede113 #1223 Correction to r4477 to fix Cygwin build breaker. #include <cstdint> demands C++11 support on GCC 4.9.3 on the buildserver. Code compiles without cstdint and iomanip 9 years ago
Robin Mills 2de6968227 #1223 Thank you to Alexey for reporting this and providing the patch. 9 years ago
Robin Mills f44f706478 MinGW changes following discussion about building with Qt5.6/MinGW 4.9.2 http://dev.exiv2.org/boards/3/topics/2705 9 years ago
Robin Mills d7463fd114 #1074 and #1057 Fixing build breakers on Cygwin and msvc MinGW to be further investigaged. add checkSum to test functions 9 years ago
Robin Mills 5cf87e19dd #1074 Correction to r4466 to fix MinGW build breaker on include <sys/select.h> 9 years ago
Robin Mills b5bc66b36a #1057 Added support for -iXX- 9 years ago
Robin Mills d801aabd58 #1057. Simplification of r4466 9 years ago
Robin Mills 70407cc8ad #1057 Fixed issues with stdin on Windows which were documented in http://dev.exiv2.org/issues/1057#note-8 9 years ago
Robin Mills 21e7622f0b #1057 Fixed src\exiv2app.hpp formatting. Moved reading stdin from ctor to getStdin(). WIP: unsolved Windows pipe issues. 9 years ago
Robin Mills 14f7f18222 #1057 Correction to r4633 to fix Windows build-breakers (Cygwin/MinGW and msvc) 9 years ago
Robin Mills 984189ebde #1057 Added support for -iC- to read ICC profile from stdin to an image. 9 years ago
Robin Mills 57ee93886a #2120 Fix submitted and appropriate changes to test/icc-test.sh (rewritting ICC in JPG was corrupting file) 9 years ago
Robin Mills 87e9c996a6 #1220 and #1074 Work in progress. Improved -pS for JPEG. #1220 is due to a bug in writing the ICC profile in jpgimage.cpp/doWriteMetadata() 9 years ago
draekko bf56bbf7fa #825 added printPressure for panasonic makernotes to display hPa values or infinite when value is 65535 for Exif field 0x0086 9 years ago
Robin Mills 3706233c8d #1074 Correction to r4457 to fix msvc build-breaker. 9 years ago
Robin Mills b7c90140c7 #1074 ICC support in jpgimage.cpp. Add test/icc-test.sh 9 years ago
Robin Mills 9026954816 #1074 Work in progress for ICC/jpg - changes to readMetadata() and printStructure() 9 years ago
Robin Mills a6ba04d422 #994 Update svn_version.h using svn info 'Last Changed Rev' instead of 'Changed'. This enables exiv2 -vVg svn to identify build branch or trunk. 9 years ago
Robin Mills 97e7905a8b #1060 Thank you to Thomas B for working on this and providing the patch. 9 years ago
Robin Mills 5f9807cbef #1216. Rollback r4448/6/2/1 r4439/38 to restabilize test suite on trunk. r4449 is copy of r4448 to branches/develop 9 years ago
Robin Mills 8ad06d6f17 #1199 Fixing build-breaker when -DDEBUG is used. 9 years ago
sridharb d78dec24e3 Moved ExifDatum::ignore from exif.hpp to the exif.cpp.
This frees up exif.hpp from needing to include tags_int.hpp.

The downside is that this function is no longer inline.
9 years ago
sridharb d05634a2e3 Needs to be in the solution. 9 years ago
Robin Mills ae4e63b27a #1214 Patch submitted r4440. Thank You to Ondřej for reporting this and providing the patch. 9 years ago
sridharb 48294e66c0 Summary: Restored jbeu's formatting 9 years ago
sridharb 8a8ec67136 This is mainly a fix for #1206, but also interprets missing Canon Exif
Tags in exiv2 with the help of Phil Harvey's exiftool (see
http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Canon.html).

Even with these changes (toward #1204 and #1205), exiv2 lags behind
exiftool in some areas of interpretation of Canon tags. Ideally, a
catch-up effort to bring the code in source: canonmn.cpp in line with
lib/Image/ExifTool/Canon.pm. v10.25 of exiftool was used as reference
for this change.

#1206 seeks to address the fact that when Canon does not have data for
certain tags, they use specific default values in those fields. These
default values need to be ignored and not displayed. This change
brings this feature to exiv2, something that already exiftool does.

With regards to implementation, the struct TagInfo in source: tags.hpp
is extended with four new fields.

The first field is a bool that if set to true (default false), denotes
that this field has ignorable default values.

The second field is the default value that needs to be ignored. This
can be of four types (String, Long, Float, Rational). These four types
were chosen as they had conversion functions in the Value class.

The third field is the comparison type (default equal_to). There are
six comparison types possible (equal_to, not_equal_to, less,
less_equal, greater, greater_equal). This is the comparison applied to
the value stored in the tag's field and the default value specified
above. For e.g. if the value in the tag Exif.CanonCs.RecordMode is -1,
then it needs to be ignored.

The fourth field is the data type (default Long). This could have been
guessed from the type of the second field, but that would necessitate
making this structure into a template calling for changes in multitude
of files.

Usage: In source: canonmn.cpp, several exif tags now have ignorable
default properties. I will list a few examples.

1. Exif.CanonCs.FocusMode:        TagInfo(0x0007, "FocusMode", N_("Focus Mode"), N_("Focus mode setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsFocusMode)),

There are no changes - i.e. this is an example of how the TagInfo
structure was being populated.

2. Exif.CanonCs.RecordMode:        TagInfo(0x0009, "RecordMode", N_("Record Mode"), N_("Record mode setting"), canonCsId, makerTags, signedShort, 1, EXV_PRINT_TAG(canonCsRecordMode), true, s_1_),

Take a look at the two new arguments. The first one (true) specifies
that there is a default value that can be ignored. The second one s_1_
specifies the value (-1, in this case) to be ignored.

	const UShortValue CanonMakerNote::s_1_(65535, unsignedShort); // Till bug is resolved

Note s_1_ is temporarily having the value 65535 till #1203 that causes
signedShorts to be interpreted as unsignedShorts is resolved.


3. Exif.CanonSi.TargetAperture:         TagInfo(0x0004, "TargetAperture", N_("Target Aperture"), N_("Target Aperture"), canonSiId, makerTags, unsignedShort, 1, printSi0x0015, true, us0_, TagInfo::less_equal),

Note the third argument TagInfo::less_equal. This combined with the
second argument us0_ (the number 0) signifies that any values in this
tag that are less than or equal (<=) to 0 should be ignored.

4. 		TagInfo(0x0028, "ImageUniqueID", N_("Image Unique ID"), N_("Image Unique ID"), canonId, makerTags, asciiString, -1, printValue, true, s0x16_, TagInfo::equal_to, TagInfo::String),

The previous examples have all been of Long type. This shows a case
where the default value is a string.

	const AsciiValue CanonMakerNote::s0x16_("0000000000000000");

Once these tag values have been defined, the actual mechanics of
ignoring these default values happens in Image::exifData().

Before the exifData is returned, we loop through the data, ask the
data whether it needs to be ignored (which in turn checks its
underlying tagInfo and compares it with the default value, if
specified) and if so, deletes that element.

A compile-time switch called EXV_DONT_IGNORE_UNDEFINED which when set
to a non-zero value will cause the behavior to revert back to the
original where all values are reported irregardless of the fact that
they need to be ignored.
9 years ago
Robin Mills fe6a016957 #922 Correction to r4434. Fixing another msvc build breaker. 9 years ago
Robin Mills 8377456786 #922 Correction to r4344 to handle msvc build breaker. 9 years ago
Robin Mills 13be017d12 #922 exiv2 -dI deletes all IPTC chunks in a JPEG. 9 years ago
tbeu 239625e66e Fix typos (comments only) 9 years ago
tbeu 1ba4e46855 Fix some spelling 9 years ago
Robin Mills 705bc14795 #1057 man page update for tgt- (stdin/stdout). 9 years ago
Robin Mills 8b9265b80d #1064 Fix -iX to merge (not replace) metadata from source to destination. 9 years ago
Robin Mills fa24a8a614 #1199 Fixing webp-test.sh. Use -iXX to inject XMP into file without XMP->Exif/IPTC conversion 9 years ago
Robin Mills 027b3917ec #1199 Spit'n'polish on the loops in printStructure(), metadataRead() and doWriteMetadata(). Added tests with even byte count for ICCP and XMP Chunks. 9 years ago
draekko ed7b20a20e #1199 fixed typo from cut/paste in previous commit causing exif flag not to be set for VP8X chunk. 9 years ago
draekko c858b7d44e #1199 minor code update, updated comments, added constants for headers, bit definitions, and misc. 9 years ago
Robin Mills 9a061d895e #1199 Fix WebP printStructure(), readMetadata() and doWriteMetadata() to handle payload padding byte. Extended webp-test to cover -iX, -ix and -ie 9 years ago
draekko 600eb0d3dd #1199 Fixed issue with -ix, wasnt padding odd sized chunks for exif/xmp. 9 years ago
Robin Mills d369aa67d5 #1199 Test suite changes and associate fixes to the code. 9 years ago
Robin Mills b3c6de6274 #1210 C++11/regex build-breaker in src/version.cpp. Thank You to Zulan for reporting this and providing a patch. 9 years ago
Robin Mills 0462d2bf0f #1199. Adding tests for -iC. Fixed bug in -pC. Test code added for -ix and -ie, however I don't think the options are working correctly. 9 years ago
draekko b318674f75 #1199 fixed -de -dc options, add -iC option to insert icc profiles 9 years ago
tbeu d02560da36 Remove trailing blank from translation string 9 years ago
Robin Mills 043c039d25 #1199 Fixing exiv2 -dC image-path to delete ICC profile. 9 years ago
tbeu 918059aa24 Fix initialization of TiffBinaryElement members in ctor
As reported by Cppcheck
9 years ago
tbeu 23259f799b Avoid GCC warning -Wswitch 9 years ago
draekko dba4e7fb42 #1199 removed exif header padding on metadata writes. 9 years ago
draekko 6f7b3ba8f7 #1199 removed convenience converstion for iptc to xmp, apps should handle it directly since webp doesnt support iptc. 9 years ago
draekko ce14557d07 #1199 updated date in exiv2.1 9 years ago
draekko 65f5ec9a70 #1199 Updated exiv2.1 to add WEBP to format list. 9 years ago
tbeu 136d517929 Update Canon FileInfo RawJpgSize to match ExifTool 9 years ago
tbeu e5f142fab6 Update Canon CS Image stabilization to match ExifTool 9 years ago
tbeu ffcb3f5002 Update Canon CS Exposure mode to match ExifTool 9 years ago
tbeu e26650f409 Update Canon CS AF point to match ExifTool 9 years ago
tbeu d888490a35 Update Canon CS Meeterimg mode to match ExifTool 9 years ago
tbeu bde4fa8aa5 Update Canon CS Easy mode to match ExifTool 9 years ago
tbeu e2bd73b1da Update Canon CS Image size to match ExifTool 9 years ago
tbeu 59d4bc6e02 Update Canon CS Focus mode to match ExifTool 9 years ago
tbeu cbe1eafd28 Update Canon CS Drive mode to match ExifTool 9 years ago
tbeu a564e084be Update Canon model ID to match ExifTool 9 years ago
tbeu 26a94799f1 Fix encoding 9 years ago
tbeu 1ec86a8b79 refs #1199: Fix iclude 9 years ago
tbeu 012211e251 Fix and update Sony camera settings drive mode to match ExifTool 9 years ago
tbeu 2730747bfa Update Sony camera settings image style to match ExifTool 9 years ago
tbeu 466802b877 Update Sony/Minolta teleconverter model to match ExifTool 9 years ago
tbeu dd68a7ff62 Update Sony model ID to match ExifTool 9 years ago
tbeu 0c83629519 refs #1208: Update Sony file format list to match ExifTool
Patch provided by Mihail Zenkov
9 years ago
draekko 9085b08fe1 #1199 fixed handling deleting data, and adding iptc when injecting 9 years ago
Robin Mills ea08a415f2 #1199. Fixing msvc/64 build breakers (more size/long/uintXX_t conflicts). 9 years ago
Robin Mills d8457b2b3f #1102. Correction to r4365. canonmn.cpp#1238 should not have been changed. Thanks to Sridhar for bringing this to my attention. 9 years ago
nkbj c74aaa8d29 Updated Nikon Lens lookup table to v4.4.516.01 of Robert Rottmerhusen's fmountlens list. 9 years ago
Robin Mills 104eb6b7fe #1199 Fixing MSVC build breaker involving long/uint64_t conflict. Minor changes to behaviour of Internal::binaryToHex() 9 years ago
draekko fe4f6f07f1 #1199 update to binaryToHex, should remove compile warnings and fix extra space padding. 9 years ago
Robin Mills b09c2049a6 #1199 Fixing build breaker introduced by r4369 9 years ago
draekko bcaa22ae6f #1199 removed warnings in stringToHex, enabled iptc support for WebPImage. 9 years ago
draekko 71fd0ae96e #1199 (as was discussed) moved WebPImage::debugPrintHex to Internal::binaryToHex 9 years ago
draekko 85cc2f745d #1199 Fixed crash with iptc by disabling it, updated decodeChunk to do better header checks, added hexdump function. 9 years ago
Robin Mills 5b3d0cd10c #1199 Fixed exiv2 -pR/-pC/-pX Stonehenge2.webp to report exif/ICC/XMP 9 years ago
Robin Mills 1935eddeac #1202 Adding "Manual" Exif.CanonCs.FocusContinuous 9 years ago
asp 20c5cf6b29 #1201 do not map Iptc.Application2.RecordVersion to Xmp.xmp.Rating 9 years ago
Robin Mills bcd455be7a #1199 Patch from Ben. http://dev.exiv2.org/issues/1199#note-37 9 years ago
Robin Mills 512cd43e0b #1199 WebPImage::printStructure() refactored to match implentation style of other image handlers. 9 years ago
Robin Mills 541dfe8fdf #1199 Thank you to Ben for the patch. This corrects various matters and adds a first stab at WebPImage::printStructure() 9 years ago
Robin Mills e5bc22c0a8 #1200 and #1034. Adding support for ~/.exiv2 for Nikon Cameras. 9 years ago
nkbj ecb9d84305 Issue #1197: Add support for Sigma 150-500mm on Canon with 1.4x TC. 9 years ago
Robin Mills b3f107bd8c #1199 WebP Support (work in progress). Thank You to Ben for the patch. Thanks to Gilles for encouragement. 9 years ago
nkbj 7135ccb35a Update Nikon lens list to match ExifTool version 10.25. 9 years ago
nkbj 8c0dfbeca8 Update various lists to match ExifTool version 10.24. 9 years ago
Robin Mills 8afd3f43aa #1198. Fixed issue with http I/O failing a test file. 9 years ago