From cbc9984a17b3452da4fee397aac912f1e9f7a4c3 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 10 Jun 2015 07:11:41 +0000
Subject: [PATCH] NIPS
---
src/image.c | 242 ++++++++++++++++++++++++++++++++----------------
1 files changed, 162 insertions(+), 80 deletions(-)
diff --git a/src/image.c b/src/image.c
index 948d325..4591103 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} };
@@ -159,10 +164,22 @@
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);
+ rgbgr_image(copy);
//normalize_image(copy);
char buff[256];
@@ -197,8 +214,36 @@
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);
+ 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 +266,7 @@
cvSaveImage(buff, disp,0);
cvReleaseImage(&disp);
}
+*/
void show_image_layers(image p, char *name)
{
@@ -296,26 +342,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 +381,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 +443,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 +455,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,21 +523,21 @@
}
/*
-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)
{
@@ -550,7 +576,7 @@
void test_resize(char *filename)
{
- image im = load_image(filename, 0,0);
+ image im = load_image(filename, 0,0, 3);
image small = resize_image(im, 65, 63);
image big = resize_image(im, 513, 512);
image crop = crop_image(im, 50, 10, 100, 100);
@@ -562,11 +588,12 @@
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 sat10 = copy_image(im);
+ saturate_image(sat10, 10);
image exp2 = copy_image(im);
saturate_image(exp2, .5);
@@ -580,8 +607,7 @@
show_image(gray, "gray");
show_image(sat2, "sat2");
show_image(sat5, "sat5");
- show_image(exp2, "exp2");
- show_image(exp5, "exp5");
+ show_image(sat10, "sat10");
/*
show_image(small, "smaller");
show_image(big, "bigger");
@@ -591,44 +617,100 @@
show_image(rot2, "rot2");
show_image(test, "test");
*/
+ #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) {
+ printf("Cannot load file image %s\n", filename);
+ 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);
- cvReleaseImage(&src);
- if((h && w) && (h != out.h || w != out.w)){
- //printf("resize\n");
- image resized = resize_image(out, w, h);
- free_image(out);
- out = resized;
- }
- 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)
--
Gitblit v1.10.0