From 0f7f2899b65343e56b0a1188f703d459d824d398 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 16 Nov 2015 03:51:26 +0000
Subject: [PATCH] Fix for cuda 7.5
---
src/image.c | 121 +++++++++++++++++++++++-----------------
1 files changed, 69 insertions(+), 52 deletions(-)
diff --git a/src/image.c b/src/image.c
index c499c79..ac49529 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3,6 +3,11 @@
#include <stdio.h>
#include <math.h>
+#ifdef OPENCV
+#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/imgproc/imgproc_c.h"
+#endif
+
#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"
#define STB_IMAGE_WRITE_IMPLEMENTATION
@@ -67,6 +72,19 @@
}
}
+void draw_bbox(image a, box bbox, int w, float r, float g, float b)
+{
+ int left = (bbox.x-bbox.w/2)*a.w;
+ int right = (bbox.x+bbox.w/2)*a.w;
+ int top = (bbox.y-bbox.h/2)*a.h;
+ int bot = (bbox.y+bbox.h/2)*a.h;
+
+ int i;
+ for(i = 0; i < w; ++i){
+ draw_box(a, left+i, top+i, right-i, bot-i, r, g, b);
+ }
+}
+
void flip_image(image a)
{
int i,j,k;
@@ -188,7 +206,7 @@
int x,y,k;
image copy = copy_image(p);
constrain_image(copy);
- rgbgr_image(copy);
+ if(p.c == 3) rgbgr_image(copy);
//normalize_image(copy);
char buff[256];
@@ -197,7 +215,7 @@
IplImage *disp = cvCreateImage(cvSize(p.w,p.h), IPL_DEPTH_8U, p.c);
int step = disp->widthStep;
- cvNamedWindow(buff, CV_WINDOW_AUTOSIZE);
+ cvNamedWindow(buff, CV_WINDOW_NORMAL);
//cvMoveWindow(buff, 100*(windows%10) + 200*(windows/10), 100*(windows%10));
++windows;
for(y = 0; y < p.h; ++y){
@@ -209,7 +227,7 @@
}
free_image(copy);
if(0){
- //if(disp->height < 448 || disp->width < 448 || disp->height > 1000){
+ //if(disp->height < 448 || disp->width < 448 || disp->height > 1000){
int w = 448;
int h = w*p.h/p.w;
if(h > 1000){
@@ -228,12 +246,12 @@
void show_image(image p, char *name)
{
- #ifdef OPENCV
+#ifdef OPENCV
show_image_cv(p, name);
- #else
+#else
fprintf(stderr, "Not compiled with OpenCV, saving to %s.png instead\n", name);
save_image(p, name);
- #endif
+#endif
}
void save_image(image im, char *name)
@@ -249,19 +267,19 @@
}
}
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_cv(image p, char *name)
+#ifdef OPENCV
+void save_image_jpg(image p, char *name)
{
- int x,y,k;
image copy = copy_image(p);
- //normalize_image(copy);
+ rgbgr_image(copy);
+ int x,y,k;
char buff[256];
- //sprintf(buff, "%s (%d)", name, windows);
- sprintf(buff, "%s.png", name);
+ sprintf(buff, "%s.jpg", name);
IplImage *disp = cvCreateImage(cvSize(p.w,p.h), IPL_DEPTH_8U, p.c);
int step = disp->widthStep;
@@ -272,11 +290,11 @@
}
}
}
- free_image(copy);
cvSaveImage(buff, disp,0);
cvReleaseImage(&disp);
+ free_image(copy);
}
-*/
+#endif
void show_image_layers(image p, char *name)
{
@@ -332,7 +350,7 @@
for(x = 0; x < im.w; ++x){
float rx = cos(rad)*(x-cx) - sin(rad)*(y-cy) + cx;
float ry = sin(rad)*(x-cx) + cos(rad)*(y-cy) + cy;
- float val = billinear_interpolate(im, rx, ry, c);
+ float val = bilinear_interpolate(im, rx, ry, c);
set_pixel(rot, x, y, c, val);
}
}
@@ -464,7 +482,7 @@
{
assert(im.c == 3);
int i, j, k;
- image gray = make_image(im.w, im.h, im.c);
+ image gray = make_image(im.w, im.h, 1);
float scale[] = {0.587, 0.299, 0.114};
for(k = 0; k < im.c; ++k){
for(j = 0; j < im.h; ++j){
@@ -473,11 +491,19 @@
}
}
}
- memcpy(gray.data + im.w*im.h*1, gray.data, sizeof(float)*im.w*im.h);
- memcpy(gray.data + im.w*im.h*2, gray.data, sizeof(float)*im.w*im.h);
return gray;
}
+image threshold_image(image im, float thresh)
+{
+ int i;
+ image t = make_image(im.w, im.h, im.c);
+ for(i = 0; i < im.w*im.h*im.c; ++i){
+ t.data[i] = im.data[i]>thresh ? 1 : 0;
+ }
+ return t;
+}
+
image blend_image(image fore, image back, float alpha)
{
assert(fore.w == back.w && fore.h == back.h && fore.c == back.c);
@@ -549,7 +575,7 @@
}
*/
-float billinear_interpolate(image im, float x, float y, int c)
+float bilinear_interpolate(image im, float x, float y, int c)
{
int ix = (int) floorf(x);
int iy = (int) floorf(y);
@@ -564,29 +590,9 @@
return val;
}
-// #wikipedia
image resize_image(image im, int w, int h)
{
image resized = make_image(w, h, im.c);
- int r, c, k;
- float w_scale = (float)(im.w - 1) / (w - 1);
- float h_scale = (float)(im.h - 1) / (h - 1);
- for(k = 0; k < im.c; ++k){
- for(r = 0; r < h; ++r){
- for(c = 0; c < w; ++c){
- float sx = c*w_scale;
- float sy = r*h_scale;
- float val = billinear_interpolate(im, sx, sy, k);
- set_pixel(resized, c, r, k, val);
- }
- }
- }
- return resized;
-}
-
-image resize_image2(image im, int w, int h)
-{
- image resized = make_image(w, h, im.c);
image part = make_image(w, im.h, im.c);
int r, c, k;
float w_scale = (float)(im.w - 1) / (w - 1);
@@ -595,7 +601,7 @@
for(r = 0; r < im.h; ++r){
for(c = 0; c < w; ++c){
float val = 0;
- if(c == w-1){
+ if(c == w-1 || im.w == 1){
val = get_pixel(im, im.w-1, r, k);
} else {
float sx = c*w_scale;
@@ -607,7 +613,6 @@
}
}
}
-
for(k = 0; k < im.c; ++k){
for(r = 0; r < h; ++r){
float sy = r*h_scale;
@@ -617,7 +622,7 @@
float val = (1-dy) * get_pixel(part, c, iy, k);
set_pixel(resized, c, r, k, val);
}
- if(r == h-1) continue;
+ if(r == h-1 || im.h == 1) continue;
for(c = 0; c < w; ++c){
float val = dy * get_pixel(part, c, iy+1, k);
add_pixel(resized, c, r, k, val);
@@ -652,9 +657,9 @@
show_image(sat5, "Saturation-.5");
show_image(exp2, "Exposure-2");
show_image(exp5, "Exposure-.5");
- #ifdef OPENCV
+#ifdef OPENCV
cvWaitKey(0);
- #endif
+#endif
}
#ifdef OPENCV
@@ -688,10 +693,10 @@
else {
fprintf(stderr, "OpenCV can't force load with %d channels\n", channels);
}
-
+
if( (src = cvLoadImage(filename, flag)) == 0 )
{
- printf("Cannot load file image %s\n", filename);
+ printf("Cannot load image \"%s\"\n", filename);
exit(0);
}
image out = ipl_to_image(src);
@@ -708,7 +713,7 @@
int w, h, c;
unsigned char *data = stbi_load(filename, &w, &h, &c, channels);
if (!data) {
- fprintf(stderr, "Cannot load file image %s\nSTB Reason: %s\n", filename, stbi_failure_reason());
+ fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", filename, stbi_failure_reason());
exit(0);
}
if(channels) c = channels;
@@ -729,11 +734,11 @@
image load_image(char *filename, int w, int h, int c)
{
- #ifdef OPENCV
+#ifdef OPENCV
image out = load_image_cv(filename, c);
- #else
+#else
image out = load_image_stb(filename, c);
- #endif
+#endif
if((h && w) && (h != out.h || w != out.w)){
image resized = resize_image(out, w, h);
@@ -870,8 +875,20 @@
void show_images(image *ims, int n, char *window)
{
image m = collapse_images_vert(ims, n);
- save_image(m, window);
- show_image(m, window);
+ /*
+ int w = 448;
+ int h = ((float)m.h/m.w) * 448;
+ if(h > 896){
+ h = 896;
+ w = ((float)m.w/m.h) * 896;
+ }
+ image sized = resize_image(m, w, h);
+ */
+ normalize_image(m);
+ image sized = resize_image(m, m.w, m.h);
+ save_image(sized, window);
+ show_image(sized, window);
+ free_image(sized);
free_image(m);
}
--
Gitblit v1.10.0