diff --git a/src/left_over/MSRegionSurveilanceCpu.cpp b/src/left_over/MSRegionSurveilanceCpu.cpp index 7358b5e..c92198d 100644 --- a/src/left_over/MSRegionSurveilanceCpu.cpp +++ b/src/left_over/MSRegionSurveilanceCpu.cpp @@ -41,23 +41,6 @@ int IRegionSurveillanceCpu::rs_init(const rs_params ¶m) } int IRegionSurveillanceCpu::rs_init_region(int num_roi, region_info* region_infos/*, bool iflog*/) { - //RegionInfo reginifos; - //reginifos.AlarmInfo = region_infos->alarm_info; // 1进入禁区 2离开禁区 3单向越界 4双向越界 5徘徊 6丢包 - //reginifos.nPointNum = region_infos->point_num; - //for (int i = 0; i < MAXVERTEXNUM; ++i) - //{ - // reginifos.pROI[i].x = region_infos->p_roi[i].x_; - // reginifos.pROI[i].y = region_infos->p_roi[i].y_; - //} - //CMPoint pROI[MAXVERTEXNUM]; - //reginifos.nFrameNum = region_infos->frame_num; - //reginifos.dirPoint.x = region_infos->dir_point.x_; - //reginifos.dirPoint.y = region_infos->dir_point.y_; - //reginifos.finaldir = region_infos->finaldir; - //reginifos.ArrowStartPoint.x = region_infos->arrow_start_point.x_; - //reginifos.ArrowStartPoint.y = region_infos->arrow_start_point.y_; - //reginifos.ArrowEndPoint.x = region_infos->arrow_end_point.x_; //箭头的终止端点 箭头指向正方形 - //reginifos.ArrowEndPoint.y = region_infos->arrow_end_point.y_; //箭头的终止端点 箭头指向正方形 int r = 0; for (int i = 0; i < rect_num; ++i) { @@ -70,20 +53,10 @@ int IRegionSurveillanceCpu::rs_detect(const sy_img &img_data, region_info* regio RegionInfo reginifos; reginifos.AlarmInfo = region_infos->alarm_info; // 1进入禁区 2离开禁区 3单向越界 4双向越界 5徘徊 6丢包 reginifos.nPointNum = region_infos->point_num; - /*for (int i = 0; i < MAXVERTEXNUM; ++i) - { - reginifos.pROI[i].x = region_infos->p_roi[i].x_; - reginifos.pROI[i].y = region_infos->p_roi[i].y_; - }*/ + CMPoint pROI[MAXVERTEXNUM]; reginifos.nFrameNum = region_infos->frame_num; - //reginifos.dirPoint.x = region_infos->dir_point.x_; - //reginifos.dirPoint.y = region_infos->dir_point.y_; - //reginifos.finaldir = region_infos->finaldir; - //reginifos.ArrowStartPoint.x = region_infos->arrow_start_point.x_; - //reginifos.ArrowStartPoint.y = region_infos->arrow_start_point.y_; - //reginifos.ArrowEndPoint.x = region_infos->arrow_end_point.x_; //箭头的终止端点 箭头指向正方形 - //reginifos.ArrowEndPoint.y = region_infos->arrow_end_point.y_; //箭头的终止端点 箭头指向正方形 + int totalObjCount = 0; @@ -94,11 +67,9 @@ int IRegionSurveillanceCpu::rs_detect(const sy_img &img_data, region_info* regio memcpy(gray->imageData, img_data.data_, img_data.w_*img_data.h_ * img_data.c_); //cvSetData(gray, img_data.data_, img_data.w_); for (int k = 0; k < rect_num; ++k) - //int k = 0; { IplImage * img = cvCreateImage(cvSize(rect[k].width_, rect[k].height_), 8, 1); Screenshot(gray, img, rect[k]); - //cv::Mat roi_img = cv::src_img(Range(0, 100), Range(50, 200)); IReginCpu[k]->RSDetect((unsigned char*)(img->imageData), ®inifos); auto ObjCount = IReginCpu[k]->getObjectNum(); diff --git a/src/left_over/RegionSurveillanceProcess.h b/src/left_over/RegionSurveillanceProcess.h index ddac83c..5ec4fae 100644 --- a/src/left_over/RegionSurveillanceProcess.h +++ b/src/left_over/RegionSurveillanceProcess.h @@ -31,12 +31,12 @@ public: // } // //}; - + virtual ~RegionSurveillanceProcess() {}; virtual int rs_init(const rs_params ¶m) = 0; virtual int rs_init_region(int num_roi, region_info* region_infos/*, bool iflog*/) = 0; virtual int rs_detect(const sy_img &img_data, region_info* region_infos, rs_result *result) = 0; //virtual int rs_get_arrowdir(const sy_point &p_roi0, const sy_point &p_roi1, const sy_point &dir) = 0; - void* handle; + //void* handle; int licence_status = -1; int thrd_status = -1; double scale; diff --git a/src/left_over/svibe.cpp b/src/left_over/svibe.cpp index 64ad291..df728f4 100644 --- a/src/left_over/svibe.cpp +++ b/src/left_over/svibe.cpp @@ -3352,14 +3352,13 @@ void RegionSurveillance::RSrelease() greyImgData = NULL; } - if (vbM->bg_samples != NULL) - { - free(vbM->bg_samples); - vbM->bg_samples = NULL; - } - if (vbM != NULL) { + if (vbM->bg_samples != NULL) + { + free(vbM->bg_samples); + vbM->bg_samples = NULL; + } free(vbM); vbM = NULL; }