summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_pt/camera.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-09-27 20:04:47 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-09-27 20:06:45 +0200
commit01f1a5f2b9ed1846423eee0336450f32b836536b (patch)
treebdf27366094eeca485d7ce5122db3cb097cb8ffb /ftnoir_tracker_pt/camera.h
parentc04f90dcc3054d296dc1f6798ccf22f71a10836b (diff)
make stuff private, not protected
clang generates warnings for unused private stuff, so use that.
Diffstat (limited to 'ftnoir_tracker_pt/camera.h')
-rw-r--r--ftnoir_tracker_pt/camera.h53
1 files changed, 27 insertions, 26 deletions
diff --git a/ftnoir_tracker_pt/camera.h b/ftnoir_tracker_pt/camera.h
index 86cafd42..2bca88a1 100644
--- a/ftnoir_tracker_pt/camera.h
+++ b/ftnoir_tracker_pt/camera.h
@@ -25,11 +25,11 @@ void get_camera_device_names(std::vector<std::string>& device_names);
// ----------------------------------------------------------------------------
struct CamInfo
{
- CamInfo() : res_x(0), res_y(0), fps(0) {}
+ CamInfo() : res_x(0), res_y(0), fps(0) {}
- int res_x;
- int res_y;
- int fps;
+ int res_x;
+ int res_y;
+ int fps;
};
// ----------------------------------------------------------------------------
@@ -65,7 +65,7 @@ protected:
virtual void _set_device_index() = 0;
virtual void _set_fps() = 0;
virtual void _set_res() = 0;
-
+private:
float dt_valid;
float dt_mean;
int desired_index;
@@ -82,18 +82,19 @@ inline Camera::~Camera() {}
class CVCamera : public Camera
{
public:
- CVCamera() : cap(NULL) {}
- ~CVCamera() { stop(); }
+ CVCamera() : cap(NULL) {}
+ ~CVCamera() { stop(); }
- void start() override;
- void stop() override;
+ void start() override;
+ void stop() override;
protected:
- bool _get_frame(cv::Mat* frame) override;
- void _set_fps() override;
- void _set_res() override;
+ bool _get_frame(cv::Mat* frame) override;
+ void _set_fps() override;
+ void _set_res() override;
void _set_device_index() override;
+private:
cv::VideoCapture* cap;
};
#else
@@ -102,21 +103,21 @@ protected:
class VICamera : public Camera
{
public:
- VICamera();
- ~VICamera() { stop(); }
+ VICamera();
+ ~VICamera() { stop(); }
- virtual void start();
- virtual void stop();
+ virtual void start();
+ virtual void stop();
protected:
- virtual bool _get_frame(cv::Mat* frame);
- virtual void _set_device_index();
- virtual void _set_fps();
- virtual void _set_res();
-
- videoInput VI;
- cv::Mat new_frame;
- unsigned char* frame_buffer;
+ virtual bool _get_frame(cv::Mat* frame);
+ virtual void _set_device_index();
+ virtual void _set_fps();
+ virtual void _set_res();
+
+ videoInput VI;
+ cv::Mat new_frame;
+ unsigned char* frame_buffer;
};
#endif
@@ -128,12 +129,12 @@ enum RotationType
};
// ----------------------------------------------------------------------------
-class FrameRotation
+class FrameRotation
{
public:
RotationType rotation;
- cv::Mat rotate_frame(cv::Mat frame);
+ cv::Mat rotate_frame(cv::Mat frame);
};
#endif //CAMERA_H