Commit dca4930

committed

Fixes

1 parent 3b23329 commit dca4930Copy full SHA for dca4930

File tree

2 files changed

-8

lines changed

src
- Libfreenect2OpenCV.cpp
- Libfreenect2OpenCV.h

2 files changed

-8

lines changed

`‎src/Libfreenect2OpenCV.cpp‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ Libfreenect2OpenCV::Libfreenect2OpenCV(Processor depthProcessor) :`
`28`	`28`	`m_listener(nullptr),`
`29`	`29`	`m_updateThread(nullptr)`
`30`	`30`	`{`
`31`		`- if (freenect2.enumerateDevices() == 0) {`
	`31`	`+ if (m_freenect2.enumerateDevices() == 0) {`
`32`	`32`	`throw runtime_error("no device connected");`
`33`	`33`	`}`
`34`	`34`
`35`		`- string serial = freenect2.getDefaultDeviceSerialNumber();`
	`35`	`+ string serial = m_freenect2.getDefaultDeviceSerialNumber();`
`36`	`36`
`37`	`37`	`std::cout << "SERIAL: " << serial << std::endl;`
`38`	`38`
`@@ -59,9 +59,9 @@ Libfreenect2OpenCV::Libfreenect2OpenCV(Processor depthProcessor) :`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (m_pipeline) {`
`62`		`- m_dev = freenect2.openDevice(serial, m_pipeline);`
	`62`	`+ m_dev = m_freenect2.openDevice(serial, m_pipeline);`
`63`	`63`	`} else {`
`64`		`- m_dev = freenect2.openDevice(serial);`
	`64`	`+ m_dev = m_freenect2.openDevice(serial);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (m_dev == 0) {`
`@@ -127,7 +127,7 @@ void Libfreenect2OpenCV::updateMat()`
`127`	`127`
`128`	`128`	`if(notifyInit) {`
`129`	`129`	`notifyInit = false;`
`130`		`- initSig.notify_all();`
	`130`	`+ m_initSig.notify_all();`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`lock.unlock();`
`@@ -146,7 +146,7 @@ void Libfreenect2OpenCV::start()`
`146`	`146`	`m_updateThread = new std::thread( trampoline, this );`
`147`	`147`
`148`	`148`	`std::unique_lock<std::mutex> lock(m_updateMutex);`
`149`		`- initSig.wait(lock);`
	`149`	`+ m_initSig.wait(lock);`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`Libfreenect2OpenCV::~Libfreenect2OpenCV()`

`‎src/Libfreenect2OpenCV.h‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Libfreenect2OpenCV {`
`20`	`20`	`libfreenect2::Freenect2Device *m_dev;`
`21`	`21`	`libfreenect2::Registration *m_registration;`
`22`	`22`	`libfreenect2::SyncMultiFrameListener *m_listener;`
`23`		`- libfreenect2::Freenect2 freenect2;`
	`23`	`+ libfreenect2::Freenect2 m_freenect2;`
`24`	`24`
`25`	`25`	`cv::Mat m_rgbMat;`
`26`	`26`	`cv::Mat m_depthMat;`
`@@ -31,7 +31,7 @@ class Libfreenect2OpenCV {`
`31`	`31`
`32`	`32`	`std::thread * m_updateThread;`
`33`	`33`	`std::mutex m_updateMutex;`
`34`		`- std::condition_variable initSig;`
	`34`	`+ std::condition_variable m_initSig;`
`35`	`35`
`36`	`36`	`static void trampoline(Libfreenect2OpenCV * );`
`37`	`37`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit dca4930

File tree

2 files changed

2 files changed

`‎src/Libfreenect2OpenCV.cpp‎`

`‎src/Libfreenect2OpenCV.h‎`

0 commit comments