From b0106d7bde5240b800425874d30beb0aec262b84 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 13 Apr 2015 21:09:55 +0000
Subject: [PATCH] probably stuff changed
---
src/image.c | 106 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 88 insertions(+), 18 deletions(-)
diff --git a/src/image.c b/src/image.c
index 32a51cc..d3fb61e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,6 +1,7 @@
#include "image.h"
#include "utils.h"
#include <stdio.h>
+#include <math.h>
int windows = 0;
@@ -149,7 +150,6 @@
return copy;
}
-
void show_image(image p, char *name)
{
int x,y,k;
@@ -256,16 +256,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 = billinear_interpolate(im, rx, ry, c);
+ set_pixel(rot, x, y, c, val);
+ }
}
}
+ return rot;
}
void translate_image(image m, float s)
@@ -309,7 +316,7 @@
for(i = 0; i < w; ++i){
int r = j + dy;
int c = i + dx;
- float val = 128;
+ float val = 0;
if (r >= 0 && r < im.h && c >= 0 && c < im.w) {
val = get_pixel(im, c, r, k);
}
@@ -320,18 +327,66 @@
return cropped;
}
+image grayscale_image(image im)
+{
+ 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};
+ 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);
+ }
+ }
+ }
+ 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 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;
+}
+
+image saturate_image(image im, float sat)
+{
+ image gray = grayscale_image(im);
+ image blend = blend_image(im, gray, sat);
+ free_image(gray);
+ return blend;
+}
+
+image brightness_image(image im, float b)
+{
+ image bright = make_image(im.w, im.h, im.c);
+}
+
float billinear_interpolate(image im, float x, float y, int c)
{
- int ix = (int) x;
- int iy = (int) y;
+ 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);
+ 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;
}
@@ -358,15 +413,30 @@
void test_resize(char *filename)
{
image im = load_image(filename, 0,0);
+ translate_image(im, -128);
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 gray = grayscale_image(im);
+ image sat = saturate_image(im, 2);
+ image sat2 = saturate_image(im, .5);
show_image(im, "original");
- show_image(small, "smaller");
- show_image(big, "bigger");
- show_image(crop, "crop");
- show_image(crop2, "crop2");
+ show_image(gray, "gray");
+ show_image(sat, "sat");
+ show_image(sat2, "sat2");
+ /*
+ 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");
+ */
cvWaitKey(0);
}
--
Gitblit v1.10.0