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

cpu batch norm works

Browse Source
This commit is contained in:
Joseph Redmon
2016-11-18 21:51:36 -08:00
parent c6afc7ff14
commit 62235e9aa3
12 changed files with 119 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/image.c
View File

@ -532,11 +532,8 @@ void save_image_jpg(image p, const char *name)
}
#endif
void save_image(image im, const char *name)
void save_image_png(image im, const char *name)
{
#ifdef OPENCV
save_image_jpg(im, name);
#else
char buff[256];
//sprintf(buff, "%s (%d)", name, windows);
sprintf(buff, "%s.png", name);
@ -550,6 +547,14 @@ void save_image(image im, const char *name)
int success = stbi_write_png(buff, im.w, im.h, im.c, data, im.w*im.c);
free(data);
if(!success) fprintf(stderr, "Failed to write image %s\n", buff);
}
void save_image(image im, const char *name)
{
#ifdef OPENCV
save_image_jpg(im, name);
#else
save_image_png(im, name);
#endif
}
@ -748,6 +753,22 @@ void composite_3d(char *f1, char *f2, char *out, int delta)
#endif
}
image resize_max(image im, int max)
{
int w = im.w;
int h = im.h;
if(w > h){
h = (h * max) / w;
w = max;
} else {
w = (w * max) / h;
h = max;
}
if(w == im.w && h == im.h) return im;
image resized = resize_image(im, w, h);
return resized;
}
image resize_min(image im, int min)
{
int w = im.w;