mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Minor fix

Browse Source
This commit is contained in:
AlexeyAB
2018-06-07 03:39:30 +03:00
parent 3010e1f755
commit 1c05ebf522
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/image.c
View File

@ -1034,7 +1034,14 @@ image get_image_from_stream_resize(CvCapture *cap, int w, int h, int c, IplImage
else return make_empty_image(0, 0, 0); else return make_empty_image(0, 0, 0);
} }
if (src->width < 1 || src->height < 1 || src->nChannels < 1) { if (src->width < 1 || src->height < 1 || src->nChannels < 1) {
if (cpp_video_capture) cvReleaseImage(&src); if (cpp_video_capture) {
cvReleaseImage(&src);
int z = 0;
for (z = 0; z < 10; ++z) {
get_webcam_frame(cap);
cvReleaseImage(&src);
}
}
if (dont_close) src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, c); if (dont_close) src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, c);
else return make_empty_image(0, 0, 0); else return make_empty_image(0, 0, 0);
} }

4
src/network.c
View File

@ -443,8 +443,8 @@ int resize_network(network *net, int w, int h)
} }
#ifdef GPU #ifdef GPU
if(gpu_index >= 0){ if(gpu_index >= 0){
printf(" try to allocate workspace = %zu * sizeof(float), ", (workspace_size - 1) / sizeof(float) + 1); printf(" try to allocate workspace = %zu * sizeof(float), ", workspace_size / sizeof(float) + 1);
net->workspace = cuda_make_array(0, (workspace_size-1)/sizeof(float)+1); net->workspace = cuda_make_array(0, workspace_size/sizeof(float) + 1);
printf(" CUDA allocate done! \n"); printf(" CUDA allocate done! \n");
}else { }else {
free(net->workspace); free(net->workspace);

2
src/parser.c
View File

@ -817,7 +817,7 @@ network parse_network_cfg_custom(char *filename, int batch)
//printf("%ld\n", workspace_size); //printf("%ld\n", workspace_size);
#ifdef GPU #ifdef GPU
if(gpu_index >= 0){ if(gpu_index >= 0){
net.workspace = cuda_make_array(0, (workspace_size-1)/sizeof(float)+1); net.workspace = cuda_make_array(0, workspace_size/sizeof(float) + 1);
}else { }else {
net.workspace = calloc(1, workspace_size); net.workspace = calloc(1, workspace_size);
} }