diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake index a09b3ec7..64511feb 100644 --- a/cmake/packaging.cmake +++ b/cmake/packaging.cmake @@ -89,6 +89,18 @@ if ( MSVC ) endif() endif() +# Set RC = Release Candidate +if ( PROJECT_VERSION_TWEAK STREQUAL "9" ) + set (RC "Not for release") +elseif ( (PROJECT_VERSION_TWEAK STREQUAL "0") OR (PROJECT_VERSION_TWEAK STREQUAL "") ) + set(RC "GM Release") +else() + set ( RC "Release Candidate ${PROJECT_VERSION_TWEAK}" ) +endif() + +# Set RV = Release Version +set(RV "Exiv2 v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") + set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${VS}${BUNDLE_NAME}${BS}${CC}${LT}${BT}${VI}${WR}) # https://stackoverflow.com/questions/17495906/copying-files-and-including-them-in-a-cpack-archive @@ -117,7 +129,9 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/build/logs/test.txt) endif() # Copy releasenotes.txt and appropriate ReadMe.txt (eg releasenotes/${PACKDIR}/ReadMe.txt) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/${PACKDIR}/ReadMe.txt DESTINATION .) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/releasenotes.txt DESTINATION .) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/${PACKDIR}/ReadMe.txt ReadMe.txt @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/releasenotes.txt releasenotes.txt @ONLY) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/ReadMe.txt ${CMAKE_CURRENT_BINARY_DIR}/releasenotes.txt DESTINATION .) +# file (REMOVE ${CMAKE_CURRENT_BINARY_DIR}/releasenotes.txt ${CMAKE_CURRENT_BINARY_DIR}/ReadMe.txt) include (CPack) diff --git a/contrib/msvc/build/samples/mrwthumb.vcxproj b/contrib/msvc/build/samples/mrwthumb.vcxproj new file mode 100644 index 00000000..0f2f4461 --- /dev/null +++ b/contrib/msvc/build/samples/mrwthumb.vcxproj @@ -0,0 +1,280 @@ + + + + x64 + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F5882A01-8E6A-3517-8314-98871ABEA30C} + 10.0 + Win32Proj + x64 + mrwthumb + NoUpgrade + + + + Application + MultiByte + v142 + + + Application + MultiByte + v142 + + + Application + MultiByte + v142 + + + Application + MultiByte + v142 + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(ProjectName)\ + true + true + true + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(ProjectName)\ + false + false + true + true + + + $(Platform)\$(Configuration)\$(ProjectName)\ + + + $(Platform)\$(Configuration)\$(ProjectName)\ + + + + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + true + Disabled + NotUsing + MultiThreadedDebugDLL + true + false + Level3 + WIN32;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR="/../share/locale";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + + + WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + + + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + true + Console + + + true + + + + + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + true + Disabled + NotUsing + MultiThreadedDebugDLL + true + false + Level3 + WIN32;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR="/../share/locale";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + + + WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + + + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + true + Console + + + true + + + + + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) + CompileAsCpp + Sync + true + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR="/../share/locale";CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + + + + + WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + + + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + false + Console + + + true + + + + + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) + CompileAsCpp + Sync + true + MaxSpeed + NotUsing + MultiThreadedDLL + true + false + Level3 + WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR="/../share/locale";CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + + + + + WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + + + $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + false + Console + + + true + + + + + + + + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} + + + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} + + + {58a821bc-e4af-4df4-9a54-2baa22b92615} + + + {127dc9de-814f-312c-8f30-4fe281393b38} + + + {0aa428d8-e6a8-3a36-9045-621f4dde3043} + + + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} + + + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} + + + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} + + + {15d4cbe5-4f35-3280-9747-7c4c0fabe386} + + + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} + exiv2-xmp + + + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} + exiv2lib + + + + + + diff --git a/contrib/msvc/build/unitTests/unit_tests.vcxproj b/contrib/msvc/build/unitTests/unit_tests.vcxproj index 709cc7d5..989f7b68 100644 --- a/contrib/msvc/build/unitTests/unit_tests.vcxproj +++ b/contrib/msvc/build/unitTests/unit_tests.vcxproj @@ -96,7 +96,8 @@ true false Level3 - CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + GTEST_LINKED_AS_SHARED_LIBRARY WIN32;_DEBUG;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -135,7 +136,8 @@ true false Level3 - CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + GTEST_LINKED_AS_SHARED_LIBRARY WIN32;_DEBUG;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -171,9 +173,10 @@ true false Level3 - CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + GTEST_LINKED_AS_SHARED_LIBRARY WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) @@ -209,9 +212,10 @@ true false Level3 - CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + GTEST_LINKED_AS_SHARED_LIBRARY WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) diff --git a/contrib/msvc/build/unitTests/unit_tests.vcxproj.filters b/contrib/msvc/build/unitTests/unit_tests.vcxproj.filters index fc2e9b90..1e7be231 100644 --- a/contrib/msvc/build/unitTests/unit_tests.vcxproj.filters +++ b/contrib/msvc/build/unitTests/unit_tests.vcxproj.filters @@ -1,473 +1,163 @@  - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releasenotes/CYGWIN/ReadMe.txt b/releasenotes/CYGWIN/ReadMe.txt index 037cbd27..2959e3cd 100644 --- a/releasenotes/CYGWIN/ReadMe.txt +++ b/releasenotes/CYGWIN/ReadMe.txt @@ -1,5 +1,4 @@ -CYGWIN Exiv2 v0.27.2 Bundle -------------------------------- +@RV@ Cygwin/Windows Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/Darwin/ReadMe.txt b/releasenotes/Darwin/ReadMe.txt index 58275cb5..fa91219e 100644 --- a/releasenotes/Darwin/ReadMe.txt +++ b/releasenotes/Darwin/ReadMe.txt @@ -1,5 +1,4 @@ -macOS (Darwin) Exiv2 v0.27.2 Bundle ------------------------------------ +@RV@ macOS (Darwin) Bundle @RC@ Structure of the bundle ----------------------- diff --git a/releasenotes/Linux/ReadMe.txt b/releasenotes/Linux/ReadMe.txt index 3df24fc1..38f1698e 100644 --- a/releasenotes/Linux/ReadMe.txt +++ b/releasenotes/Linux/ReadMe.txt @@ -1,5 +1,4 @@ -Linux Exiv2 v0.27.2-RC3 Bundle ------------------------------- +@RV@ Linux Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/MinGW/ReadMe.txt b/releasenotes/MinGW/ReadMe.txt index ffeee0bd..0860cd33 100644 --- a/releasenotes/MinGW/ReadMe.txt +++ b/releasenotes/MinGW/ReadMe.txt @@ -1,5 +1,4 @@ -MinGW/msys2 Exiv2 v0.27.2 Bundle ------------------------------------- +@RV@ MinGW/Windows Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/Unix/ReadMe.txt b/releasenotes/Unix/ReadMe.txt index f7eee9de..9fe3c9a5 100644 --- a/releasenotes/Unix/ReadMe.txt +++ b/releasenotes/Unix/ReadMe.txt @@ -1,5 +1,4 @@ -Unix Exiv2 v0.27.2 Bundle (FreeBSD and NetBSD) --------------------------------------------------- +@RV@ @CMAKE_SYSTEM_NAME@ Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/msvc/ReadMe.txt b/releasenotes/msvc/ReadMe.txt index 36167d27..17348c74 100644 --- a/releasenotes/msvc/ReadMe.txt +++ b/releasenotes/msvc/ReadMe.txt @@ -1,5 +1,4 @@ -Visual Studio 2017 Release DLL v0.27.2 Bundle -------------------------------------------------- +@RV@ Visual Studio Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/releasenotes.txt b/releasenotes/releasenotes.txt index 610a0bd6..30538985 100644 --- a/releasenotes/releasenotes.txt +++ b/releasenotes/releasenotes.txt @@ -1,13 +1,9 @@ -Exiv2 v0.27.2 -------------- +@RV@ @RC@ -Exiv2 v0.27 Second Dot Release +Headline Features of Exiv2 v0.27.3 +---------------------------------- +To be written -Thank You to Kevin for security contributions to this release. -Thank You to Ting-Wei for Unix contributions to this release. -Thank You to Dan and Luis for their solid efforts on Exiv2. -Thank You to Andreas S for representing Team Exiv2 at LGM 2019. -Contributors: Jens, Nehal, Phil, Toni, Paul Headline Features of Exiv2 v0.27.2 ---------------------------------- diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 3c9e9398..5a8d1239 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2541,6 +2541,8 @@ fmountlens[] = { {0xf4,0x4c,0x7c,0x7c,0x2c,0x2c,0x4b,0x02,0x00,0x00,0x00, "Sigma", "", "APO MACRO 180mm F3.5 EX DG"}, // https://github.com/Exiv2/exiv2/issues/1078 {0x80,0x48,0x1C,0x29,0x24,0x24,0x7A,0x06,0x00,0x00,0x00, "Tokina", "", "atx-i 11-16mm F2.8 CF"}, +// https://github.com/Exiv2/exiv2/pull/1105 +{0xCB,0x3C,0x2B,0x44,0x24,0x31,0xDF,0x46,0x00,0x00,0x00, "Tamron", "A037", "17-35mm F/2.8-4 Di OSD"}, // {0,0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL} }; diff --git a/test/data/exiv2-pr1105.exv b/test/data/exiv2-pr1105.exv new file mode 100644 index 00000000..e7424edd Binary files /dev/null and b/test/data/exiv2-pr1105.exv differ diff --git a/tests/bugfixes/github/test_pr_1105.py b/tests/bugfixes/github/test_pr_1105.py new file mode 100644 index 00000000..16d9024d --- /dev/null +++ b/tests/bugfixes/github/test_pr_1105.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- + +from system_tests import CaseMeta, path + +class Tamron_17_35_Di_OSD(metaclass=CaseMeta): + + filename = path("$data_path/exiv2-pr1105.exv") + commands = ["$exiv2 -pa --grep lens/i $filename"] + + stdout = ["""Exif.Nikon3.LensType Byte 1 D G +Exif.Nikon3.Lens Rational 4 17-35mm F2.8-4 +Exif.Nikon3.LensFStops Undefined 4 5 +Exif.NikonLd3.LensIDNumber Byte 1 Tamron 17-35mm F/2.8-4 Di OSD +Exif.NikonLd3.LensFStops Byte 1 F5.0 +""" + ] + stderr = [""] + retval = [0]