From d0b9326a352ed2fbc3ae66fdef40b4533a2f211d Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 11 Aug 2015 06:22:27 +0000
Subject: [PATCH] Hacks to get nightmare to not break gridsizing
---
src/image.c | 339 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 225 insertions(+), 114 deletions(-)
diff --git a/src/image.c b/src/image.c
index bf6ce6a..92c9066 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3,6 +3,11 @@
#include <stdio.h>
#include <math.h>
+#define STB_IMAGE_IMPLEMENTATION
+#include "stb_image.h"
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "stb_image_write.h"
+
int windows = 0;
float colors[6][3] = { {1,0,1}, {0,0,1},{0,1,1},{0,1,0},{1,1,0},{1,0,0} };
@@ -54,6 +59,14 @@
}
}
+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 flip_image(image a)
{
int i,j,k;
@@ -159,10 +172,23 @@
return copy;
}
-void show_image(image p, char *name)
+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;
+ }
+}
+
+#ifdef OPENCV
+void show_image_cv(image p, char *name)
{
int x,y,k;
image copy = copy_image(p);
+ constrain_image(copy);
+ if(p.c == 3) rgbgr_image(copy);
//normalize_image(copy);
char buff[256];
@@ -182,8 +208,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;
@@ -191,14 +218,43 @@
}
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, 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]);
+ }
+ }
+ 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);
@@ -221,6 +277,7 @@
cvSaveImage(buff, disp,0);
cvReleaseImage(&disp);
}
+*/
void show_image_layers(image p, char *name)
{
@@ -276,7 +333,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);
}
}
@@ -296,26 +353,6 @@
for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] *= s;
}
-image ipl_to_image(IplImage* src)
-{
- unsigned char *data = (unsigned char *)src->imageData;
- int h = src->height;
- int w = src->width;
- int c = src->nChannels;
- int step = src->widthStep;
- image out = make_image(w, h, c);
- int i, j, k, count=0;;
-
- 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]/255.;
- }
- }
- }
- return out;
-}
-
image crop_image(image im, int dx, int dy, int w, int h)
{
image cropped = make_image(w, h, im.c);
@@ -355,9 +392,9 @@
float h, s, v;
for(j = 0; j < im.h; ++j){
for(i = 0; i < im.w; ++i){
- r = get_pixel(im, i , j, 2);
+ r = get_pixel(im, i , j, 0);
g = get_pixel(im, i , j, 1);
- b = get_pixel(im, i , j, 0);
+ 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;
@@ -417,9 +454,9 @@
r = v; g = p; b = q;
}
}
- set_pixel(im, i, j, 2, r);
+ set_pixel(im, i, j, 0, r);
set_pixel(im, i, j, 1, g);
- set_pixel(im, i, j, 0, b);
+ set_pixel(im, i, j, 2, b);
}
}
}
@@ -429,7 +466,7 @@
assert(im.c == 3);
int i, j, k;
image gray = make_image(im.w, im.h, im.c);
- float scale[] = {0.114, 0.587, 0.299};
+ 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){
@@ -497,23 +534,23 @@
}
/*
-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 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;
-}
-*/
+ image brightness_image(image im, float b)
+ {
+ image bright = make_image(im.w, im.h, im.c);
+ return bright;
+ }
+ */
-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);
@@ -528,106 +565,167 @@
return val;
}
-// #wikipedia
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 < h; ++r){
+ for(r = 0; r < im.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);
+ float val = 0;
+ if(c == 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) 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);
- 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);
- image rot = rotate_image(big, .02);
- image rot2 = rotate_image(big, 3.14159265/2.);
- image test = rotate_image(im, .6);
+ image im = load_image(filename, 0,0, 3);
image gray = grayscale_image(im);
image sat2 = copy_image(im);
saturate_image(sat2, 2);
- exposure_image(sat2, 2);
image sat5 = copy_image(im);
- saturate_image(sat5, 2);
- exposure_image(sat5, .5);
+ saturate_image(sat5, .5);
image exp2 = copy_image(im);
- saturate_image(exp2, .5);
exposure_image(exp2, 2);
image exp5 = copy_image(im);
- saturate_image(exp5, .5);
exposure_image(exp5, .5);
- show_image(im, "original");
- show_image(gray, "gray");
- show_image(sat2, "sat2");
- show_image(sat5, "sat5");
- show_image(exp2, "exp2");
- show_image(exp5, "exp5");
- /*
- show_image(small, "smaller");
- show_image(big, "bigger");
- show_image(crop, "crop");
- show_image(crop2, "crop2");
- show_image(rot, "rot");
- show_image(rot2, "rot2");
- show_image(test, "test");
- */
+ 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;
+ int h = src->height;
+ int w = src->width;
+ int c = src->nChannels;
+ int step = src->widthStep;
+ image out = make_image(w, h, c);
+ int i, j, k, count=0;;
+
+ 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]/255.;
+ }
+ }
+ }
+ return out;
+}
+
+image load_image_cv(char *filename, int channels)
+{
+ 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 file 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 file 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 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.;
+ }
+ }
+ }
+ free(data);
+ return im;
+}
+
+image load_image(char *filename, int w, int h, int c)
+{
+ #ifdef OPENCV
+ image out = load_image_cv(filename, c);
+ #else
+ image out = load_image_stb(filename, c);
+ #endif
+
+ if((h && w) && (h != out.h || w != out.w)){
+ image resized = resize_image(out, w, h);
+ free_image(out);
+ out = resized;
+ }
+ 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)
@@ -655,6 +753,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)
{
@@ -747,8 +850,16 @@
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);
+ save_image(sized, window);
+ show_image(sized, window);
+ free_image(sized);
free_image(m);
}
--
Gitblit v1.10.0