summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-12-04 18:45:57 +0100
committerStanislaw Halik <sthalik@misaki.pl>2013-12-04 18:45:57 +0100
commita6b1128a2d55720991513650cef4ceffa183a737 (patch)
treeeaf40f67f54b0649205dc1ca3ef7b4533811d23b
parentbb0b7ca45ca2091b52e969cf0948be2d908377c2 (diff)
update api, remove extern C
-rw-r--r--ftnoir_tracker_ht/ht-api.h33
1 files changed, 14 insertions, 19 deletions
diff --git a/ftnoir_tracker_ht/ht-api.h b/ftnoir_tracker_ht/ht-api.h
index 66b87211..2ab2e840 100644
--- a/ftnoir_tracker_ht/ht-api.h
+++ b/ftnoir_tracker_ht/ht-api.h
@@ -1,14 +1,9 @@
#pragma once
#ifndef HT_API
-#ifndef __cplusplus
-# define HT_EXTERN
-#else
-# define HT_EXTERN extern "C"
-#endif
# if defined(_WIN32) && !defined(MINGW)
-# define HT_API(t) HT_EXTERN __declspec(dllexport) t __stdcall
+# define HT_API(t) __declspec(dllexport) t __stdcall
# else
-# define HT_API(t) HT_EXTERN t
+# define HT_API(t) t
# endif
#endif
#if !defined(_WIN32) && !defined(_isnan)
@@ -19,20 +14,20 @@ struct ht_context;
typedef struct ht_context headtracker_t;
typedef struct ht_config {
- float field_of_view;
- float classification_delay;
- int pyrlk_pyramids;
- int pyrlk_win_size_w;
- int pyrlk_win_size_h;
+ float field_of_view;
+ float classification_delay;
+ int pyrlk_pyramids;
+ int pyrlk_win_size_w;
+ int pyrlk_win_size_h;
float ransac_max_inlier_error;
float ransac_max_reprojection_error;
- int max_keypoints;
- float keypoint_distance;
+ int max_keypoints;
+ float keypoint_distance;
int force_width;
- int force_height;
- int force_fps;
- int camera_index;
- bool debug;
+ int force_height;
+ int force_fps;
+ int camera_index;
+ bool debug;
int ransac_num_iters;
float ransac_min_features;
float ransac_max_mean_error;
@@ -44,7 +39,7 @@ typedef struct ht_config {
typedef struct {
double rotx, roty, rotz;
double tx, ty, tz;
- bool filled;
+ bool filled;
} ht_result_t;
HT_API(headtracker_t*) ht_make_context(const ht_config_t* config, const char* filename);