From 8ed0a5538e04002c95ff0757791c52b4ec9a3e96 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 21 Jul 2015 18:38:36 +0000
Subject: [PATCH] faster resize?
---
src/image.c | 91 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 22 deletions(-)
diff --git a/src/image.c b/src/image.c
index f5c2359..c499c79 100644
--- a/src/image.c
+++ b/src/image.c
@@ -59,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;
@@ -179,6 +187,7 @@
{
int x,y,k;
image copy = copy_image(p);
+ constrain_image(copy);
rgbgr_image(copy);
//normalize_image(copy);
@@ -199,7 +208,8 @@
}
}
free_image(copy);
- if(disp->height < 448 || disp->width < 448 || disp->height > 1000){
+ 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){
@@ -574,6 +584,51 @@
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);
+ 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){
+ 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, 3);
@@ -583,33 +638,20 @@
saturate_image(sat2, 2);
image sat5 = copy_image(im);
- saturate_image(sat5, 5);
-
- image sat10 = copy_image(im);
- saturate_image(sat10, 10);
+ 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(sat10, "sat10");
- /*
- 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
@@ -666,7 +708,7 @@
int w, h, c;
unsigned char *data = stbi_load(filename, &w, &h, &c, channels);
if (!data) {
- printf("Cannot load file image %s\n", filename);
+ fprintf(stderr, "Cannot load file image %s\nSTB Reason: %s\n", filename, stbi_failure_reason());
exit(0);
}
if(channels) c = channels;
@@ -731,6 +773,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)
{
--
Gitblit v1.10.0