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

Another minor fix

Browse Source
This commit is contained in:
AlexeyAB
2019-01-22 17:31:07 +03:00
parent 0541428f78
commit 2cd37ec73e
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/detector.c
View File

@ -1274,8 +1274,8 @@ void test_detector(char *datacfg, char *cfgfile, char *weightfile, char *filenam
if (!input) break;
strtok(input, "\n");
}
//image im = load_image_resize(input, net.w, net.h, net.c);
//image sized = copy_image(im);
//image im;
//image sized = load_image_resize(input, net.w, net.h, net.c, &im);
image im = load_image(input, 0, 0, net.c);
image sized = resize_image(im, net.w, net.h);
int letterbox = 0;

14
src/http_stream.cpp
View File

@ -593,7 +593,7 @@ image image_data_augmentation(IplImage* ipl, int w, int h,
}
image load_image_resize(char *filename, int w, int h, int c)
image load_image_resize(char *filename, int w, int h, int c, image *im)
{
image out;
cv::Mat img(h, w, CV_8UC3);
@ -607,15 +607,19 @@ image load_image_resize(char *filename, int w, int h, int c)
}
//throw std::runtime_error("runtime_error");
cv::Mat loaded_image = cv::imread(filename, flag);
cv::resize(loaded_image, img, cv::Size(w, h), 0, 0, CV_INTER_LINEAR);
cv::cvtColor(img, img, cv::COLOR_RGB2BGR);
cv::cvtColor(loaded_image, loaded_image, cv::COLOR_RGB2BGR);
IplImage tmp1 = loaded_image;
*im = ipl_to_image(&tmp1);
IplImage tmp = img;
out = ipl_to_image(&tmp);
cv::resize(loaded_image, img, cv::Size(w, h), 0, 0, CV_INTER_LINEAR);
IplImage tmp2 = img;
out = ipl_to_image(&tmp2);
}
catch (...) {
fprintf(stderr, "OpenCV can't load image %s channels\n", filename);
out = make_image(w, h, c);
*im = make_image(w, h, c);
}
return out;
}

2
src/http_stream.h
View File

@ -26,7 +26,7 @@ image image_data_augmentation(IplImage* ipl, int w, int h,
int pleft, int ptop, int swidth, int sheight, int flip,
float jitter, float dhue, float dsat, float dexp);
image load_image_resize(char *filename, int w, int h, int c);
image load_image_resize(char *filename, int w, int h, int c, image *im);
#endif // OPENCV
#ifdef __cplusplus