Merge pull request #490 from xlz/msvc-symbol-resolving

Fix MSVC FTBFS, closes #489

Author: floe

include/internal/libfreenect2/depth_packet_processor.h

@@ -33,7 +33,6 @@
 #include <stdint.h>
 
 #include <libfreenect2/config.h>
-#define LIBFREENECT2_SETCONFIGURATION_COMPAT_INTERNAL
 #include <libfreenect2/libfreenect2.hpp>
 #include <libfreenect2/frame_listener.hpp>
 #include <libfreenect2/packet_processor.h>
@@ -53,7 +52,7 @@ struct DepthPacket
 /** Class for processing depth information. */
 typedef PacketProcessor<DepthPacket> BaseDepthPacketProcessor;
 
-class DepthPacketProcessor : public ConfigPacketProcessor, public BaseDepthPacketProcessor
+class DepthPacketProcessor : public BaseDepthPacketProcessor
 {
 public:
   typedef Freenect2Device::Config Config;

include/libfreenect2/libfreenect2.hpp

@@ -365,19 +365,6 @@ class LIBFREENECT2_API Freenect2Device
   virtual void close() = 0;
 };
 
-/** Deprecated method to configure packet processors
- * @deprecated Use Freenect2Device::setConfiguration() instead.
- *
- * Usage of `pipeline->getDepthPacketProcessor()->setConfiguration(config)`
- * should be converted to `device->setConfiguration(config)`
- */
-class ConfigPacketProcessor
-{
-public:
-  typedef Freenect2Device::Config Config;
-  LIBFREENECT2_DEPRECATED virtual void setConfiguration(const Config &config) = 0;
-};
-
 class Freenect2Impl;
 
 /**

include/libfreenect2/packet_pipeline.h

@@ -39,11 +39,6 @@ class RgbPacketProcessor;
 class DepthPacketProcessor;
 class PacketPipelineComponents;
 
-class ConfigPacketProcessor;
-#ifndef LIBFREENECT2_SETCONFIGURATION_COMPAT_INTERNAL
-#define DepthPacketProcessor ConfigPacketProcessor
-#endif
-
 /** @defgroup pipeline Packet Pipelines
  * Implement various methods to decode color and depth images with different performance and platform support
  *

src/libfreenect2.cpp

@@ -34,7 +34,6 @@
 #include <cmath>
 #define WRITE_LIBUSB_ERROR(__RESULT) libusb_error_name(__RESULT) << " " << libusb_strerror((libusb_error)__RESULT)
 
-#define LIBFREENECT2_SETCONFIGURATION_COMPAT_INTERNAL
 #include <libfreenect2/libfreenect2.hpp>
 
 #include <libfreenect2/usb/event_loop.h>

src/packet_pipeline.cpp

@@ -26,7 +26,6 @@
 
 /** @file packet_pipeline.cpp Packet pipeline implementation. */
 
-#define LIBFREENECT2_SETCONFIGURATION_COMPAT_INTERNAL
 #include <libfreenect2/packet_pipeline.h>
 #include <libfreenect2/async_packet_processor.h>
 #include <libfreenect2/data_callback.h>