Merge pull request #67 from larshg/libfreenect2mathfix

Added include <algorithm> in ifdef WIN32 and VS2013

Author: christiankerl

examples/protonect/include/libfreenect2/protocol/response.h

@@ -31,6 +31,7 @@
 #include <sstream>
 #include <iomanip>
 #include <stdint.h>
+#include <algorithm>
 
 namespace libfreenect2
 {
@@ -101,10 +102,10 @@ class FirmwareVersionResponse
     FWSubsystemVersion max;
     for(int i = 0; i < versions_.size(); ++i)
     {
-      max.major = std::max(max.major, versions_[i].major);
-      max.minor = std::max(max.minor, versions_[i].minor);
-      max.build = std::max(max.build, versions_[i].build);
-      max.revision = std::max(max.revision, versions_[i].revision);
+      max.major = std::max<uint16_t>(max.major, versions_[i].major);
+      max.minor = std::max<uint16_t>(max.minor, versions_[i].minor);
+      max.build = std::max<uint16_t>(max.build, versions_[i].build);
+      max.revision = std::max<uint16_t>(max.revision, versions_[i].revision);
     }
     std::stringstream version_string;
     version_string << max.major << "." << max.minor << "." << max.build << "." << max.revision << "." << versions_.size();

examples/protonect/src/cpu_depth_packet_processor.cpp

@@ -32,6 +32,11 @@
 #include <iostream>
 #include <fstream>
 
+#if defined(WIN32)
+#define _USE_MATH_DEFINES
+#include <math.h>
+#endif
+
 namespace libfreenect2
 {
 

examples/protonect/src/depth_packet_stream_parser.cpp

@@ -27,6 +27,7 @@
 #include <libfreenect2/depth_packet_stream_parser.h>
 #include <iostream>
 #include <memory.h>
+#include <algorithm>
 
 namespace libfreenect2
 {
@@ -69,7 +70,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
     DepthSubPacketFooter *footer = 0;
     bool footer_found = false;
 
-    size_t max_length = std::min(wb.capacity - wb.length, in_length - 8);
+    size_t max_length = std::min<size_t>(wb.capacity - wb.length, in_length - 8);
 
     for(; in_offset < max_length; ++in_offset)
     {