Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion example_simpleCapture/addons.make
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ofxUVC
ofxLiquidEvent
ofxMachineVision
ofxPlugin
ofxSingleton
2 changes: 1 addition & 1 deletion src/ofxMachineVision.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace ofxMachineVision {
class SimpleGrabber : public Grabber::Simple {
public:
SimpleGrabber() : Grabber::Simple() {
this->setDevice(make_shared<Device::Type>());
this->setDevice(make_shared<DeviceType>());
}

shared_ptr<DeviceType> getDeviceTyped() const {
Expand Down
3 changes: 2 additions & 1 deletion src/ofxMachineVision/Device/VideoPlayer.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "VideoPlayer.h"
#include "ofSystemUtils.h"

namespace ofxMachineVision {
namespace Device {
Expand All @@ -23,7 +24,7 @@ namespace ofxMachineVision {
}
typedInitialisationSettings->filename = result.filePath;
}
if (!ofFile::doesFileExist(typedInitialisationSettings->filename)) {
if (!ofFile::doesFileExist(typedInitialisationSettings->filename.get())) {
throw(ofxMachineVision::Exception("File does not exist"));
}

Expand Down
3 changes: 2 additions & 1 deletion src/ofxMachineVision/Grabber/Simple.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "ofBaseTypes.h"
#include "ofTexture.h"
#include "ofMath.h"

#include "Base.h"
#include "ofxMachineVision/Frame.h"
Expand Down Expand Up @@ -162,7 +163,7 @@ namespace ofxMachineVision {
void setFrame(shared_ptr<Frame>);
void clearCachedFrame();

mutable ofMutex framePointerMutex;
mutable std::mutex framePointerMutex;
shared_ptr<Frame> frame;

ofPixels pixels; // every app frame we cache a set of pixels which we can use for simple access. if getPixels() returned from frame, then there would be locking issues.
Expand Down
2 changes: 2 additions & 0 deletions src/ofxMachineVision/Parameter.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#include "ofParameter.h"

using namespace std;

namespace ofxMachineVision {
class AbstractParameter {
public:
Expand Down
1 change: 1 addition & 0 deletions src/ofxMachineVision/Utils/ActionQueueThread.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "ActionQueueThread.h"
#include "ofAppRunner.h"
#include "ofLog.h"

#include "../Constants.h"

Expand Down