#1126 Fixes submitted for msvc2003

include/exiv2/exv_msvc.h

@@ -1,6 +1,7 @@
 /**/
 /* exv_msvc.h */
 
+#pragma once
 #ifndef _EXV_MSVC_H_
 #define _EXV_MSVC_H_
 
@@ -50,7 +51,8 @@
 #endif /* !EXV_COMMERCIAL_VERSION */
 
 /* Define Windows unicode path support. */
-/* #define EXV_UNICODE_PATH 1 */
+/* #undef EXV_UNICODE_PATH */
+
 
 /* Define to `const' or to empty, depending on the second argument of `iconv'. */
 /* #undef ICONV_ACCEPTS_CONST_INPUT */
@@ -141,7 +143,7 @@
 #define EXV_HAVE_LIBZ 1
 
 #if defined(_MSC_VER) && HAVE_LIBZ
-  #if (_MSC_VER < 1400) && !defined(vsnprintf)
+  #if (_MSC_VER < 1400)// && !defined(vsnprintf)
   #define vsnprintf _vsnprintf
   #endif
 #endif
@@ -201,9 +203,6 @@
 /* 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;
@@ -215,5 +214,4 @@ typedef int pid_t;
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */
 
-
-#endif
+#endif // _EXV_CONF_H_

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:

msvc2003/exiv2lib/exiv2lib.vcproj

@@ -291,6 +291,9 @@ copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.dll $(OutDi
 			<File
 				RelativePath="..\..\src\image.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\ini.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\iptc.cpp">
 			</File>
@@ -402,6 +405,9 @@ copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.dll $(OutDi
 			<File
 				RelativePath="..\..\src\version.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\webpimage.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\xmp.cpp">
 			</File>
@@ -458,6 +464,9 @@ copy/y ..\..\..\zlib-1.2.3\projects\visualc6\Win32_DLL_Release\zlib1.dll $(OutDi
 			<File
 				RelativePath="..\..\include\exiv2\image.hpp">
 			</File>
+			<File
+				RelativePath="..\..\src\ini_int.hpp">
+			</File>
 			<File
 				RelativePath="..\..\include\exiv2\iptc.hpp">
 			</File>

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

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;