[Hugin-cvs] SF.net SVN: hugin:[4444] hugin/branches/gsoc2009_deghosting/src

[<st...@us...>]

Revision: 4444
          http://hugin.svn.sourceforge.net/hugin/?rev=4444&view=rev
Author:   stativ
Date:     2009-09-18 08:04:14 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Some Windows compile fixes. Patch by Thomas Modes.

Modified Paths:
--------------
    hugin/branches/gsoc2009_deghosting/src/deghosting/deghosting.h
    hugin/branches/gsoc2009_deghosting/src/deghosting/deghosting_mask.cpp
    hugin/branches/gsoc2009_deghosting/src/deghosting/khan.h
    hugin/branches/gsoc2009_deghosting/src/deghosting/threshold.h
    hugin/branches/gsoc2009_deghosting/src/foreign/getopt/src/getopt.c

Modified: hugin/branches/gsoc2009_deghosting/src/deghosting/deghosting.h
===================================================================
--- hugin/branches/gsoc2009_deghosting/src/deghosting/deghosting.h	2009-09-18 05:46:12 UTC (rev 4443)
+++ hugin/branches/gsoc2009_deghosting/src/deghosting/deghosting.h	2009-09-18 08:04:14 UTC (rev 4444)
@@ -24,8 +24,14 @@
 #include <exception>
 #include <vector>
 #include <string>
-#include <stdint.h>
 
+#ifdef _WIN32
+    #include <boost/cstdint.hpp>
+    using namespace boost;
+#else
+    #include <stdint.h>
+#endif
+
 #include <boost/shared_ptr.hpp>
 #include <vigra/stdimage.hxx>
 #include <vigra/imageinfo.hxx>

Modified: hugin/branches/gsoc2009_deghosting/src/deghosting/deghosting_mask.cpp
===================================================================
--- hugin/branches/gsoc2009_deghosting/src/deghosting/deghosting_mask.cpp	2009-09-18 05:46:12 UTC (rev 4443)
+++ hugin/branches/gsoc2009_deghosting/src/deghosting/deghosting_mask.cpp	2009-09-18 08:04:14 UTC (rev 4444)
@@ -36,11 +36,10 @@
 // deghosting algorithms
 #include "khan.h"
 
-//#ifdef WIN32
- #include <getopt.h>
-//#else
- #include <unistd.h>
-//#endif
+#include <getopt.h>
+#ifdef WIN32
+    #define snprintf _snprintf
+#endif
 
 using std::cout;
 using std::cerr;

Modified: hugin/branches/gsoc2009_deghosting/src/deghosting/khan.h
===================================================================
--- hugin/branches/gsoc2009_deghosting/src/deghosting/khan.h	2009-09-18 05:46:12 UTC (rev 4443)
+++ hugin/branches/gsoc2009_deghosting/src/deghosting/khan.h	2009-09-18 08:04:14 UTC (rev 4444)
@@ -44,6 +44,9 @@
 // ie. 1 for neighbourhood of size 3x3, 2 for 5x5 etc.
 #define NEIGHB_DIST 1
 
+#if defined WIN32
+    #define snprintf _snprintf
+#endif
 // define for use atan based kernel function
 // leave undefined for gaussian normal distribution function
 //#define ATAN_KH

Modified: hugin/branches/gsoc2009_deghosting/src/deghosting/threshold.h
===================================================================
--- hugin/branches/gsoc2009_deghosting/src/deghosting/threshold.h	2009-09-18 05:46:12 UTC (rev 4443)
+++ hugin/branches/gsoc2009_deghosting/src/deghosting/threshold.h	2009-09-18 08:04:14 UTC (rev 4444)
@@ -19,7 +19,6 @@
 */
 
 #include <vector>
-#include <stdint.h>
 
 #include <boost/shared_ptr.hpp>
 #include <vigra/stdimage.hxx>

Modified: hugin/branches/gsoc2009_deghosting/src/foreign/getopt/src/getopt.c
===================================================================
--- hugin/branches/gsoc2009_deghosting/src/foreign/getopt/src/getopt.c	2009-09-18 05:46:12 UTC (rev 4443)
+++ hugin/branches/gsoc2009_deghosting/src/foreign/getopt/src/getopt.c	2009-09-18 08:04:14 UTC (rev 4444)
@@ -689,6 +689,12 @@
 			   0);
 }
 
+int getopt_long (int argc, char *const *argv, const char *shortopts,
+                 const struct option *longopts, int *longind)
+{
+    return _getopt_internal(argc, argv, shortopts, longopts, longind, 0);
+}
+
 #endif	/* _LIBC or not __GNU_LIBRARY__.  */
 
 #ifdef TEST


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.