From ae43c2bc32fbb838bfebeeaf2c2b058ccab5c83c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Thu, 23 Jun 2016 05:31:14 +0000
Subject: [PATCH] hi
---
src/image.c | 621 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 454 insertions(+), 167 deletions(-)
diff --git a/src/image.c b/src/image.c
index 92c9066..0309ef1 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,5 +1,6 @@
#include "image.h"
#include "utils.h"
+#include "blas.h"
#include <stdio.h>
#include <math.h>
@@ -23,6 +24,26 @@
return r;
}
+void draw_label(image a, int r, int c, image label, const float *rgb)
+{
+ float ratio = (float) label.w / label.h;
+ int h = label.h;
+ int w = ratio * h;
+ image rl = resize_image(label, w, h);
+ if (r - h >= 0) r = r - h;
+
+ int i, j, k;
+ for(j = 0; j < h && j + r < a.h; ++j){
+ for(i = 0; i < w && i + c < a.w; ++i){
+ for(k = 0; k < label.c; ++k){
+ float val = get_pixel(rl, i, j, k);
+ set_pixel(a, i+c, j+r, k, rgb[k] * val);
+ }
+ }
+ }
+ free_image(rl);
+}
+
void draw_box(image a, int x1, int y1, int x2, int y2, float r, float g, float b)
{
//normalize_image(a);
@@ -37,25 +58,25 @@
if(y2 < 0) y2 = 0;
if(y2 >= a.h) y2 = a.h-1;
- for(i = x1; i < x2; ++i){
- a.data[i + y1*a.w + 0*a.w*a.h] = b;
- a.data[i + y2*a.w + 0*a.w*a.h] = b;
+ for(i = x1; i <= x2; ++i){
+ a.data[i + y1*a.w + 0*a.w*a.h] = r;
+ a.data[i + y2*a.w + 0*a.w*a.h] = r;
a.data[i + y1*a.w + 1*a.w*a.h] = g;
a.data[i + y2*a.w + 1*a.w*a.h] = g;
- a.data[i + y1*a.w + 2*a.w*a.h] = r;
- a.data[i + y2*a.w + 2*a.w*a.h] = r;
+ a.data[i + y1*a.w + 2*a.w*a.h] = b;
+ a.data[i + y2*a.w + 2*a.w*a.h] = b;
}
- for(i = y1; i < y2; ++i){
- a.data[x1 + i*a.w + 0*a.w*a.h] = b;
- a.data[x2 + i*a.w + 0*a.w*a.h] = b;
+ for(i = y1; i <= y2; ++i){
+ a.data[x1 + i*a.w + 0*a.w*a.h] = r;
+ a.data[x2 + i*a.w + 0*a.w*a.h] = r;
a.data[x1 + i*a.w + 1*a.w*a.h] = g;
a.data[x2 + i*a.w + 1*a.w*a.h] = g;
- a.data[x1 + i*a.w + 2*a.w*a.h] = r;
- a.data[x2 + i*a.w + 2*a.w*a.h] = r;
+ a.data[x1 + i*a.w + 2*a.w*a.h] = b;
+ a.data[x2 + i*a.w + 2*a.w*a.h] = b;
}
}
@@ -67,6 +88,93 @@
}
}
+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 draw_detections(image im, int num, float thresh, box *boxes, float **probs, char **names, image *labels, int classes)
+{
+ int i;
+
+ for(i = 0; i < num; ++i){
+ int class = max_index(probs[i], classes);
+ float prob = probs[i][class];
+ if(prob > thresh){
+ int width = pow(prob, 1./2.)*10+1;
+ width = 8;
+ printf("%s: %.2f\n", names[class], prob);
+ int offset = class*17 % classes;
+ float red = get_color(0,offset,classes);
+ float green = get_color(1,offset,classes);
+ float blue = get_color(2,offset,classes);
+ float rgb[3];
+ rgb[0] = red;
+ rgb[1] = green;
+ rgb[2] = blue;
+ box b = boxes[i];
+
+ int left = (b.x-b.w/2.)*im.w;
+ int right = (b.x+b.w/2.)*im.w;
+ int top = (b.y-b.h/2.)*im.h;
+ int bot = (b.y+b.h/2.)*im.h;
+
+ if(left < 0) left = 0;
+ if(right > im.w-1) right = im.w-1;
+ if(top < 0) top = 0;
+ if(bot > im.h-1) bot = im.h-1;
+
+ draw_box_width(im, left, top, right, bot, width, red, green, blue);
+ if (labels) draw_label(im, top + width, left, labels[class], rgb);
+ }
+ }
+}
+
+void transpose_image(image im)
+{
+ assert(im.w == im.h);
+ int n, m;
+ int c;
+ for(c = 0; c < im.c; ++c){
+ for(n = 0; n < im.w-1; ++n){
+ for(m = n + 1; m < im.w; ++m){
+ float swap = im.data[m + im.w*(n + im.h*c)];
+ im.data[m + im.w*(n + im.h*c)] = im.data[n + im.w*(m + im.h*c)];
+ im.data[n + im.w*(m + im.h*c)] = swap;
+ }
+ }
+ }
+}
+
+void rotate_image_cw(image im, int times)
+{
+ assert(im.w == im.h);
+ times = (times + 400) % 4;
+ int i, x, y, c;
+ int n = im.w;
+ for(i = 0; i < times; ++i){
+ for(c = 0; c < im.c; ++c){
+ for(x = 0; x < n/2; ++x){
+ for(y = 0; y < (n-1)/2 + 1; ++y){
+ float temp = im.data[y + im.w*(x + im.h*c)];
+ im.data[y + im.w*(x + im.h*c)] = im.data[n-1-x + im.w*(y + im.h*c)];
+ im.data[n-1-x + im.w*(y + im.h*c)] = im.data[n-1-y + im.w*(n-1-x + im.h*c)];
+ im.data[n-1-y + im.w*(n-1-x + im.h*c)] = im.data[x + im.w*(n-1-y + im.h*c)];
+ im.data[x + im.w*(n-1-y + im.h*c)] = temp;
+ }
+ }
+ }
+ }
+}
+
void flip_image(image a)
{
int i,j,k;
@@ -183,7 +291,7 @@
}
#ifdef OPENCV
-void show_image_cv(image p, char *name)
+void show_image_cv(image p, const char *name)
{
int x,y,k;
image copy = copy_image(p);
@@ -197,7 +305,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 +317,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){
@@ -223,154 +331,272 @@
}
cvShowImage(buff, disp);
cvReleaseImage(&disp);
-}
+ }
#endif
-void show_image(image p, char *name)
-{
- #ifdef OPENCV
- show_image_cv(p, name);
- #else
- fprintf(stderr, "Not compiled with OpenCV, saving to %s.png instead\n", name);
- save_image(p, name);
- #endif
-}
-
-void save_image(image im, char *name)
-{
- char buff[256];
- //sprintf(buff, "%s (%d)", name, windows);
- sprintf(buff, "%s.png", name);
- unsigned char *data = calloc(im.w*im.h*im.c, sizeof(char));
- int i,k;
- for(k = 0; k < im.c; ++k){
- for(i = 0; i < im.w*im.h; ++i){
- data[i*im.c+k] = (unsigned char) (255*im.data[i + k*im.w*im.h]);
- }
+ void show_image(image p, const char *name)
+ {
+#ifdef OPENCV
+ show_image_cv(p, name);
+#else
+ fprintf(stderr, "Not compiled with OpenCV, saving to %s.png instead\n", name);
+ save_image(p, name);
+#endif
}
- 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)
-{
- int x,y,k;
- image copy = copy_image(p);
- //normalize_image(copy);
-
- char buff[256];
- //sprintf(buff, "%s (%d)", name, windows);
- sprintf(buff, "%s.png", name);
-
- IplImage *disp = cvCreateImage(cvSize(p.w,p.h), IPL_DEPTH_8U, p.c);
- int step = disp->widthStep;
- for(y = 0; y < p.h; ++y){
- for(x = 0; x < p.w; ++x){
- for(k= 0; k < p.c; ++k){
- disp->imageData[y*step + x*p.c + k] = (unsigned char)(get_pixel(copy,x,y,k)*255);
+ void save_image(image im, const char *name)
+ {
+ char buff[256];
+ //sprintf(buff, "%s (%d)", name, windows);
+ sprintf(buff, "%s.png", name);
+ unsigned char *data = calloc(im.w*im.h*im.c, sizeof(char));
+ int i,k;
+ for(k = 0; k < im.c; ++k){
+ for(i = 0; i < im.w*im.h; ++i){
+ data[i*im.c+k] = (unsigned char) (255*im.data[i + k*im.w*im.h]);
}
}
+ 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);
}
- free_image(copy);
- cvSaveImage(buff, disp,0);
- cvReleaseImage(&disp);
-}
-*/
-void show_image_layers(image p, char *name)
-{
- int i;
- char buff[256];
- for(i = 0; i < p.c; ++i){
- sprintf(buff, "%s - Layer %d", name, i);
- image layer = get_image_layer(p, i);
- show_image(layer, buff);
- free_image(layer);
+#ifdef OPENCV
+ image get_image_from_stream(CvCapture *cap)
+ {
+ IplImage* src = cvQueryFrame(cap);
+ if (!src) return make_empty_image(0,0,0);
+ image im = ipl_to_image(src);
+ rgbgr_image(im);
+ return im;
}
-}
+#endif
-void show_image_collapsed(image p, char *name)
-{
- image c = collapse_image_layers(p, 1);
- show_image(c, name);
- free_image(c);
-}
+#ifdef OPENCV
+ void save_image_jpg(image p, char *name)
+ {
+ image copy = copy_image(p);
+ rgbgr_image(copy);
+ int x,y,k;
-image make_empty_image(int w, int h, int c)
-{
- image out;
- out.data = 0;
- out.h = h;
- out.w = w;
- out.c = c;
- return out;
-}
+ char buff[256];
+ sprintf(buff, "%s.jpg", name);
-image make_image(int w, int h, int c)
-{
- image out = make_empty_image(w,h,c);
- out.data = calloc(h*w*c, sizeof(float));
- return out;
-}
-
-image float_to_image(int w, int h, int c, float *data)
-{
- image out = make_empty_image(w,h,c);
- out.data = data;
- return out;
-}
-
-image rotate_image(image im, float rad)
-{
- int x, y, c;
- float cx = im.w/2.;
- float cy = im.h/2.;
- image rot = make_image(im.w, im.h, im.c);
- for(c = 0; c < im.c; ++c){
- for(y = 0; y < im.h; ++y){
- 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 = bilinear_interpolate(im, rx, ry, c);
- set_pixel(rot, x, y, c, val);
- }
- }
- }
- return rot;
-}
-
-void translate_image(image m, float s)
-{
- int i;
- for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] += s;
-}
-
-void scale_image(image m, float s)
-{
- int i;
- for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] *= s;
-}
-
-image crop_image(image im, int dx, int dy, int w, int h)
-{
- image cropped = make_image(w, h, im.c);
- int i, j, k;
- for(k = 0; k < im.c; ++k){
- for(j = 0; j < h; ++j){
- for(i = 0; i < w; ++i){
- int r = j + dy;
- int c = i + dx;
- float val = 0;
- if (r >= 0 && r < im.h && c >= 0 && c < im.w) {
- val = get_pixel(im, c, r, k);
+ IplImage *disp = cvCreateImage(cvSize(p.w,p.h), IPL_DEPTH_8U, p.c);
+ int step = disp->widthStep;
+ for(y = 0; y < p.h; ++y){
+ for(x = 0; x < p.w; ++x){
+ for(k= 0; k < p.c; ++k){
+ disp->imageData[y*step + x*p.c + k] = (unsigned char)(get_pixel(copy,x,y,k)*255);
}
- set_pixel(cropped, i, j, k, val);
}
}
+ cvSaveImage(buff, disp,0);
+ cvReleaseImage(&disp);
+ free_image(copy);
}
- return cropped;
+#endif
+
+ void show_image_layers(image p, char *name)
+ {
+ int i;
+ char buff[256];
+ for(i = 0; i < p.c; ++i){
+ sprintf(buff, "%s - Layer %d", name, i);
+ image layer = get_image_layer(p, i);
+ show_image(layer, buff);
+ free_image(layer);
+ }
+ }
+
+ void show_image_collapsed(image p, char *name)
+ {
+ image c = collapse_image_layers(p, 1);
+ show_image(c, name);
+ free_image(c);
+ }
+
+ image make_empty_image(int w, int h, int c)
+ {
+ image out;
+ out.data = 0;
+ out.h = h;
+ out.w = w;
+ out.c = c;
+ return out;
+ }
+
+ image make_image(int w, int h, int c)
+ {
+ image out = make_empty_image(w,h,c);
+ out.data = calloc(h*w*c, sizeof(float));
+ return out;
+ }
+
+ image make_random_image(int w, int h, int c)
+ {
+ image out = make_empty_image(w,h,c);
+ out.data = calloc(h*w*c, sizeof(float));
+ int i;
+ for(i = 0; i < w*h*c; ++i){
+ out.data[i] = (rand_normal() * .25) + .5;
+ }
+ return out;
+ }
+
+ image float_to_image(int w, int h, int c, float *data)
+ {
+ image out = make_empty_image(w,h,c);
+ out.data = data;
+ return out;
+ }
+
+ image rotate_image(image im, float rad)
+ {
+ int x, y, c;
+ float cx = im.w/2.;
+ float cy = im.h/2.;
+ image rot = make_image(im.w, im.h, im.c);
+ for(c = 0; c < im.c; ++c){
+ for(y = 0; y < im.h; ++y){
+ 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 = bilinear_interpolate(im, rx, ry, c);
+ set_pixel(rot, x, y, c, val);
+ }
+ }
+ }
+ return rot;
+ }
+
+ void translate_image(image m, float s)
+ {
+ int i;
+ for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] += s;
+ }
+
+ void scale_image(image m, float s)
+ {
+ int i;
+ for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] *= s;
+ }
+
+ image crop_image(image im, int dx, int dy, int w, int h)
+ {
+ image cropped = make_image(w, h, im.c);
+ int i, j, k;
+ for(k = 0; k < im.c; ++k){
+ for(j = 0; j < h; ++j){
+ for(i = 0; i < w; ++i){
+ int r = j + dy;
+ int c = i + dx;
+ float val = 0;
+ r = constrain_int(r, 0, im.h-1);
+ c = constrain_int(c, 0, im.w-1);
+ if (r >= 0 && r < im.h && c >= 0 && c < im.w) {
+ val = get_pixel(im, c, r, k);
+ }
+ set_pixel(cropped, i, j, k, val);
+ }
+ }
+ }
+ return cropped;
+ }
+
+int best_3d_shift_r(image a, image b, int min, int max)
+{
+ if(min == max) return min;
+ int mid = floor((min + max) / 2.);
+ image c1 = crop_image(b, 0, mid, b.w, b.h);
+ image c2 = crop_image(b, 0, mid+1, b.w, b.h);
+ float d1 = dist_array(c1.data, a.data, a.w*a.h*a.c, 10);
+ float d2 = dist_array(c2.data, a.data, a.w*a.h*a.c, 10);
+ free_image(c1);
+ free_image(c2);
+ if(d1 < d2) return best_3d_shift_r(a, b, min, mid);
+ else return best_3d_shift_r(a, b, mid+1, max);
+}
+
+int best_3d_shift(image a, image b, int min, int max)
+{
+ int i;
+ int best = 0;
+ float best_distance = FLT_MAX;
+ for(i = min; i <= max; i += 2){
+ image c = crop_image(b, 0, i, b.w, b.h);
+ float d = dist_array(c.data, a.data, a.w*a.h*a.c, 100);
+ if(d < best_distance){
+ best_distance = d;
+ best = i;
+ }
+ printf("%d %f\n", i, d);
+ free_image(c);
+ }
+ return best;
+}
+
+void composite_3d(char *f1, char *f2, char *out)
+{
+ if(!out) out = "out";
+ image a = load_image(f1, 0,0,0);
+ image b = load_image(f2, 0,0,0);
+ int shift = best_3d_shift_r(a, b, -a.h/100, a.h/100);
+
+ image c1 = crop_image(b, 10, shift, b.w, b.h);
+ float d1 = dist_array(c1.data, a.data, a.w*a.h*a.c, 100);
+ image c2 = crop_image(b, -10, shift, b.w, b.h);
+ float d2 = dist_array(c2.data, a.data, a.w*a.h*a.c, 100);
+
+ if(d2 < d1){
+ image swap = a;
+ a = b;
+ b = swap;
+ shift = -shift;
+ printf("swapped, %d\n", shift);
+ }
+ else{
+ printf("%d\n", shift);
+ }
+
+ image c = crop_image(b, 0, shift, a.w, a.h);
+ int i;
+ for(i = 0; i < c.w*c.h; ++i){
+ c.data[i] = a.data[i];
+ }
+#ifdef OPENCV
+ save_image_jpg(c, out);
+#else
+ save_image(c, out);
+#endif
+}
+
+image resize_min(image im, int min)
+{
+ int w = im.w;
+ int h = im.h;
+ if(w < h){
+ h = (h * min) / w;
+ w = min;
+ } else {
+ w = (w * min) / h;
+ h = min;
+ }
+ if(w == im.w && h == im.h) return im;
+ image resized = resize_image(im, w, h);
+ return resized;
+}
+
+image random_crop_image(image im, int low, int high, int size)
+{
+ int r = rand_int(low, high);
+ image resized = resize_min(im, r);
+ int dx = rand_int(0, resized.w - size);
+ int dy = rand_int(0, resized.h - size);
+ image crop = crop_image(resized, dx, dy, size, size);
+
+ if(resized.data != im.data) free_image(resized);
+ return crop;
}
float three_way_max(float a, float b, float c)
@@ -465,7 +691,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){
@@ -474,11 +700,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);
@@ -508,6 +742,17 @@
}
}
+image binarize_image(image im)
+{
+ image c = copy_image(im);
+ int i;
+ for(i = 0; i < im.w * im.h * im.c; ++i){
+ if(c.data[i] > .5) c.data[i] = 1;
+ else c.data[i] = 0;
+ }
+ return c;
+}
+
void saturate_image(image im, float sat)
{
rgb_to_hsv(im);
@@ -576,7 +821,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;
@@ -597,7 +842,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);
@@ -609,9 +854,13 @@
return resized;
}
+#include "cuda.h"
+
void test_resize(char *filename)
{
image im = load_image(filename, 0,0, 3);
+ float mag = mag_array(im.data, im.w*im.h*im.c);
+ printf("L2 Norm: %f\n", mag);
image gray = grayscale_image(im);
image sat2 = copy_image(im);
@@ -626,15 +875,37 @@
image exp5 = copy_image(im);
exposure_image(exp5, .5);
- show_image(im, "Original");
+ image bin = binarize_image(im);
+
+#ifdef GPU
+ image r = resize_image(im, im.w, im.h);
+ image black = make_image(im.w*2 + 3, im.h*2 + 3, 9);
+ image black2 = make_image(im.w, im.h, 3);
+
+ float *r_gpu = cuda_make_array(r.data, r.w*r.h*r.c);
+ float *black_gpu = cuda_make_array(black.data, black.w*black.h*black.c);
+ float *black2_gpu = cuda_make_array(black2.data, black2.w*black2.h*black2.c);
+ shortcut_gpu(3, r.w, r.h, 1, r_gpu, black.w, black.h, 3, black_gpu);
+ //flip_image(r);
+ //shortcut_gpu(3, r.w, r.h, 1, r.data, black.w, black.h, 3, black.data);
+
+ shortcut_gpu(3, black.w, black.h, 3, black_gpu, black2.w, black2.h, 1, black2_gpu);
+ cuda_pull_array(black_gpu, black.data, black.w*black.h*black.c);
+ cuda_pull_array(black2_gpu, black2.data, black2.w*black2.h*black2.c);
+ show_image_layers(black, "Black");
+ show_image(black2, "Recreate");
+#endif
+
+ show_image(im, "Original");
+ show_image(bin, "Binary");
show_image(gray, "Gray");
show_image(sat2, "Saturation-2");
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
@@ -668,11 +939,15 @@
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);
- exit(0);
+ fprintf(stderr, "Cannot load image \"%s\"\n", filename);
+ char buff[256];
+ sprintf(buff, "echo %s >> bad.list", filename);
+ system(buff);
+ return make_image(10,10,3);
+ //exit(0);
}
image out = ipl_to_image(src);
cvReleaseImage(&src);
@@ -688,7 +963,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;
@@ -709,11 +984,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);
@@ -847,16 +1122,28 @@
return filters;
}
+void show_image_normalized(image im, const char *name)
+{
+ image c = copy_image(im);
+ normalize_image(c);
+ show_image(c, name);
+ free_image(c);
+}
+
void show_images(image *ims, int n, char *window)
{
image m = collapse_images_vert(ims, n);
- 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);
+ /*
+ 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);
--
Gitblit v1.10.0