floratest1
/
SpireCV
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug when used as lib

This commit is contained in:
jario 2024-01-02 14:02:34 +08:00
parent cc715bef70
commit 9612f9fe83
6 changed files with 54 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sv_color_line.h
View File

@ -25,7 +25,6 @@ public:
double line_location_a2; double line_location_a2;
bool is_load_parameter; bool is_load_parameter;
std::string line_color; std::string line_color;
protected: protected:

12
include/sv_common_det.h
View File

@ -10,13 +10,10 @@
namespace sv namespace sv
{ {
#ifdef WITH_CUDA
class CommonObjectDetectorCUDAImpl;
#endif
#ifdef WITH_INTEL class CommonObjectDetectorCUDAImpl;
class CommonObjectDetectorIntelImpl; class CommonObjectDetectorIntelImpl;
#endif
class CommonObjectDetector : public CommonObjectDetectorBase class CommonObjectDetector : public CommonObjectDetectorBase
{ {
@ -36,13 +33,8 @@ namespace sv
std::vector<float> &boxes_score_, std::vector<float> &boxes_score_,
std::vector<cv::Mat> &boxes_seg_); std::vector<cv::Mat> &boxes_seg_);
#ifdef WITH_CUDA
CommonObjectDetectorCUDAImpl *_cuda_impl; CommonObjectDetectorCUDAImpl *_cuda_impl;
#endif
#ifdef WITH_INTEL
CommonObjectDetectorIntelImpl *_intel_impl; CommonObjectDetectorIntelImpl *_intel_impl;
#endif
bool _input_4k; bool _input_4k;
}; };

11
include/sv_landing_det.h
View File

@ -10,13 +10,9 @@
namespace sv { namespace sv {
#ifdef WITH_CUDA
class LandingMarkerDetectorCUDAImpl;
#endif
#ifdef WITH_INTEL class LandingMarkerDetectorCUDAImpl;
class LandingMarkerDetectorIntelImpl; class LandingMarkerDetectorIntelImpl;
#endif
class LandingMarkerDetector : public LandingMarkerDetectorBase class LandingMarkerDetector : public LandingMarkerDetectorBase
{ {
@ -30,13 +26,8 @@ protected:
std::vector<int>& output_labels_ std::vector<int>& output_labels_
); );
#ifdef WITH_CUDA
LandingMarkerDetectorCUDAImpl *_cuda_impl; LandingMarkerDetectorCUDAImpl *_cuda_impl;
#endif
#ifdef WITH_INTEL
LandingMarkerDetectorIntelImpl *_intel_impl; LandingMarkerDetectorIntelImpl *_intel_impl;
#endif
}; };

11
include/sv_veri_det.h
View File

@ -10,13 +10,9 @@
namespace sv namespace sv
{ {
#ifdef WITH_CUDA
class VeriDetectorCUDAImpl;
#endif
#ifdef WITH_INTEL class VeriDetectorCUDAImpl;
class VeriDetectorIntelImpl; class VeriDetectorIntelImpl;
#endif
class VeriDetector : public LandingMarkerDetectorBase class VeriDetector : public LandingMarkerDetectorBase
{ {
@ -40,13 +36,8 @@ namespace sv
std::vector<float> targetSz = {0, 0}; // H and W of bounding box std::vector<float> targetSz = {0, 0}; // H and W of bounding box
std::vector<float> targetPos = {0, 0}; // center point of bounding box (x, y) std::vector<float> targetPos = {0, 0}; // center point of bounding box (x, y)
#ifdef WITH_CUDA
VeriDetectorCUDAImpl *_cuda_impl; VeriDetectorCUDAImpl *_cuda_impl;
#endif
#ifdef WITH_INTEL
VeriDetectorIntelImpl *_intel_impl; VeriDetectorIntelImpl *_intel_impl;
#endif
}; };
} }