[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:56 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b46cac7
The following commit has been merged in the master branch:
commit b46cac77900a36e31feaeba90f9f2201dd291e4d
Author: Robin Mills <robin at clanmills.com>
Date: Fri Sep 16 05:33:40 2016 +0000
#1126 Fixes submitted for msvc2003
---
include/exiv2/exv_msvc.h | 436 +++++++++++++++++++-------------------
include/exiv2/rwlock.hpp | 5 +
msvc2003/exiv2/exiv2.vcproj | 306 +++++++++++++++++++++++++-
msvc2003/exiv2lib/exiv2lib.vcproj | 9 +
src/exiv2.cpp | 36 ++--
src/image.cpp | 5 +
6 files changed, 559 insertions(+), 238 deletions(-)
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index d86ca8b..e809ee6 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -1,219 +1,217 @@
-/**/
-/* exv_msvc.h */
-
-#ifndef _EXV_MSVC_H_
-#define _EXV_MSVC_H_
-
-/* Define to 1 if you want to use `libssh' for SshIO. */
-/* #undef EXV_USE_SSH */
-
-/* Define to 1 if you want to use `libcurl' in httpIO. */
-/* #undef EXV_USE_CURL */
-
-/* Define to 1 if you have the `alarm' function. */
-/* #undef EXV_HAVE_ALARM */
-
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
- don't. */
-/* #undef EXV_HAVE_DECL_STRERROR_R */
-
-/* Define to 1 if you have the `gmtime_r' function. */
-/* #undef EXV_HAVE_GMTIME_R */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef EXV_HAVE_INTTYPES_H */
-
-/* Define to 1 if you have the <libintl.h> header file. */
-#define EXV_HAVE_LIBINTL_H 1
-
-/* Define to 1 if you require video support. */
-/* #undef EXV_ENABLE_VIDEO */
-
-/* Define to 1 if you require webready support. */
-/* #undef EXV_ENABLE_WEBREADY */
-
-#ifndef EXV_COMMERCIAL_VERSION
-
-/* Define to 1 to enable translation of Nikon lens names. */
-#define EXV_HAVE_LENSDATA 1
-
-/* Define to 1 if translation of program messages to the user's
- native language is requested. */
-/* #undef EXV_ENABLE_NLS */
-
-/* Define to 1 if you have the `iconv' function. */
-/* #undef EXV_HAVE_ICONV */
-
-/* Define to 1 to enable conversion of UCS2 encoded Windows tags to UTF-8. */
-#define EXV_HAVE_PRINTUCS2 1
-
-#endif /* !EXV_COMMERCIAL_VERSION */
-
-/* Define Windows unicode path support. */
-/* #define EXV_UNICODE_PATH 1 */
-
-/* Define to `const' or to empty, depending on the second argument of `iconv'. */
-/* #undef ICONV_ACCEPTS_CONST_INPUT */
-#if defined ICONV_ACCEPTS_CONST_INPUT
-#define EXV_ICONV_CONST const
-#else
-#define EXV_ICONV_CONST
-#endif
-
-/* Define to 1 if you have the <regex.h> header file. */
-/* #undef EXV_HAVE_REGEX */
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
- to 0 otherwise. */
-/* #undef EXV_HAVE_MALLOC */
-
-/* Define to 1 if you have the <malloc.h> header file. */
-/* #undef EXV_HAVE_MALLOC_H */
-
-/* Define to 1 if you have the <memory.h> header file. */
-/* #undef EXV_HAVE_MEMORY_H */
-
-/* Define to 1 if you have the `memset' function. */
-#define EXV_HAVE_MEMSET 1
-
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
- and to 0 otherwise. */
-#define EXV_HAVE_REALLOC 1
-
-/* Define to 1 if stdbool.h conforms to C99. */
-/* #undef EXV_HAVE_STDBOOL_H */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef EXV_HAVE_STDINT_H */
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-/* #undef EXV_HAVE_STDLIB_H */
-
-/* Define to 1 if you have the `strchr' function. */
-#define EXV_HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define EXV_HAVE_STRERROR 1
-
-/* Define to 1 if you have the `strerror_r' function. */
-/* #undef EXV_HAVE_STRERROR_R */
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef EXV_HAVE_STRINGS_H */
-
-/* Define to 1 if you have the <string.h> header file. */
-/* #undef EXV_HAVE_STRING_H */
-
-/* Define to 1 if you have the `strtol' function. */
-#define EXV_HAVE_STRTOL 1
-
-/* Define to 1 if you have the `mmap' function. */
-/* #undef EXV_HAVE_MMAP */
-
-/* Define to 1 if you have the `munmap' function. */
-/* #undef EXV_HAVE_MUNMAP */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-/* #undef EXV_HAVE_SYS_STAT_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-/* #undef EXV_HAVE_SYS_TIME_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-/* #undef EXV_HAVE_SYS_TYPES_H */
-
-/* Define to 1 if you have the `timegm' function. */
-/* #undef EXV_HAVE_TIMEGM */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef EXV_HAVE_UNISTD_H */
-
-/* Define to 1 if you have the `vprintf' function. */
-#define EXV_HAVE_VPRINTF 1
-
-/* Define to 1 if you have the <wchar.h> header file. */
-/* #undef EXV_HAVE_WCHAR_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef EXV_HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the `zlib' library. */
-#define EXV_HAVE_LIBZ 1
-
-#if defined(_MSC_VER) && HAVE_LIBZ
- #if (_MSC_VER < 1400) && !defined(vsnprintf)
- #define vsnprintf _vsnprintf
- #endif
-#endif
-
-/* Define to 1 if you have the <process.h> header file. */
-#define EXV_HAVE_PROCESS_H 1
-
-/* Define to 1 if you have the Adobe XMP Toolkit. */
-#define EXV_HAVE_XMP_TOOLKIT 1
-
-/* Define to 1 if the system has the type `_Bool'. */
-/* #undef EXV_HAVE__BOOL */
-
-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
- slash. */
-/* #undef EXV_LSTAT_FOLLOWS_SLASHED_SYMLINK */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define EXV_PACKAGE_BUGREPORT "ahuggel at gmx.net"
-
-/* Define to the name of this package. */
-#define EXV_PACKAGE "exiv2"
-
-/* Define to the full name of this package. */
-#define EXV_PACKAGE_NAME "exiv2"
-
-/* Define to the full name and version of this package. */
-#define EXV_PACKAGE_STRING "exiv2 0.25"
-
-/* Define to the one symbol short name of this package. */
-#define EXV_PACKAGE_TARNAME "exiv2"
-
-/* Define to the version of this package. */
-#define EXV_PACKAGE_VERSION "0.25"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if strerror_r returns char *. */
-/* #undef STRERROR_R_CHAR_P */
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to rpl_malloc if the replacement function should be used. */
-/* #undef malloc */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef HAVE_PID_T */
-
-/* On Microsoft compilers pid_t has to be set to int. */
-#ifndef HAVE_PID_T
-typedef int pid_t;
-#endif
-
-/* Define to rpl_realloc if the replacement function should be used. */
-/* #undef realloc */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-
-#endif
+/**/
+/* exv_msvc.h */
+
+#pragma once
+#ifndef _EXV_MSVC_H_
+#define _EXV_MSVC_H_
+
+/* Define to 1 if you want to use `libssh' for SshIO. */
+/* #undef EXV_USE_SSH */
+
+/* Define to 1 if you want to use `libcurl' in httpIO. */
+/* #undef EXV_USE_CURL */
+
+/* Define to 1 if you have the `alarm' function. */
+/* #undef EXV_HAVE_ALARM */
+
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
+ don't. */
+/* #undef EXV_HAVE_DECL_STRERROR_R */
+
+/* Define to 1 if you have the `gmtime_r' function. */
+/* #undef EXV_HAVE_GMTIME_R */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+/* #undef EXV_HAVE_INTTYPES_H */
+
+/* Define to 1 if you have the <libintl.h> header file. */
+#define EXV_HAVE_LIBINTL_H 1
+
+/* Define to 1 if you require video support. */
+/* #undef EXV_ENABLE_VIDEO */
+
+/* Define to 1 if you require webready support. */
+/* #undef EXV_ENABLE_WEBREADY */
+
+#ifndef EXV_COMMERCIAL_VERSION
+
+/* Define to 1 to enable translation of Nikon lens names. */
+#define EXV_HAVE_LENSDATA 1
+
+/* Define to 1 if translation of program messages to the user's
+ native language is requested. */
+/* #undef EXV_ENABLE_NLS */
+
+/* Define to 1 if you have the `iconv' function. */
+/* #undef EXV_HAVE_ICONV */
+
+/* Define to 1 to enable conversion of UCS2 encoded Windows tags to UTF-8. */
+#define EXV_HAVE_PRINTUCS2 1
+
+#endif /* !EXV_COMMERCIAL_VERSION */
+
+/* Define Windows unicode path support. */
+/* #undef EXV_UNICODE_PATH */
+
+
+/* Define to `const' or to empty, depending on the second argument of `iconv'. */
+/* #undef ICONV_ACCEPTS_CONST_INPUT */
+#if defined ICONV_ACCEPTS_CONST_INPUT
+#define EXV_ICONV_CONST const
+#else
+#define EXV_ICONV_CONST
+#endif
+
+/* Define to 1 if you have the <regex.h> header file. */
+/* #undef EXV_HAVE_REGEX */
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+ to 0 otherwise. */
+/* #undef EXV_HAVE_MALLOC */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef EXV_HAVE_MALLOC_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+/* #undef EXV_HAVE_MEMORY_H */
+
+/* Define to 1 if you have the `memset' function. */
+#define EXV_HAVE_MEMSET 1
+
+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+ and to 0 otherwise. */
+#define EXV_HAVE_REALLOC 1
+
+/* Define to 1 if stdbool.h conforms to C99. */
+/* #undef EXV_HAVE_STDBOOL_H */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #undef EXV_HAVE_STDINT_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+/* #undef EXV_HAVE_STDLIB_H */
+
+/* Define to 1 if you have the `strchr' function. */
+#define EXV_HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define EXV_HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strerror_r' function. */
+/* #undef EXV_HAVE_STRERROR_R */
+
+/* Define to 1 if you have the <strings.h> header file. */
+/* #undef EXV_HAVE_STRINGS_H */
+
+/* Define to 1 if you have the <string.h> header file. */
+/* #undef EXV_HAVE_STRING_H */
+
+/* Define to 1 if you have the `strtol' function. */
+#define EXV_HAVE_STRTOL 1
+
+/* Define to 1 if you have the `mmap' function. */
+/* #undef EXV_HAVE_MMAP */
+
+/* Define to 1 if you have the `munmap' function. */
+/* #undef EXV_HAVE_MUNMAP */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+/* #undef EXV_HAVE_SYS_STAT_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+/* #undef EXV_HAVE_SYS_TIME_H */
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+/* #undef EXV_HAVE_SYS_TYPES_H */
+
+/* Define to 1 if you have the `timegm' function. */
+/* #undef EXV_HAVE_TIMEGM */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #undef EXV_HAVE_UNISTD_H */
+
+/* Define to 1 if you have the `vprintf' function. */
+#define EXV_HAVE_VPRINTF 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+/* #undef EXV_HAVE_WCHAR_H */
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+/* #undef EXV_HAVE_SYS_MMAN_H */
+
+/* Define to 1 if you have the `zlib' library. */
+#define EXV_HAVE_LIBZ 1
+
+#if defined(_MSC_VER) && HAVE_LIBZ
+ #if (_MSC_VER < 1400)// && !defined(vsnprintf)
+ #define vsnprintf _vsnprintf
+ #endif
+#endif
+
+/* Define to 1 if you have the <process.h> header file. */
+#define EXV_HAVE_PROCESS_H 1
+
+/* Define to 1 if you have the Adobe XMP Toolkit. */
+#define EXV_HAVE_XMP_TOOLKIT 1
+
+/* Define to 1 if the system has the type `_Bool'. */
+/* #undef EXV_HAVE__BOOL */
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+ slash. */
+/* #undef EXV_LSTAT_FOLLOWS_SLASHED_SYMLINK */
+
+/* Define to the address where bug reports for this package should be sent. */
+#define EXV_PACKAGE_BUGREPORT "ahuggel at gmx.net"
+
+/* Define to the name of this package. */
+#define EXV_PACKAGE "exiv2"
+
+/* Define to the full name of this package. */
+#define EXV_PACKAGE_NAME "exiv2"
+
+/* Define to the full name and version of this package. */
+#define EXV_PACKAGE_STRING "exiv2 0.25"
+
+/* Define to the one symbol short name of this package. */
+#define EXV_PACKAGE_TARNAME "exiv2"
+
+/* Define to the version of this package. */
+#define EXV_PACKAGE_VERSION "0.25"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if strerror_r returns char *. */
+/* #undef STRERROR_R_CHAR_P */
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to rpl_malloc if the replacement function should be used. */
+/* #undef malloc */
+
+/* On Microsoft compilers pid_t has to be set to int. */
+#ifndef HAVE_PID_T
+typedef int pid_t;
+#endif
+
+/* Define to rpl_realloc if the replacement function should be used. */
+/* #undef realloc */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+#endif // _EXV_CONF_H_
diff --git a/include/exiv2/rwlock.hpp b/include/exiv2/rwlock.hpp
index 956c567..16b55ca 100644
--- a/include/exiv2/rwlock.hpp
+++ b/include/exiv2/rwlock.hpp
@@ -117,7 +117,12 @@ namespace Exiv2 {
bool tryenter()
{
+#ifdef MSDEV_2003
+ EnterCriticalSection(&lock_);
+ return true;
+#else
return 0 != TryEnterCriticalSection(&lock_);
+#endif
}
private:
diff --git a/msvc2003/exiv2/exiv2.vcproj b/msvc2003/exiv2/exiv2.vcproj
index dcfe599..96b3879 100644
--- a/msvc2003/exiv2/exiv2.vcproj
+++ b/msvc2003/exiv2/exiv2.vcproj
@@ -1 +1,305 @@
-<?xml version="1.0" encoding="Windows-1252"?><VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="exiv2" ProjectGUID="{07293CAC-00DA-493E-90C9-5D010C2B1B53}" RootNamespace="exiv2" Keyword="Win32Proj" TargetFrameworkVersion="131072"><Platforms><Platform Name="Win32"/></Platforms><ToolFiles> </ToolFiles><Configurations><Configuration Name="Debug|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool"/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool"/><Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;" PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLinkerTool" LinkLibraryDependencies="false" AdditionalOptions="/NODEFAULTLIB:MSVCRTD" AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32in\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Debug\zlibd.lib" OutputFile="$(OutDir)/exiv2.exe" LinkIncremental="1" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/exiv2.pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" TargetMachine="1"/><Tool Name="VCALinkTool"/><Tool Name="VCManifestTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCAppVerifierTool"/><Tool Name="VCPostBuildEventTool" Description="copy target to bin" CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""/></Configuration><Configuration Name="Release|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool"/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool"/><Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;" PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLinkerTool" LinkLibraryDependencies="false" AdditionalOptions="/NODEFAULTLIB:MSVCRT" AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32in
elease\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Release\zlib.lib" OutputFile="$(OutDir)/exiv2.exe" LinkIncremental="1" IgnoreDefaultLibraryNames="" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" TargetMachine="1"/><Tool Name="VCALinkTool"/><Tool Name="VCManifestTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCAppVerifierTool"/><Tool Name="VCPostBuildEventTool" Description="copy target to bin" CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""/></Configuration><Configuration Name="DebugDLL|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool" CommandLine="copy/y ..\..\..\expat-2.0.1\win32in\debug\*.dll "$(TargetDir)""/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool"/><Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;" PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool" Description="copy the dlls" CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""/><Tool Name="VCLinkerTool" LinkLibraryDependencies="false" AdditionalOptions="/NODEFAULTLIB:LIBCMTD" AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib" OutputFile="$(OutDir)/exiv2.exe" LinkIncremental="1" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/exiv2.pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" TargetMachine="1"/><Tool Name="VCALinkTool"/><Tool Name="VCManifestTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCAppVerifierTool"/><Tool Name="VCPostBuildEventTool" Description="copy target to bin" CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)"
copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll
"/></Configuration><Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool" CommandLine="copy/y ..\..\..\expat-2.0.1\win32in
elease\*.dll "$(TargetDir)""/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool"/><Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;" PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL" MinimalRebuild="true" BasicRuntimeChecks="0" RuntimeLibrary="2" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool" Description="copy the dlls" CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""/><Tool Name="VCLinkerTool" LinkLibraryDependencies="false" AdditionalOptions="/NODEFAULTLIB:LIBCMTD" AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib" OutputFile="$(OutDir)/exiv2.exe" LinkIncremental="1" GenerateDebugInformation="false" ProgramDatabaseFile="$(OutDir)/exiv2.pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" TargetMachine="1"/><Tool Name="VCALinkTool"/><Tool Name="VCManifestTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCAppVerifierTool"/><Tool Name="VCPostBuildEventTool" Description="copy target to bin" CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)"
copy/y ..\..\..\expat-2.0.1\win32in\Release\libexpat.dll
"/></Configuration></Configurations><References> </References><Files><Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"><File RelativePath="..\..\srcctions.cpp"> </File><File RelativePath="..\..\src\exiv2.cpp"> </File><File RelativePath="..\..\src\getopt_win32.c"> </File><File RelativePath="..\..\src\localtime.c"> </File><File RelativePath="..\..\src\utils.cpp"> </File></Filter><Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"><File RelativePath="..\..\include\exiv2ctions.hpp"> </File><File RelativePath="..\..\include\exiv2\exiv2.hpp"> </File><File RelativePath="..\..\include\exiv2\getopt_win32.h"> </File><File RelativePath="..\..\include\exiv2\private.h"> </File><File RelativePath="..\..\include\exiv2 imegm.h"> </File><File RelativePath="..\..\include\exiv2 zfile.h"> </File><File RelativePath="..\..\include\exiv2\utils.hpp"> </File></Filter><Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> </Filter></Files><Globals> </Globals></VisualStudioProject><!-- use perl script exiv2/msvc64/ppxml to pretty print this file -->
\ No newline at end of file
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="exiv2"
+ ProjectGUID="{07293CAC-00DA-493E-90C9-5D010C2B1B53}"
+ RootNamespace="exiv2"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ WarnAsError="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/NODEFAULTLIB:MSVCRTD"
+ AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2sd.lib ..\..\..\expat-2.0.1\win32in\debug\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Debug\zlibd.lib"
+ OutputFile="$(OutDir)/exiv2.exe"
+ LinkIncremental="1"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="copy target to bin"
+ CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT"
+ RuntimeLibrary="0"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ WarnAsError="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/NODEFAULTLIB:MSVCRT"
+ AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2s.lib ..\..\..\expat-2.0.1\win32in
elease\libexpatMT.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_LIB_Release\zlib.lib"
+ OutputFile="$(OutDir)/exiv2.exe"
+ LinkIncremental="1"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="FALSE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="copy target to bin"
+ CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)""/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="DebugDLL|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ WarnAsError="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
+ AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2d.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"
+ OutputFile="$(OutDir)/exiv2.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="copy target to bin"
+ CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)"
+copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll
+"/>
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="copy/y ..\..\..\expat-2.0.1\win32in\debug\*.dll "$(TargetDir)""/>
+ <Tool
+ Name="VCPreLinkEventTool"
+ Description="copy the dlls"
+ CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="ReleaseDLL|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../include;../../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"
+ PreprocessorDefinitions="EXV_USE_CURL=0;WIN32;_NDEBUG;_CONSOLE;BUILD_GETOPT;EXV_HAVE_DLL;EXV_HAVE_DLL"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ WarningLevel="3"
+ WarnAsError="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
+ AdditionalDependencies="..\exiv2lib\$(ConfigurationName)\exiv2.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\xmpsdk\$(ConfigurationName)\xmpsdk.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"
+ OutputFile="$(OutDir)/exiv2.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="FALSE"
+ ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ Description="copy target to bin"
+ CommandLine="copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)"
+copy/y ..\..\..\expat-2.0.1\win32in\Release\libexpat.dll
+"/>
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="copy/y ..\..\..\expat-2.0.1\win32in
elease\*.dll "$(TargetDir)""/>
+ <Tool
+ Name="VCPreLinkEventTool"
+ Description="copy the dlls"
+ CommandLine="copy/y ..\exiv2lib\$(ConfigurationName)\*.dll "$(TargetDir)""/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath="..\..\srcctions.cpp">
+ </File>
+ <File
+ RelativePath="..\..\src\exiv2.cpp">
+ </File>
+ <File
+ RelativePath="..\..\src\getopt_win32.c">
+ </File>
+ <File
+ RelativePath="..\..\src\localtime.c">
+ </File>
+ <File
+ RelativePath="..\..\src\utils.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath="..\..\include\exiv2ctions.hpp">
+ </File>
+ <File
+ RelativePath="..\..\include\exiv2\exiv2.hpp">
+ </File>
+ <File
+ RelativePath="..\..\include\exiv2\getopt_win32.h">
+ </File>
+ <File
+ RelativePath="..\..\include\exiv2\private.h">
+ </File>
+ <File
+ RelativePath="..\..\include\exiv2 imegm.h">
+ </File>
+ <File
+ RelativePath="..\..\include\exiv2 zfile.h">
+ </File>
+ <File
+ RelativePath="..\..\include\exiv2\utils.hpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/msvc2003/exiv2lib/exiv2lib.vcproj b/msvc2003/exiv2lib/exiv2lib.vcproj
index 6f90dca..bc84b4a 100644
--- a/msvc2003/exiv2lib/exiv2lib.vcproj
+++ b/msvc2003/exiv2lib/exiv2lib.vcproj
@@ -292,6 +292,9 @@ copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDi
RelativePath="..\..\src\image.cpp">
</File>
<File
+ RelativePath="..\..\src\ini.cpp">
+ </File>
+ <File
RelativePath="..\..\src\iptc.cpp">
</File>
<File
@@ -403,6 +406,9 @@ copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDi
RelativePath="..\..\src
ersion.cpp">
</File>
<File
+ RelativePath="..\..\src\webpimage.cpp">
+ </File>
+ <File
RelativePath="..\..\src\xmp.cpp">
</File>
<File
@@ -459,6 +465,9 @@ copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDi
RelativePath="..\..\include\exiv2\image.hpp">
</File>
<File
+ RelativePath="..\..\src\ini_int.hpp">
+ </File>
+ <File
RelativePath="..\..\include\exiv2\iptc.hpp">
</File>
<File
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index d1d0fc3..f92b9ae 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -240,21 +240,21 @@ void Params::usage(std::ostream& os) const
std::string Params::printTarget(std::string before,int target,bool bPrint,std::ostream& out)
{
- std::string t;
- if ( target & Params::ctExif ) t+= 'e';
- if ( target & Params::ctXmpSidecar ) t+= 'X';
- if ( target & Params::ctXmpRaw ) t+= target & Params::ctXmpSidecar ? 'X' : 'R' ;
- if ( target & Params::ctIptc ) t+= 'i';
- if ( target & Params::ctIccProfile ) t+= 'C';
- if ( target & Params::ctIptcRaw ) t+= 'I';
- if ( target & Params::ctXmp ) t+= 'x';
- if ( target & Params::ctComment ) t+= 'c';
- if ( target & Params::ctThumb ) t+= 't';
- if ( target & Params::ctPreview ) t+= 'p';
- if ( target & Params::ctStdInOut ) t+= '-';
-
- if ( bPrint ) out << before << " :" << t << std::endl;
- return t;
+ std::string t;
+ if ( target & Params::ctExif ) t+= 'e';
+ if ( target & Params::ctXmpSidecar ) t+= 'X';
+ if ( target & Params::ctXmpRaw ) t+= target & Params::ctXmpSidecar ? 'X' : 'R' ;
+ if ( target & Params::ctIptc ) t+= 'i';
+ if ( target & Params::ctIccProfile ) t+= 'C';
+ if ( target & Params::ctIptcRaw ) t+= 'I';
+ if ( target & Params::ctXmp ) t+= 'x';
+ if ( target & Params::ctComment ) t+= 'c';
+ if ( target & Params::ctThumb ) t+= 't';
+ if ( target & Params::ctPreview ) t+= 'p';
+ if ( target & Params::ctStdInOut ) t+= '-';
+
+ if ( bPrint ) out << before << " :" << t << std::endl;
+ return t;
}
void Params::help(std::ostream& os) const
@@ -1064,13 +1064,13 @@ namespace {
| Params::ctComment
| Params::ctXmp; break;
case 'X':
- Params::printTarget("X before",target);
+ Params::printTarget("X before",target);
target |= Params::ctXmpSidecar|Params::ctExif | Params::ctIptc | Params::ctXmp ; // -eX
Params::printTarget("X after1",target);
if ( i ) { // -eXX
target |= Params::ctXmpRaw ;
- Params::printTarget("X after2",target);
+ Params::printTarget("X after2",target);
target ^= Params::ctExif|Params::ctIptc|Params::ctXmp ; // turn off those bits
}
Params::printTarget("X ending",target,false);
@@ -1151,7 +1151,7 @@ namespace {
}
int num = 0;
std::string line;
- while (std::getline(bStdin? std::cin : file, line)) {
+ while (bStdin?std::getline(std::cin, line):std::getline(file, line)) {
ModifyCmd modifyCmd;
if (parseLine(modifyCmd, line, ++num)) {
modifyCmds.push_back(modifyCmd);
diff --git a/src/image.cpp b/src/image.cpp
index eaaf106..6a8bc52 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -599,6 +599,11 @@ namespace Exiv2 {
namespace Exiv2 {
namespace Internal {
+#ifdef MSDEV_2003
+#undef vsnprintf
+#define vsnprintf _vsnprintf
+#endif
+
std::string stringFormat(const char* format, ...)
{
std::string result;
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list