Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MSVC FTBFS #490

Merged
merged 1 commit into from
Dec 3, 2015
Merged

Fix MSVC FTBFS #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions include/internal/libfreenect2/depth_packet_processor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;
Expand Down
13 changes: 0 additions & 13 deletions include/libfreenect2/libfreenect2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
5 changes: 0 additions & 5 deletions include/libfreenect2/packet_pipeline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
1 change: 0 additions & 1 deletion src/libfreenect2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/packet_pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down