Merge branch '0.27-maintenance' into fix_984_0.27

v0.27.3
Robin Mills 5 years ago committed by GitHub
commit ed8ac84d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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)

@ -0,0 +1,280 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{F5882A01-8E6A-3517-8314-98871ABEA30C}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword>
<Platform>x64</Platform>
<ProjectName>mrwthumb</ProjectName>
<VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<CompileAs>CompileAsCpp</CompileAs>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ExceptionHandling>Sync</ExceptionHandling>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR="/../share/locale";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
<InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
<ProxyFileName>%(Filename)_p.c</ProxyFileName>
</Midl>
<Link>
<AdditionalDependencies>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</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
</Link>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<CompileAs>CompileAsCpp</CompileAs>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ExceptionHandling>Sync</ExceptionHandling>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR="/../share/locale";CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
<InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
<ProxyFileName>%(Filename)_p.c</ProxyFileName>
</Midl>
<Link>
<AdditionalDependencies>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</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
</Link>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR="/../share/locale";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>
</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
<InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
<ProxyFileName>%(Filename)_p.c</ProxyFileName>
</Midl>
<Link>
<AdditionalDependencies>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</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
</Link>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR="/../share/locale";CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>
</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
<InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
<ProxyFileName>%(Filename)_p.c</ProxyFileName>
</Midl>
<Link>
<AdditionalDependencies>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</AdditionalDependencies>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
</Link>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="$(ProjectDir)..\..\samples\mrwthumb.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj">
<Project>{da6f56b4-06a4-441d-ad70-ac5a7d51fadb}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\gettext\build\gettext\libintl_static.vcxproj">
<Project>{b8b3b620-fc06-47d0-9d92-bd5cba448d84}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\libexpat\expat\lib\expat_static.vcxproj">
<Project>{58a821bc-e4af-4df4-9a54-2baa22b92615}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\libssh2\build\src\libssh2.vcxproj">
<Project>{127dc9de-814f-312c-8f30-4fe281393b38}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\libssh\build\src\ssh.vcxproj">
<Project>{0aa428d8-e6a8-3a36-9045-621f4dde3043}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj">
<Project>{c92e1e46-3c94-4dd6-8e7d-e23eced32a8c}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj">
<Project>{1e068827-5cd6-4648-98dd-b0417f0b9ddc}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj">
<Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
</ProjectReference>
<ProjectReference Include="..\src\exiv2lib_int.vcxproj">
<Project>{15d4cbe5-4f35-3280-9747-7c4c0fabe386}</Project>
</ProjectReference>
<ProjectReference Include="$(ProjectDir)..\xmpsdk\exiv2-xmp.vcxproj">
<Project>{D1483131-BF1B-37C3-B1C8-A6FB8235195B}</Project>
<Name>exiv2-xmp</Name>
</ProjectReference>
<ProjectReference Include="$(ProjectDir)..\src\exiv2lib.vcxproj">
<Project>{8F05B0E7-6D03-3F78-A470-0E20BF6C6191}</Project>
<Name>exiv2lib</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

@ -96,7 +96,8 @@
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
@ -135,7 +136,8 @@
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
@ -171,9 +173,10 @@
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<DebugInformationFormat>
</DebugInformationFormat>
<UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
@ -209,9 +212,10 @@
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<DebugInformationFormat>
</DebugInformationFormat>
<UndefinePreprocessorDefinitions>GTEST_LINKED_AS_SHARED_LIBRARY</UndefinePreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>

