From ebd5ed3194e262424b504bf426f890ee2d64ec4b Mon Sep 17 00:00:00 2001 From: Finn <3guenthe@informatik.uni-hamburg.de> Date: Fri, 3 Aug 2018 10:47:53 +0200 Subject: [PATCH 1/2] Fix Windows Compiler error C2011 for examples. --- examples/chunkview.c | 4 +++- examples/glview.c | 3 +++ examples/hiview.c | 3 +++ examples/micview.c | 3 +++ examples/regview.c | 3 +++ wrappers/cpp/cpp_pc_view.cpp | 1 - wrappers/cpp/cppview.cpp | 2 -- wrappers/cpp/libfreenect.hpp | 3 +++ 8 files changed, 18 insertions(+), 4 deletions(-) diff --git a/examples/chunkview.c b/examples/chunkview.c index 71c7dfa7..512c281a 100644 --- a/examples/chunkview.c +++ b/examples/chunkview.c @@ -30,7 +30,9 @@ #include #include #include "libfreenect.h" - +#ifdef _MSC_VER +#define HAVE_STRUCT_TIMESPEC +#endif #include #if defined(__APPLE__) diff --git a/examples/glview.c b/examples/glview.c index 9c67d6f7..6b656c9b 100644 --- a/examples/glview.c +++ b/examples/glview.c @@ -31,6 +31,9 @@ #include #include "libfreenect.h" +#ifdef _MSC_VER +#define HAVE_STRUCT_TIMESPEC +#endif #include #if defined(__APPLE__) diff --git a/examples/hiview.c b/examples/hiview.c index 0143ce60..528cba82 100644 --- a/examples/hiview.c +++ b/examples/hiview.c @@ -31,6 +31,9 @@ #include #include "libfreenect.h" +#ifdef _MSC_VER +#define HAVE_STRUCT_TIMESPEC +#endif #include #if defined(__APPLE__) diff --git a/examples/micview.c b/examples/micview.c index 52fa8543..7d586427 100644 --- a/examples/micview.c +++ b/examples/micview.c @@ -29,6 +29,9 @@ #include #include #include +#ifdef _MSC_VER +#define HAVE_STRUCT_TIMESPEC +#endif #include #if defined(__APPLE__) diff --git a/examples/regview.c b/examples/regview.c index 79f2f126..ae8d8afb 100644 --- a/examples/regview.c +++ b/examples/regview.c @@ -31,6 +31,9 @@ #include #include "libfreenect.h" +#ifdef _MSC_VER +#define HAVE_STRUCT_TIMESPEC +#endif #include #include diff --git a/wrappers/cpp/cpp_pc_view.cpp b/wrappers/cpp/cpp_pc_view.cpp index 238765f1..5148ba2b 100644 --- a/wrappers/cpp/cpp_pc_view.cpp +++ b/wrappers/cpp/cpp_pc_view.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #if defined(__APPLE__) diff --git a/wrappers/cpp/cppview.cpp b/wrappers/cpp/cppview.cpp index 557bf327..634c5d54 100644 --- a/wrappers/cpp/cppview.cpp +++ b/wrappers/cpp/cppview.cpp @@ -24,9 +24,7 @@ * either License. */ - #include "libfreenect.hpp" -#include #include #include #include diff --git a/wrappers/cpp/libfreenect.hpp b/wrappers/cpp/libfreenect.hpp index 21498228..494dbeed 100644 --- a/wrappers/cpp/libfreenect.hpp +++ b/wrappers/cpp/libfreenect.hpp @@ -29,6 +29,9 @@ #include #include #include +#ifdef _MSC_VER +#define HAVE_STRUCT_TIMESPEC +#endif #include #include From 8531fe6a9620a024416dd49934a769831ead99cb Mon Sep 17 00:00:00 2001 From: Finn <3guenthe@informatik.uni-hamburg.de> Date: Fri, 3 Aug 2018 10:42:44 +0200 Subject: [PATCH 2/2] Fix Windows Compiler error C2133 MSVC doesn't support variable length arrays --- fakenect/fakenect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fakenect/fakenect.c b/fakenect/fakenect.c index b7e01ec7..a2ad4fd5 100644 --- a/fakenect/fakenect.c +++ b/fakenect/fakenect.c @@ -540,7 +540,7 @@ int freenect_init(freenect_context **ctx, freenect_usb_context *usb_ctx) char *var = getenv("FAKENECT_LOOP"); if (var) { int len = strlen(var); - char tmp[len + 1]; + char* tmp = malloc((len + 1) * sizeof(char)); int i; for (i = 0; i < len; i++) tmp[i] = tolower(var[i]); @@ -551,6 +551,7 @@ int freenect_init(freenect_context **ctx, freenect_usb_context *usb_ctx) strcmp(tmp, "off") == 0) { loop_playback = false; } + free (tmp); } *ctx = fake_ctx;