Skip to content

Commit 868b910

Browse files
committed
api: Revert workaround in cdd4f06
The workaround broke MSVC building. MSVC refuses to resolve the symbol because the return type is different, which was the point of the workaround. Alternative workarounds would make it more a mess. I have sent a patch to iai_kinect2 directly to use new API.
1 parent e16a8c0 commit 868b910

File tree

5 files changed

+1
-22
lines changed

5 files changed

+1
-22
lines changed

include/internal/libfreenect2/depth_packet_processor.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include <stdint.h>
3434

3535
#include <libfreenect2/config.h>
36-
#define LIBFREENECT2_SETCONFIGURATION_COMPAT_INTERNAL
3736
#include <libfreenect2/libfreenect2.hpp>
3837
#include <libfreenect2/frame_listener.hpp>
3938
#include <libfreenect2/packet_processor.h>
@@ -53,7 +52,7 @@ struct DepthPacket
5352
/** Class for processing depth information. */
5453
typedef PacketProcessor<DepthPacket> BaseDepthPacketProcessor;
5554

56-
class DepthPacketProcessor : public ConfigPacketProcessor, public BaseDepthPacketProcessor
55+
class DepthPacketProcessor : public BaseDepthPacketProcessor
5756
{
5857
public:
5958
typedef Freenect2Device::Config Config;

include/libfreenect2/libfreenect2.hpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -365,19 +365,6 @@ class LIBFREENECT2_API Freenect2Device
365365
virtual void close() = 0;
366366
};
367367

368-
/** Deprecated method to configure packet processors
369-
* @deprecated Use Freenect2Device::setConfiguration() instead.
370-
*
371-
* Usage of `pipeline->getDepthPacketProcessor()->setConfiguration(config)`
372-
* should be converted to `device->setConfiguration(config)`
373-
*/
374-
class ConfigPacketProcessor
375-
{
376-
public:
377-
typedef Freenect2Device::Config Config;
378-
LIBFREENECT2_DEPRECATED virtual void setConfiguration(const Config &config) = 0;
379-
};
380-
381368
class Freenect2Impl;
382369

383370
/**

include/libfreenect2/packet_pipeline.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ class RgbPacketProcessor;
3939
class DepthPacketProcessor;
4040
class PacketPipelineComponents;
4141

42-
class ConfigPacketProcessor;
43-
#ifndef LIBFREENECT2_SETCONFIGURATION_COMPAT_INTERNAL
44-
#define DepthPacketProcessor ConfigPacketProcessor
45-
#endif
46-
4742
/** @defgroup pipeline Packet Pipelines
4843
* Implement various methods to decode color and depth images with different performance and platform support
4944
*

src/libfreenect2.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <cmath>
3535
#define WRITE_LIBUSB_ERROR(__RESULT) libusb_error_name(__RESULT) << " " << libusb_strerror((libusb_error)__RESULT)
3636

37-
#define LIBFREENECT2_SETCONFIGURATION_COMPAT_INTERNAL
3837
#include <libfreenect2/libfreenect2.hpp>
3938

4039
#include <libfreenect2/usb/event_loop.h>

src/packet_pipeline.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
/** @file packet_pipeline.cpp Packet pipeline implementation. */
2828

29-
#define LIBFREENECT2_SETCONFIGURATION_COMPAT_INTERNAL
3029
#include <libfreenect2/packet_pipeline.h>
3130
#include <libfreenect2/async_packet_processor.h>
3231
#include <libfreenect2/data_callback.h>

0 commit comments

Comments
 (0)