mirror of
https://github.com/ruby-opencv/ruby-opencv
synced 2023-03-27 23:22:12 -04:00
Merge branch 'fix/mingw_cast_error' into develop
This commit is contained in:
commit
0144f44d32
2 changed files with 6 additions and 7 deletions
|
@ -18,20 +18,19 @@ __NAMESPACE_BEGIN_FACERECOGNIZER
|
||||||
|
|
||||||
VALUE rb_klass;
|
VALUE rb_klass;
|
||||||
|
|
||||||
std::map< long, cv::Ptr<cv::FaceRecognizer> > ptr_guard_map;
|
std::map<void*, cv::Ptr<cv::FaceRecognizer> > ptr_guard_map;
|
||||||
|
|
||||||
void
|
void
|
||||||
guard_facerecognizer(void* data_ptr, cv::Ptr<cv::FaceRecognizer> ptr)
|
guard_facerecognizer(void* data_ptr, cv::Ptr<cv::FaceRecognizer> ptr)
|
||||||
{
|
{
|
||||||
ptr_guard_map[(long)data_ptr] = ptr;
|
ptr_guard_map[data_ptr] = ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
release_facerecognizer(void *ptr)
|
release_facerecognizer(void *data_ptr)
|
||||||
{
|
{
|
||||||
long key = (long)ptr;
|
ptr_guard_map[data_ptr].release();
|
||||||
ptr_guard_map[key].release();
|
ptr_guard_map.erase(data_ptr);
|
||||||
ptr_guard_map.erase(key);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VALUE
|
VALUE
|
||||||
|
|
|
@ -27,7 +27,7 @@ VALUE rb_save(VALUE self, VALUE filename);
|
||||||
VALUE rb_load(VALUE self, VALUE filename);
|
VALUE rb_load(VALUE self, VALUE filename);
|
||||||
|
|
||||||
void guard_facerecognizer(void* data_ptr, cv::Ptr<cv::FaceRecognizer> ptr);
|
void guard_facerecognizer(void* data_ptr, cv::Ptr<cv::FaceRecognizer> ptr);
|
||||||
void release_facerecognizer(void *ptr);
|
void release_facerecognizer(void *data_ptr);
|
||||||
VALUE allocate_facerecognizer(VALUE klass);
|
VALUE allocate_facerecognizer(VALUE klass);
|
||||||
|
|
||||||
__NAMESPACE_END_FACERECOGNIZER
|
__NAMESPACE_END_FACERECOGNIZER
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue