From 064d4462d3890fd5dda5c7845119e1a3854d477b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 26 Nov 2015 21:45:12 +0000
Subject: [PATCH] stuff
---
src/image.c | 663 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 542 insertions(+), 121 deletions(-)
diff --git a/src/image.c b/src/image.c
index 32a51cc..a8a6684 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,6 +1,17 @@
#include "image.h"
#include "utils.h"
#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
+#include "stb_image_write.h"
int windows = 0;
@@ -17,9 +28,29 @@
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);
+ //normalize_image(a);
int i;
if(x1 < 0) x1 = 0;
if(x1 >= a.w) x1 = a.w-1;
@@ -31,28 +62,86 @@
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;
}
}
+void draw_box_width(image a, int x1, int y1, int x2, int y2, int w, float r, float g, float b)
+{
+ int i;
+ for(i = 0; i < w; ++i){
+ draw_box(a, x1+i, y1+i, x2-i, y2-i, r, g, b);
+ }
+}
+
+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;
+ 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 flip_image(image a)
{
int i,j,k;
@@ -112,6 +201,15 @@
return dest;
}
+void constrain_image(image im)
+{
+ int i;
+ for(i = 0; i < im.w*im.h*im.c; ++i){
+ if(im.data[i] < 0) im.data[i] = 0;
+ if(im.data[i] > 1) im.data[i] = 1;
+ }
+}
+
void normalize_image(image p)
{
float *min = calloc(p.c, sizeof(float));
@@ -149,12 +247,24 @@
return copy;
}
+void rgbgr_image(image im)
+{
+ int i;
+ for(i = 0; i < im.w*im.h; ++i){
+ float swap = im.data[i];
+ im.data[i] = im.data[i+im.w*im.h*2];
+ im.data[i+im.w*im.h*2] = swap;
+ }
+}
-void show_image(image p, char *name)
+#ifdef OPENCV
+void show_image_cv(image p, const char *name)
{
int x,y,k;
image copy = copy_image(p);
- normalize_image(copy);
+ constrain_image(copy);
+ if(p.c == 3) rgbgr_image(copy);
+ //normalize_image(copy);
char buff[256];
//sprintf(buff, "%s (%d)", name, windows);
@@ -162,7 +272,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){
@@ -173,8 +283,9 @@
}
}
free_image(copy);
- if(disp->height < 500 || disp->width < 500 || disp->height > 1000){
- int w = 500;
+ if(0){
+ //if(disp->height < 448 || disp->width < 448 || disp->height > 1000){
+ int w = 448;
int h = w*p.h/p.w;
if(h > 1000){
h = 1000;
@@ -182,22 +293,50 @@
}
IplImage *buffer = disp;
disp = cvCreateImage(cvSize(w, h), buffer->depth, buffer->nChannels);
- cvResize(buffer, disp, CV_INTER_NN);
+ cvResize(buffer, disp, CV_INTER_LINEAR);
cvReleaseImage(&buffer);
}
cvShowImage(buff, disp);
cvReleaseImage(&disp);
}
+#endif
-void save_image(image p, char *name)
+void show_image(image p, const char *name)
{
- int x,y,k;
- image copy = copy_image(p);
- normalize_image(copy);
+#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, 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);
+}
+
+#ifdef OPENCV
+void save_image_jpg(image p, char *name)
+{
+ image copy = copy_image(p);
+ rgbgr_image(copy);
+ int x,y,k;
+
+ char buff[256];
+ sprintf(buff, "%s.jpg", name);
IplImage *disp = cvCreateImage(cvSize(p.w,p.h), IPL_DEPTH_8U, p.c);
int step = disp->widthStep;
@@ -208,10 +347,11 @@
}
}
}
- free_image(copy);
cvSaveImage(buff, disp,0);
cvReleaseImage(&disp);
+ free_image(copy);
}
+#endif
void show_image_layers(image p, char *name)
{
@@ -256,16 +396,23 @@
return out;
}
-void rotate_image(image m)
+image rotate_image(image im, float rad)
{
- int i,j;
- for(j = 0; j < m.c; ++j){
- for(i = 0; i < m.h*m.w/2; ++i){
- float swap = m.data[j*m.h*m.w + i];
- m.data[j*m.h*m.w + i] = m.data[j*m.h*m.w + (m.h*m.w-1 - i)];
- m.data[j*m.h*m.w + (m.h*m.w-1 - i)] = swap;
+ 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)
@@ -280,6 +427,299 @@
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);
+ }
+ set_pixel(cropped, i, j, k, val);
+ }
+ }
+ }
+ return cropped;
+}
+
+float three_way_max(float a, float b, float c)
+{
+ return (a > b) ? ( (a > c) ? a : c) : ( (b > c) ? b : c) ;
+}
+
+float three_way_min(float a, float b, float c)
+{
+ return (a < b) ? ( (a < c) ? a : c) : ( (b < c) ? b : c) ;
+}
+
+// http://www.cs.rit.edu/~ncs/color/t_convert.html
+void rgb_to_hsv(image im)
+{
+ assert(im.c == 3);
+ int i, j;
+ float r, g, b;
+ float h, s, v;
+ for(j = 0; j < im.h; ++j){
+ for(i = 0; i < im.w; ++i){
+ r = get_pixel(im, i , j, 0);
+ g = get_pixel(im, i , j, 1);
+ b = get_pixel(im, i , j, 2);
+ float max = three_way_max(r,g,b);
+ float min = three_way_min(r,g,b);
+ float delta = max - min;
+ v = max;
+ if(max == 0){
+ s = 0;
+ h = -1;
+ }else{
+ s = delta/max;
+ if(r == max){
+ h = (g - b) / delta;
+ } else if (g == max) {
+ h = 2 + (b - r) / delta;
+ } else {
+ h = 4 + (r - g) / delta;
+ }
+ if (h < 0) h += 6;
+ }
+ set_pixel(im, i, j, 0, h);
+ set_pixel(im, i, j, 1, s);
+ set_pixel(im, i, j, 2, v);
+ }
+ }
+}
+
+void hsv_to_rgb(image im)
+{
+ assert(im.c == 3);
+ int i, j;
+ float r, g, b;
+ float h, s, v;
+ float f, p, q, t;
+ for(j = 0; j < im.h; ++j){
+ for(i = 0; i < im.w; ++i){
+ h = get_pixel(im, i , j, 0);
+ s = get_pixel(im, i , j, 1);
+ v = get_pixel(im, i , j, 2);
+ if (s == 0) {
+ r = g = b = v;
+ } else {
+ int index = floor(h);
+ f = h - index;
+ p = v*(1-s);
+ q = v*(1-s*f);
+ t = v*(1-s*(1-f));
+ if(index == 0){
+ r = v; g = t; b = p;
+ } else if(index == 1){
+ r = q; g = v; b = p;
+ } else if(index == 2){
+ r = p; g = v; b = t;
+ } else if(index == 3){
+ r = p; g = q; b = v;
+ } else if(index == 4){
+ r = t; g = p; b = v;
+ } else {
+ r = v; g = p; b = q;
+ }
+ }
+ set_pixel(im, i, j, 0, r);
+ set_pixel(im, i, j, 1, g);
+ set_pixel(im, i, j, 2, b);
+ }
+ }
+}
+
+image grayscale_image(image im)
+{
+ assert(im.c == 3);
+ int i, j, k;
+ 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){
+ for(i = 0; i < im.w; ++i){
+ gray.data[i+im.w*j] += scale[k]*get_pixel(im, i, j, k);
+ }
+ }
+ }
+ 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);
+ image blend = make_image(fore.w, fore.h, fore.c);
+ int i, j, k;
+ for(k = 0; k < fore.c; ++k){
+ for(j = 0; j < fore.h; ++j){
+ for(i = 0; i < fore.w; ++i){
+ float val = alpha * get_pixel(fore, i, j, k) +
+ (1 - alpha)* get_pixel(back, i, j, k);
+ set_pixel(blend, i, j, k, val);
+ }
+ }
+ }
+ return blend;
+}
+
+void scale_image_channel(image im, int c, float v)
+{
+ int i, j;
+ for(j = 0; j < im.h; ++j){
+ for(i = 0; i < im.w; ++i){
+ float pix = get_pixel(im, i, j, c);
+ pix = pix*v;
+ set_pixel(im, i, j, c, pix);
+ }
+ }
+}
+
+void saturate_image(image im, float sat)
+{
+ rgb_to_hsv(im);
+ scale_image_channel(im, 1, sat);
+ hsv_to_rgb(im);
+ constrain_image(im);
+}
+
+void exposure_image(image im, float sat)
+{
+ rgb_to_hsv(im);
+ scale_image_channel(im, 2, sat);
+ hsv_to_rgb(im);
+ constrain_image(im);
+}
+
+void saturate_exposure_image(image im, float sat, float exposure)
+{
+ rgb_to_hsv(im);
+ scale_image_channel(im, 1, sat);
+ scale_image_channel(im, 2, exposure);
+ hsv_to_rgb(im);
+ constrain_image(im);
+}
+
+/*
+ image saturate_image(image im, float sat)
+ {
+ image gray = grayscale_image(im);
+ image blend = blend_image(im, gray, sat);
+ free_image(gray);
+ constrain_image(blend);
+ return blend;
+ }
+
+ image brightness_image(image im, float b)
+ {
+ image bright = make_image(im.w, im.h, im.c);
+ return bright;
+ }
+ */
+
+float bilinear_interpolate(image im, float x, float y, int c)
+{
+ int ix = (int) floorf(x);
+ int iy = (int) floorf(y);
+
+ float dx = x - ix;
+ float dy = y - iy;
+
+ float val = (1-dy) * (1-dx) * get_pixel_extend(im, ix, iy, c) +
+ dy * (1-dx) * get_pixel_extend(im, ix, iy+1, c) +
+ (1-dy) * dx * get_pixel_extend(im, ix+1, iy, c) +
+ dy * dx * get_pixel_extend(im, ix+1, iy+1, c);
+ return val;
+}
+
+image resize_image(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);
+ float h_scale = (float)(im.h - 1) / (h - 1);
+ for(k = 0; k < im.c; ++k){
+ for(r = 0; r < im.h; ++r){
+ for(c = 0; c < w; ++c){
+ float val = 0;
+ if(c == w-1 || im.w == 1){
+ val = get_pixel(im, im.w-1, r, k);
+ } else {
+ float sx = c*w_scale;
+ int ix = (int) sx;
+ float dx = sx - ix;
+ val = (1 - dx) * get_pixel(im, ix, r, k) + dx * get_pixel(im, ix+1, r, k);
+ }
+ set_pixel(part, c, r, k, val);
+ }
+ }
+ }
+ for(k = 0; k < im.c; ++k){
+ for(r = 0; r < h; ++r){
+ float sy = r*h_scale;
+ int iy = (int) sy;
+ float dy = sy - iy;
+ for(c = 0; c < w; ++c){
+ float val = (1-dy) * get_pixel(part, c, iy, k);
+ set_pixel(resized, c, r, k, val);
+ }
+ 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);
+ }
+ }
+ }
+
+ free_image(part);
+ return resized;
+}
+
+void test_resize(char *filename)
+{
+ image im = load_image(filename, 0,0, 3);
+ image gray = grayscale_image(im);
+
+ image sat2 = copy_image(im);
+ saturate_image(sat2, 2);
+
+ image sat5 = copy_image(im);
+ saturate_image(sat5, .5);
+
+ image exp2 = copy_image(im);
+ exposure_image(exp2, 2);
+
+ image exp5 = copy_image(im);
+ exposure_image(exp5, .5);
+
+ show_image(im, "Original");
+ 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
+ cvWaitKey(0);
+#endif
+}
+
+#ifdef OPENCV
image ipl_to_image(IplImage* src)
{
unsigned char *data = (unsigned char *)src->imageData;
@@ -293,117 +733,81 @@
for(k= 0; k < c; ++k){
for(i = 0; i < h; ++i){
for(j = 0; j < w; ++j){
- out.data[count++] = data[i*step + j*c + k];
+ out.data[count++] = data[i*step + j*c + k]/255.;
}
}
}
return out;
}
-image crop_image(image im, int dx, int dy, int w, int h)
+image load_image_cv(char *filename, int channels)
{
- image cropped = make_image(w, h, im.c);
- int i, j, k;
- for(k = 0; k < im.c; ++k){
+ IplImage* src = 0;
+ int flag = -1;
+ if (channels == 0) flag = -1;
+ else if (channels == 1) flag = 0;
+ else if (channels == 3) flag = 1;
+ else {
+ fprintf(stderr, "OpenCV can't force load with %d channels\n", channels);
+ }
+
+ if( (src = cvLoadImage(filename, flag)) == 0 )
+ {
+ printf("Cannot load image \"%s\"\n", filename);
+ exit(0);
+ }
+ image out = ipl_to_image(src);
+ cvReleaseImage(&src);
+ rgbgr_image(out);
+ return out;
+}
+
+#endif
+
+
+image load_image_stb(char *filename, int channels)
+{
+ int w, h, c;
+ unsigned char *data = stbi_load(filename, &w, &h, &c, channels);
+ if (!data) {
+ fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", filename, stbi_failure_reason());
+ exit(0);
+ }
+ if(channels) c = channels;
+ int i,j,k;
+ image im = make_image(w, h, c);
+ for(k = 0; k < c; ++k){
for(j = 0; j < h; ++j){
for(i = 0; i < w; ++i){
- int r = j + dy;
- int c = i + dx;
- float val = 128;
- 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);
+ int dst_index = i + w*j + w*h*k;
+ int src_index = k + c*i + c*w*j;
+ im.data[dst_index] = (float)data[src_index]/255.;
}
}
}
- return cropped;
+ free(data);
+ return im;
}
-float billinear_interpolate(image im, float x, float y, int c)
+image load_image(char *filename, int w, int h, int c)
{
- int ix = (int) x;
- int iy = (int) y;
+#ifdef OPENCV
+ image out = load_image_cv(filename, c);
+#else
+ image out = load_image_stb(filename, c);
+#endif
- float dx = x - ix;
- float dy = y - iy;
-
- float val = (1-dy) * (1-dx) * get_pixel_extend(im, ix, iy, c) +
- dy * (1-dx) * get_pixel_extend(im, ix, iy+1, c) +
- (1-dy) * dx * get_pixel_extend(im, ix+1, iy, c) +
- dy * dx * get_pixel_extend(im, ix+1, iy+1, c);
- 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);
- }
- }
+ if((h && w) && (h != out.h || w != out.w)){
+ image resized = resize_image(out, w, h);
+ free_image(out);
+ out = resized;
}
- return resized;
-}
-
-void test_resize(char *filename)
-{
- image im = load_image(filename, 0,0);
- image small = resize_image(im, 65, 63);
- image big = resize_image(im, 513, 512);
- image crop = crop_image(im, 50, 10, 100, 100);
- image crop2 = crop_image(im, -30, -50, 291, 400);
- show_image(im, "original");
- show_image(small, "smaller");
- show_image(big, "bigger");
- show_image(crop, "crop");
- show_image(crop2, "crop2");
- cvWaitKey(0);
+ return out;
}
image load_image_color(char *filename, int w, int h)
{
- IplImage* src = 0;
- if( (src = cvLoadImage(filename, 1)) == 0 )
- {
- printf("Cannot load file image %s\n", filename);
- exit(0);
- }
- image out = ipl_to_image(src);
- if((h && w) && (h != out.h || w != out.w)){
- image resized = resize_image(out, w, h);
- free_image(out);
- out = resized;
- }
- cvReleaseImage(&src);
- return out;
-}
-
-image load_image(char *filename, int w, int h)
-{
- IplImage* src = 0;
- if( (src = cvLoadImage(filename,-1)) == 0 )
- {
- printf("Cannot load file image %s\n", filename);
- exit(0);
- }
- image out = ipl_to_image(src);
- if((h && w) && (h != out.h || w != out.w)){
- image resized = resize_image(out, w, h);
- free_image(out);
- out = resized;
- }
- cvReleaseImage(&src);
- return out;
+ return load_image(filename, w, h, 3);
}
image get_image_layer(image m, int l)
@@ -431,6 +835,11 @@
assert(x < m.w && y < m.h && c < m.c);
m.data[c*m.h*m.w + y*m.w + x] = val;
}
+void add_pixel(image m, int x, int y, int c, float val)
+{
+ assert(x < m.w && y < m.h && c < m.c);
+ m.data[c*m.h*m.w + y*m.w + x] += val;
+}
void print_image(image m)
{
@@ -523,8 +932,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