@ -1,473 +1,163 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="E:\Projects\exiv2\unitTests\mainTestRunner.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_basicio.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_types.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_tiffheader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_futils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_enforce.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_safe_op.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_XmpKey.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_DateValue.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_TimeValue.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_cr2header_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_helper_functions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_slice.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\unitTests\test_image_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\basicio.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\bigtiffimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\bmpimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\convert.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\cr2image.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\crwimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\datasets.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\easyaccess.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\epsimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\error.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\exif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\futils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\gifimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\http.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\image.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\ini.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\iptc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\jp2image.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\jpgimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\metadatum.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\mrwimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\orfimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\pgfimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\preview.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\properties.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\psdimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\rafimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\rw2image.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\tags.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\tgaimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\tiffimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\types.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\value.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\version.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\webpimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\xmp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\xmpsidecar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\ssh.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\pngimage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\asfvideo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\matroskavideo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\quicktimevideo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\riffvideo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\utilsvideo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\canonmn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\casiomn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\cr2header_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\crwimage_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\fujimn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\helper_functions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\image_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\makernote_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\minoltamn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\nikonmn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\olympusmn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\orfimage_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\panasonicmn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\pentaxmn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\rw2image_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\samsungmn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\sigmamn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\sonymn_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\tags_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\tiffcomposite_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\tiffimage_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\tiffvisitor_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="E:\Projects\exiv2\src\pngchunk_int.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(ProjectDir)..\..\unitTests\mainTestRunner.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_basicio.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_types.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_tiffheader.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_futils.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_enforce.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_safe_op.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_XmpKey.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_DateValue.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_TimeValue.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_cr2header_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_helper_functions.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_slice.cpp" />
<ClCompile Include="$(ProjectDir)..\..\unitTests\test_image_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\basicio.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\bigtiffimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\bmpimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\convert.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\cr2image.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\crwimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\datasets.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\easyaccess.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\epsimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\error.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\exif.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\futils.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\gifimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\http.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\image.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\ini.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\iptc.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\jp2image.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\jpgimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\metadatum.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\mrwimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\orfimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\pgfimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\preview.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\properties.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\psdimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\rafimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\rw2image.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\tags.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\tgaimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\tiffimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\types.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\value.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\version.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\webpimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\xmp.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\xmpsidecar.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\ssh.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\pngimage.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\asfvideo.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\matroskavideo.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\quicktimevideo.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\riffvideo.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\utilsvideo.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\canonmn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\casiomn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\cr2header_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\crwimage_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\fujimn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\helper_functions.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\image_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\makernote_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\minoltamn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\nikonmn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\olympusmn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\orfimage_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\panasonicmn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\pentaxmn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\rw2image_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\samsungmn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\sigmamn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\sonymn_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\tags_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\tiffcomposite_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\tiffimage_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\tiffvisitor_int.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\pngchunk_int.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="E:\Projects\exiv2\unitTests\gtestwrapper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\exiv2.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\rwlock.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\slice.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\basicio.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\bmpimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\convert.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\cr2image.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\crwimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\datasets.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\easyaccess.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\epsimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\error.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\exif.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\futils.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\gifimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\http.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\image.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\ini.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\iptc.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\jp2image.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\jpgimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\metadatum.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\mrwimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\orfimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\pgfimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\preview.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\properties.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\psdimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\rafimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\rw2image.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\tags.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\tgaimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\tiffimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\types.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\value.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\version.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\webpimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\xmp_exiv2.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\xmpsidecar.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\ssh.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\pngimage.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\asfvideo.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\matroskavideo.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\quicktimevideo.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\riffvideo.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\include\exiv2\utilsvideo.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\canonmn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\casiomn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\cr2header_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\crwimage_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\fujimn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\helper_functions.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\image_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\makernote_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\minoltamn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\nikonmn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\olympusmn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\orfimage_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\panasonicmn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\pentaxmn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\rw2image_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\safe_op.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\samsungmn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\sigmamn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\sonymn_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\tags_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\tiffcomposite_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\tiffimage_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\tiffvisitor_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\tifffwd_int.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\timegm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="E:\Projects\exiv2\src\unused.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\..\unitTests\gtestwrapper.h" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\config.h" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\exiv2.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\rwlock.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\slice.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\basicio.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\bmpimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\convert.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\cr2image.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\crwimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\datasets.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\easyaccess.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\epsimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\error.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\exif.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\futils.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\gifimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\http.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\image.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\ini.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\iptc.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\jp2image.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\jpgimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\metadatum.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\mrwimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\orfimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\pgfimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\preview.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\properties.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\psdimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\rafimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\rw2image.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\tags.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\tgaimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\tiffimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\types.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\value.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\version.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\webpimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\xmp_exiv2.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\xmpsidecar.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\ssh.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\pngimage.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\asfvideo.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\matroskavideo.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\quicktimevideo.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\riffvideo.hpp" />
<ClInclude Include="$(ProjectDir)..\..\exiv2\include\exiv2\utilsvideo.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\canonmn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\casiomn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\cr2header_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\crwimage_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\fujimn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\helper_functions.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\image_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\makernote_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\minoltamn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\nikonmn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\olympusmn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\orfimage_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\panasonicmn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\pentaxmn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\rw2image_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\safe_op.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\samsungmn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\sigmamn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\sonymn_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\tags_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\tiffcomposite_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\tiffimage_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\tiffvisitor_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\tifffwd_int.hpp" />
<ClInclude Include="$(ProjectDir)..\..\src\timegm.h" />
<ClInclude Include="$(ProjectDir)..\..\src\unused.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="Header Files">

@ -1,5 +1,4 @@
CYGWIN Exiv2 v0.27.2 Bundle
-------------------------------
@RV@ Cygwin/Windows Bundle @RC@
Structure of the bundle:
------------------------

@ -1,5 +1,4 @@
macOS (Darwin) Exiv2 v0.27.2 Bundle
-----------------------------------
@RV@ macOS (Darwin) Bundle @RC@
Structure of the bundle
-----------------------

@ -1,5 +1,4 @@
Linux Exiv2 v0.27.2-RC3 Bundle
------------------------------
@RV@ Linux Bundle @RC@
Structure of the bundle:
------------------------

@ -1,5 +1,4 @@
MinGW/msys2 Exiv2 v0.27.2 Bundle
------------------------------------
@RV@ MinGW/Windows Bundle @RC@
Structure of the bundle:
------------------------

@ -1,5 +1,4 @@
Unix Exiv2 v0.27.2 Bundle (FreeBSD and NetBSD)
--------------------------------------------------
@RV@ @CMAKE_SYSTEM_NAME@ Bundle @RC@
Structure of the bundle:
------------------------

@ -1,5 +1,4 @@
Visual Studio 2017 Release DLL v0.27.2 Bundle
-------------------------------------------------
@RV@ Visual Studio Bundle @RC@
Structure of the bundle:
------------------------

@ -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
----------------------------------

@ -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}
};

Binary file not shown.

@ -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]
Loading…
Cancel
Save