fix from avin2#5

Avnerus · Oct 27, 2015 · c916874 · c916874
1 parent 7a3cbe8
commit c916874
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/Source/XnDeviceSensorV2/XnSensorDepthGenerator.cpp b/Source/XnDeviceSensorV2/XnSensorDepthGenerator.cpp
@@ -26,7 +26,7 @@
 #include <XnOpenNI.h>
 #include <XnOS.h>
 #include <XnPsVersion.h>
-#include <XnCommon/XnCommon.h>
+#include <XnCommon.h>
 #include <math.h>
 
 //---------------------------------------------------------------------------
@@ -50,11 +50,11 @@ XnSensorDepthGenerator::~XnSensorDepthGenerator()
 XnStatus XnSensorDepthGenerator::Init()
 {
 	XnStatus nRetVal = XN_STATUS_OK;
-	
+
 	nRetVal = XnSensorMapGenerator::Init();
 	XN_IS_STATUS_OK(nRetVal);
 
-	const XnChar* aProps[] = 
+	const XnChar* aProps[] =
 	{
 		XN_STREAM_PROPERTY_ZERO_PLANE_DISTANCE,
 		XN_STREAM_PROPERTY_ZERO_PLANE_PIXEL_SIZE,
@@ -103,7 +103,7 @@ void XnSensorDepthGenerator::GetFieldOfView(XnFieldOfView& FOV)
 
 XnStatus XnSensorDepthGenerator::RegisterToFieldOfViewChange(XnModuleStateChangedHandler handler, void* pCookie, XnCallbackHandle& hCallback)
 {
-	return m_fovChangedEvent.Register(handler, pCookie, &hCallback);
+	return m_fovChangedEvent.Register(handler, pCookie, hCallback);
 }
 
 void XnSensorDepthGenerator::UnregisterFromFieldOfViewChange(XnCallbackHandle hCallback)
@@ -180,7 +180,7 @@ XnStatus XnSensorDepthGenerator::GetUserPosition(XnUInt32 nIndex, XnBoundingBox3
 
 XnStatus XnSensorDepthGenerator::RegisterToUserPositionChange(XnModuleStateChangedHandler handler, void* pCookie, XnCallbackHandle& hCallback)
 {
-	const XnChar* aProps[] = 
+	const XnChar* aProps[] =
 	{
 		XN_STREAM_PROPERTY_AGC_BIN,
 		NULL
@@ -244,6 +244,11 @@ XnStatus XnSensorDepthGenerator::SetViewPoint(xn::ProductionNode& OtherNode)
 	}
 }
 
+XnStatus XnSensorDepthGenerator::GetPixelCoordinatesInViewPoint(xn::ProductionNode& other, XnUInt32 x, XnUInt32 y, XnUInt32& altX, XnUInt32& altY)
+{
+    return 0;
+}
+
 XnStatus XnSensorDepthGenerator::ResetViewPoint()
 {
 	return SetIntProperty(XN_STREAM_PROPERTY_REGISTRATION, FALSE);
@@ -259,7 +264,7 @@ XnBool XnSensorDepthGenerator::IsViewPointAs(xn::ProductionNode& OtherNode)
 
 XnStatus XnSensorDepthGenerator::RegisterToViewPointChange(XnModuleStateChangedHandler handler, void* pCookie, XnCallbackHandle& hCallback)
 {
-	const XnChar* aProps[] = 
+	const XnChar* aProps[] =
 	{
 		XN_STREAM_PROPERTY_REGISTRATION,
 		NULL
@@ -306,7 +311,7 @@ XnBool XnSensorDepthGenerator::IsFrameSyncedWith(xn::ProductionNode& OtherNode)
 
 XnStatus XnSensorDepthGenerator::RegisterToFrameSyncChange(XnModuleStateChangedHandler handler, void* pCookie, XnCallbackHandle& hCallback)
 {
-	const XnChar* aProps[] = 
+	const XnChar* aProps[] =
 	{
 		XN_MODULE_PROPERTY_FRAME_SYNC,
 		NULL

diff --git a/Source/XnDeviceSensorV2/XnSensorDepthGenerator.h b/Source/XnDeviceSensorV2/XnSensorDepthGenerator.h
@@ -27,6 +27,7 @@
 //---------------------------------------------------------------------------
 #include "XnSensorMapGenerator.h"
 #include "XnExportedSensorGenerator.h"
+#include <XnEventT.h>
 
 //---------------------------------------------------------------------------
 // Types
@@ -35,8 +36,8 @@
 #pragma warning (push)
 #pragma warning (disable: 4250)
 
-class XnSensorDepthGenerator : 
-	public XnSensorMapGenerator, 
+class XnSensorDepthGenerator :
+	public XnSensorMapGenerator,
 	virtual public xn::ModuleDepthGenerator,
 	virtual public xn::ModuleUserPositionInterface,
 	virtual public xn::ModuleAlternativeViewPointInterface,
@@ -67,6 +68,7 @@ class XnSensorDepthGenerator :
 	xn::ModuleAlternativeViewPointInterface* GetAlternativeViewPointInterface() { return this; }
 	XnBool IsViewPointSupported(xn::ProductionNode& OtherNode);
 	XnStatus SetViewPoint(xn::ProductionNode& OtherNode);
+    XnStatus GetPixelCoordinatesInViewPoint(xn::ProductionNode& other, XnUInt32 x, XnUInt32 y, XnUInt32& altX, XnUInt32& altY);
 	XnStatus ResetViewPoint();
 	XnBool IsViewPointAs(xn::ProductionNode& OtherNode);
 	XnStatus RegisterToViewPointChange(XnModuleStateChangedHandler handler, void* pCookie, XnCallbackHandle& hCallback);
@@ -82,15 +84,14 @@ class XnSensorDepthGenerator :
 
 protected:
 	virtual void FilterProperties(XnActualPropertiesHash* pHash);
-	
+
 private:
 	XnStatus UpdateRealWorldTranslationData();
 	XnBool IsSensorImageNode(xn::ProductionNode& Other);
 
 	static void XN_CALLBACK_TYPE RealWorldTranslationPropChanged(void* pCookie);
 
-	XN_DECLARE_EVENT_0ARG(PropChangeEvent, PropChangeEventInterface);
-	PropChangeEvent m_fovChangedEvent;
+	XnEventNoArgs m_fovChangedEvent;
 
 	XnCallbackHandle m_hRWPropCallback;
 
@@ -106,4 +107,4 @@ class XnExportedSensorDepthGenerator : public XnExportedSensorGenerator
 
 #pragma warning (pop)
 
-#endif // __XN_SENSOR_DEPTH_GENERATOR_H__
+#endif // __XN_SENSOR_DEPTH_GENERATOR_H__