Zou XiKun / left_over

Commit 4ec0e24e91f3e6fc4c4b0b1123f896e7e6d5d5e3

Authored by Zou XiKun
1 parent 1bfead76

add a ';'

Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
src/left_over/ms_region_surveilance.cpp
  View file @4ec0e24
@@ -146,7 +146,7 @@ int rs_init(void **handle, rs_param param) @@ -146,7 +146,7 @@ int rs_init(void **handle, rs_param param)
146 char wtime[15]; 146 char wtime[15];
147 memset(wtime, 0, 15); 147 memset(wtime, 0, 15);
148 char * time = wtime; 148 char * time = wtime;
149 - ret = sy_licence(productSN, &time) 149 + ret = sy_licence(productSN, &time);
150 #endif 150 #endif
151 if (ret == SUCCESS) 151 if (ret == SUCCESS)
152 auth_type = true; 152 auth_type = true;
@@ -160,7 +160,7 @@ int rs_init(void **handle, rs_param param) @@ -160,7 +160,7 @@ int rs_init(void **handle, rs_param param)
160 regin->macDetectObjNum = param.max_obj_num; 160 regin->macDetectObjNum = param.max_obj_num;
161 161
162 regin->scale = param.scale; 162 regin->scale = param.scale;
163 - regin->rect_num = param.rect_num; //有效区域数量 163 + regin->rect_num = param.rect_num; //锟斤拷效锟斤拷锟斤拷锟斤拷锟斤拷
164 for (int i = 0; i < regin->rect_num; ++i) 164 for (int i = 0; i < regin->rect_num; ++i)
165 { 165 {
166 regin->rect[i].left_ = param.rect[i].left_ / param.scale; 166 regin->rect[i].left_ = param.rect[i].left_ / param.scale;
@@ -274,7 +274,7 @@ int rs_process(void *handle, sy_img img_data, rs_result *result) @@ -274,7 +274,7 @@ int rs_process(void *handle, sy_img img_data, rs_result *result)
274 //regin->scale = param.scale; 274 //regin->scale = param.scale;
275 int width = img.width / regin->scale; 275 int width = img.width / regin->scale;
276 int height = img.height / regin->scale; 276 int height = img.height / regin->scale;
277 - IplImage * srcscale = cvCreateImage(cvSize(width, height), 8, 3); //用于缩放 当前先不缩放 277 + IplImage * srcscale = cvCreateImage(cvSize(width, height), 8, 3); //锟斤拷锟斤拷锟斤拷锟斤拷 锟斤拷前锟饺诧拷锟斤拷锟斤拷
278 cvResize(&img, srcscale); 278 cvResize(&img, srcscale);
279 //int pixEdge = 0; 279 //int pixEdge = 0;
280 //int width2 = width; 280 //int width2 = width;
@@ -291,7 +291,7 @@ int rs_process(void *handle, sy_img img_data, rs_result *result) @@ -291,7 +291,7 @@ int rs_process(void *handle, sy_img img_data, rs_result *result)
291 // ++width2; 291 // ++width2;
292 // } 292 // }
293 //} 293 //}
294 - //IplImage * srcscale2 = cvCreateImage(cvSize(width2, height2), 8, 3); //用于缩放 当前先不缩放 294 + //IplImage * srcscale2 = cvCreateImage(cvSize(width2, height2), 8, 3); //锟斤拷锟斤拷锟斤拷锟斤拷 锟斤拷前锟饺诧拷锟斤拷锟斤拷
295 295
296 //for (int i = 0; i < height; ++i) 296 //for (int i = 0; i < height; ++i)
297 //{ 297 //{
@@ -309,9 +309,9 @@ int rs_process(void *handle, sy_img img_data, rs_result *result) @@ -309,9 +309,9 @@ int rs_process(void *handle, sy_img img_data, rs_result *result)
309 if (regin->init_flag == false) 309 if (regin->init_flag == false)
310 { 310 {
311 rs_params param; 311 rs_params param;
312 - param.mode = 0; //运行模式(DEVICE_GPU / DEVICE_CPU)  
313 - param.gpuid = 0; //指定显卡id  
314 - param.max_obj_num = regin->macDetectObjNum; //其余算法参数 如长短边等 312 + param.mode = 0; //锟斤拷锟斤拷模式(DEVICE_GPU / DEVICE_CPU)
  313 + param.gpuid = 0; //指锟斤拷锟皆匡拷id
  314 + param.max_obj_num = regin->macDetectObjNum; //锟斤拷锟斤拷锟姐法锟斤拷锟斤拷 锟界长锟教边碉拷
315 315
316 param.image = image; 316 param.image = image;
317 param.channel_deal = 1; 317 param.channel_deal = 1;