From 62235e9aa3d0c15d87d49bf340625d075cba3e65 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 19 Nov 2016 05:51:36 +0000
Subject: [PATCH] cpu batch norm works

---
 src/image.c | 1701 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 985 insertions(+), 716 deletions(-)

diff --git a/src/image.c b/src/image.c
index aff5f64..5a90efd 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,6 +1,7 @@
 #include "image.h"
 #include "utils.h"
 #include "blas.h"
+#include "cuda.h"
 #include <stdio.h>
 #include <math.h>
 
@@ -9,6 +10,12 @@
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb_image_write.h"
 
+#ifdef OPENCV
+#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/imgproc/imgproc_c.h"
+#endif
+
+
 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} };
@@ -24,24 +31,77 @@
     return r;
 }
 
+void composite_image(image source, image dest, int dx, int dy)
+{
+    int x,y,k;
+    for(k = 0; k < source.c; ++k){
+        for(y = 0; y < source.h; ++y){
+            for(x = 0; x < source.w; ++x){
+                float val = get_pixel(source, x, y, k);
+                float val2 = get_pixel_extend(dest, dx+x, dy+y, k);
+                set_pixel(dest, dx+x, dy+y, k, val * val2);
+            }
+        }
+    }
+}
+
+image border_image(image a, int border)
+{
+    image b = make_image(a.w + 2*border, a.h + 2*border, a.c);
+    int x,y,k;
+    for(k = 0; k < b.c; ++k){
+        for(y = 0; y < b.h; ++y){
+            for(x = 0; x < b.w; ++x){
+                float val = get_pixel_extend(a, x - border, y - border, k);
+                if(x - border < 0 || x - border >= a.w || y - border < 0 || y - border >= a.h) val = 1;
+                set_pixel(b, x, y, k, val);
+            }
+        }
+    }
+    return b;
+}
+
+image tile_images(image a, image b, int dx)
+{
+    if(a.w == 0) return copy_image(b);
+    image c = make_image(a.w + b.w + dx, (a.h > b.h) ? a.h : b.h, (a.c > b.c) ? a.c : b.c);
+    fill_cpu(c.w*c.h*c.c, 1, c.data, 1);
+    embed_image(a, c, 0, 0); 
+    composite_image(b, c, a.w + dx, 0);
+    return c;
+}
+
+image get_label(image **characters, char *string, int size)
+{
+    if(size > 7) size = 7;
+    image label = make_empty_image(0,0,0);
+    while(*string){
+        image l = characters[size][(int)*string];
+        image n = tile_images(label, l, -size - 1 + (size+1)/2);
+        free_image(label);
+        label = n;
+        ++string;
+    }
+    image b = border_image(label, label.h*.25);
+    free_image(label);
+    return b;
+}
+
 void draw_label(image a, int r, int c, image label, const float *rgb)
 {
-    float ratio = (float) label.w / label.h;
+    int w = label.w;
     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);
+                float val = get_pixel(label, 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)
@@ -101,7 +161,23 @@
     }
 }
 
-void draw_detections(image im, int num, float thresh, box *boxes, float **probs, char **names, image *labels, int classes)
+image **load_alphabet()
+{
+    int i, j;
+    const int nsize = 8;
+    image **alphabets = calloc(nsize, sizeof(image));
+    for(j = 0; j < nsize; ++j){
+        alphabets[j] = calloc(128, sizeof(image));
+        for(i = 32; i < 127; ++i){
+            char buff[256];
+            sprintf(buff, "data/labels/%d_%d.png", i, j);
+            alphabets[j][i] = load_image_color(buff, 0, 0);
+        }
+    }
+    return alphabets;
+}
+
+void draw_detections(image im, int num, float thresh, box *boxes, float **probs, char **names, image **alphabet, int classes)
 {
     int i;
 
@@ -109,14 +185,23 @@
         int class = max_index(probs[i], classes);
         float prob = probs[i][class];
         if(prob > thresh){
-            int width = pow(prob, 1./2.)*10+1;
-            width = 8;
-            printf("%s: %.2f\n", names[class], prob);
-            int offset = class*17 % classes;
-            float red = get_color(0,offset,classes);
+
+            int width = im.h * .012;
+
+            if(0){
+                width = pow(prob, 1./2.)*10+1;
+                alphabet = 0;
+            }
+
+            printf("%s: %.0f%%\n", names[class], prob*100);
+            int offset = class*123457 % classes;
+            float red = get_color(2,offset,classes);
             float green = get_color(1,offset,classes);
-            float blue = get_color(2,offset,classes);
+            float blue = get_color(0,offset,classes);
             float rgb[3];
+
+            //width = prob*20+2;
+
             rgb[0] = red;
             rgb[1] = green;
             rgb[2] = blue;
@@ -133,7 +218,10 @@
             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);
+            if (alphabet) {
+                image label = get_label(alphabet, names[class], (im.h*.03)/10);
+                draw_label(im, top + width, left, label, rgb);
+            }
         }
     }
 }
@@ -245,6 +333,26 @@
 
 void normalize_image(image p)
 {
+    int i;
+    float min = 9999999;
+    float max = -999999;
+
+    for(i = 0; i < p.h*p.w*p.c; ++i){
+        float v = p.data[i];
+        if(v < min) min = v;
+        if(v > max) max = v;
+    }
+    if(max - min < .000000001){
+        min = 0;
+        max = 1;
+    }
+    for(i = 0; i < p.c*p.w*p.h; ++i){
+        p.data[i] = (p.data[i] - min)/(max-min);
+    }
+}
+
+void normalize_image2(image p)
+{
     float *min = calloc(p.c, sizeof(float));
     float *max = calloc(p.c, sizeof(float));
     int i,j;
@@ -317,7 +425,6 @@
     }
     free_image(copy);
     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){
@@ -331,756 +438,918 @@
     }
     cvShowImage(buff, disp);
     cvReleaseImage(&disp);
-    }
+}
 #endif
 
-    void show_image(image p, const char *name)
-    {
+void show_image(image p, const char *name)
+{
 #ifdef OPENCV
-        show_image_cv(p, name);
+    show_image_cv(p, name);
 #else
-        fprintf(stderr, "Not compiled with OpenCV, saving to %s.png instead\n", name);
-        save_image(p, name);
+    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]);
+#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.;
             }
         }
-        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);
+    }
+    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);
     }
 
-#ifdef OPENCV
-    image get_image_from_stream(CvCapture *cap)
+    if( (src = cvLoadImage(filename, flag)) == 0 )
     {
-        IplImage* src = cvQueryFrame(cap);
-        image im = ipl_to_image(src);
-        rgbgr_image(im);
-        return im;
+        fprintf(stderr, "Cannot load image \"%s\"\n", filename);
+        char buff[256];
+        sprintf(buff, "echo %s >> bad.list", filename);
+        system(buff);
+        return make_image(10,10,3);
+        //exit(0);
     }
+    image out = ipl_to_image(src);
+    cvReleaseImage(&src);
+    rgbgr_image(out);
+    return out;
+}
+
+image get_image_from_stream(CvCapture *cap)
+{
+    IplImage* src = cvQueryFrame(cap);
+    if (!src) return make_empty_image(0,0,0);
+    image im = ipl_to_image(src);
+    rgbgr_image(im);
+    return im;
+}
+
+void save_image_jpg(image p, const char *name)
+{
+    image copy = copy_image(p);
+    if(p.c == 3) 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;
+    for(y = 0; y < p.h; ++y){
+        for(x = 0; x < p.w; ++x){
+            for(k= 0; k < p.c; ++k){
+                disp->imageData[y*step + x*p.c + k] = (unsigned char)(get_pixel(copy,x,y,k)*255);
+            }
+        }
+    }
+    cvSaveImage(buff, disp,0);
+    cvReleaseImage(&disp);
+    free_image(copy);
+}
 #endif
 
+void save_image_png(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);
+}
+
+void save_image(image im, const char *name)
+{
 #ifdef OPENCV
-    void save_image_jpg(image p, char *name)
-    {
-        image copy = copy_image(p);
-        rgbgr_image(copy);
-        int x,y,k;
+    save_image_jpg(im, name);
+#else
+    save_image_png(im, name);
+#endif
+}
 
-        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;
-        for(y = 0; y < p.h; ++y){
-            for(x = 0; x < p.w; ++x){
-                for(k= 0; k < p.c; ++k){
-                    disp->imageData[y*step + x*p.c + k] = (unsigned char)(get_pixel(copy,x,y,k)*255);
+void show_image_layers(image p, char *name)
+{
+    int i;
+    char buff[256];
+    for(i = 0; i < p.c; ++i){
+        sprintf(buff, "%s - Layer %d", name, i);
+        image layer = get_image_layer(p, i);
+        show_image(layer, buff);
+        free_image(layer);
+    }
+}
+
+void show_image_collapsed(image p, char *name)
+{
+    image c = collapse_image_layers(p, 1);
+    show_image(c, name);
+    free_image(c);
+}
+
+image make_empty_image(int w, int h, int c)
+{
+    image out;
+    out.data = 0;
+    out.h = h;
+    out.w = w;
+    out.c = c;
+    return out;
+}
+
+image make_image(int w, int h, int c)
+{
+    image out = make_empty_image(w,h,c);
+    out.data = calloc(h*w*c, sizeof(float));
+    return out;
+}
+
+image make_random_image(int w, int h, int c)
+{
+    image out = make_empty_image(w,h,c);
+    out.data = calloc(h*w*c, sizeof(float));
+    int i;
+    for(i = 0; i < w*h*c; ++i){
+        out.data[i] = (rand_normal() * .25) + .5;
+    }
+    return out;
+}
+
+image float_to_image(int w, int h, int c, float *data)
+{
+    image out = make_empty_image(w,h,c);
+    out.data = data;
+    return out;
+}
+
+
+image rotate_crop_image(image im, float rad, float s, int w, int h, float dx, float dy, float aspect)
+{
+    int x, y, c;
+    float cx = im.w/2.;
+    float cy = im.h/2.;
+    image rot = make_image(w, h, im.c);
+    for(c = 0; c < im.c; ++c){
+        for(y = 0; y < h; ++y){
+            for(x = 0; x < w; ++x){
+                float rx = cos(rad)*((x - w/2.)/s*aspect + dx/s*aspect) - sin(rad)*((y - h/2.)/s + dy/s) + cx;
+                float ry = sin(rad)*((x - w/2.)/s*aspect + dx/s*aspect) + cos(rad)*((y - h/2.)/s + dy/s) + cy;
+                float val = bilinear_interpolate(im, rx, ry, c);
+                set_pixel(rot, x, y, c, val);
+            }
+        }
+    }
+    return rot;
+}
+
+image rotate_image(image im, float rad)
+{
+    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)
+{
+    int i;
+    for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] += s;
+}
+
+void scale_image(image m, float s)
+{
+    int i;
+    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;
+                r = constrain_int(r, 0, im.h-1);
+                c = constrain_int(c, 0, im.w-1);
+                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);
             }
         }
-        cvSaveImage(buff, disp,0);
-        cvReleaseImage(&disp);
-        free_image(copy);
     }
-#endif
+    return cropped;
+}
 
-    void show_image_layers(image p, char *name)
-    {
-        int i;
-        char buff[256];
-        for(i = 0; i < p.c; ++i){
-            sprintf(buff, "%s - Layer %d", name, i);
-            image layer = get_image_layer(p, i);
-            show_image(layer, buff);
-            free_image(layer);
+int best_3d_shift_r(image a, image b, int min, int max)
+{
+    if(min == max) return min;
+    int mid = floor((min + max) / 2.);
+    image c1 = crop_image(b, 0, mid, b.w, b.h);
+    image c2 = crop_image(b, 0, mid+1, b.w, b.h);
+    float d1 = dist_array(c1.data, a.data, a.w*a.h*a.c, 10);
+    float d2 = dist_array(c2.data, a.data, a.w*a.h*a.c, 10);
+    free_image(c1);
+    free_image(c2);
+    if(d1 < d2) return best_3d_shift_r(a, b, min, mid);
+    else return best_3d_shift_r(a, b, mid+1, max);
+}
+
+int best_3d_shift(image a, image b, int min, int max)
+{
+    int i;
+    int best = 0;
+    float best_distance = FLT_MAX;
+    for(i = min; i <= max; i += 2){
+        image c = crop_image(b, 0, i, b.w, b.h);
+        float d = dist_array(c.data, a.data, a.w*a.h*a.c, 100);
+        if(d < best_distance){
+            best_distance = d;
+            best = i;
         }
-    }
-
-    void show_image_collapsed(image p, char *name)
-    {
-        image c = collapse_image_layers(p, 1);
-        show_image(c, name);
+        printf("%d %f\n", i, d);
         free_image(c);
     }
+    return best;
+}
 
-    image make_empty_image(int w, int h, int c)
-    {
-        image out;
-        out.data = 0;
-        out.h = h;
-        out.w = w;
-        out.c = c;
-        return out;
+void composite_3d(char *f1, char *f2, char *out, int delta)
+{
+    if(!out) out = "out";
+    image a = load_image(f1, 0,0,0);
+    image b = load_image(f2, 0,0,0);
+    int shift = best_3d_shift_r(a, b, -a.h/100, a.h/100);
+
+    image c1 = crop_image(b, 10, shift, b.w, b.h);
+    float d1 = dist_array(c1.data, a.data, a.w*a.h*a.c, 100);
+    image c2 = crop_image(b, -10, shift, b.w, b.h);
+    float d2 = dist_array(c2.data, a.data, a.w*a.h*a.c, 100);
+
+    if(d2 < d1 && 0){
+        image swap = a;
+        a = b;
+        b = swap;
+        shift = -shift;
+        printf("swapped, %d\n", shift);
+    }
+    else{
+        printf("%d\n", shift);
     }
 
-    image make_image(int w, int h, int c)
-    {
-        image out = make_empty_image(w,h,c);
-        out.data = calloc(h*w*c, sizeof(float));
-        return out;
+    image c = crop_image(b, delta, shift, a.w, a.h);
+    int i;
+    for(i = 0; i < c.w*c.h; ++i){
+        c.data[i] = a.data[i];
     }
-
-    image make_random_image(int w, int h, int c)
-    {
-        image out = make_empty_image(w,h,c);
-        out.data = calloc(h*w*c, sizeof(float));
-        int i;
-        for(i = 0; i < w*h*c; ++i){
-            out.data[i] = (rand_normal() * .25) + .5;
-        }
-        return out;
-    }
-
-    image float_to_image(int w, int h, int c, float *data)
-    {
-        image out = make_empty_image(w,h,c);
-        out.data = data;
-        return out;
-    }
-
-    image rotate_image(image im, float rad)
-    {
-        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)
-    {
-        int i;
-        for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] += s;
-    }
-
-    void scale_image(image m, float s)
-    {
-        int i;
-        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;
-    }
-
-    image resize_min(image im, int min)
-    {
-        int w = im.w;
-        int h = im.h;
-        if(w < h){
-            h = (h * min) / w;
-            w = min;
-        } else {
-            w = (w * min) / h;
-            h = min;
-        }
-        if(w == im.w && h == im.h) return im;
-        image resized = resize_image(im, w, h);
-        return resized;
-    }
-
-    image random_crop_image(image im, int low, int high, int size)
-    {
-        int r = rand_int(low, high);
-        image resized = resize_min(im, r);
-        int dx = rand_int(0, resized.w - size);
-        int dy = rand_int(0, resized.h - size);
-        image crop = crop_image(resized, dx, dy, size, size);
-
-        if(resized.data != im.data) free_image(resized);
-        return crop;
-    }
-
-    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);
-            }
-        }
-    }
-
-    image binarize_image(image im)
-    {
-        image c = copy_image(im);
-        int i;
-        for(i = 0; i < im.w * im.h * im.c; ++i){
-            if(c.data[i] > .5) c.data[i] = 1;
-            else c.data[i] = 0;
-        }
-        return c;
-    }
-
-    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;
-    }
-
-#include "cuda.h"
-
-    void test_resize(char *filename)
-    {
-        image im = load_image(filename, 0,0, 3);
-        float mag = mag_array(im.data, im.w*im.h*im.c);
-        printf("L2 Norm: %f\n", mag);
-        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);
-
-        image bin = binarize_image(im);
-
-#ifdef GPU
-        image r = resize_image(im, im.w, im.h);
-        image black = make_image(im.w*2 + 3, im.h*2 + 3, 9);
-        image black2 = make_image(im.w, im.h, 3);
-
-        float *r_gpu = cuda_make_array(r.data, r.w*r.h*r.c);
-        float *black_gpu = cuda_make_array(black.data, black.w*black.h*black.c);
-        float *black2_gpu = cuda_make_array(black2.data, black2.w*black2.h*black2.c);
-        shortcut_gpu(3, r.w, r.h, 1, r_gpu, black.w, black.h, 3, black_gpu);
-        //flip_image(r);
-        //shortcut_gpu(3, r.w, r.h, 1, r.data, black.w, black.h, 3, black.data);
-
-        shortcut_gpu(3, black.w, black.h, 3, black_gpu, black2.w, black2.h, 1, black2_gpu);
-        cuda_pull_array(black_gpu, black.data, black.w*black.h*black.c);
-        cuda_pull_array(black2_gpu, black2.data, black2.w*black2.h*black2.c);
-        show_image_layers(black, "Black");
-        show_image(black2, "Recreate");
-#endif
-
-        show_image(im,   "Original");
-        show_image(bin,  "Binary");
-        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 )
-        {
-            fprintf(stderr, "Cannot load image \"%s\"\n", filename);
-            char buff[256];
-            sprintf(buff, "echo %s >> bad.list", filename);
-            system(buff);
-            return make_image(10,10,3);
-            //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 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);
+    save_image_jpg(c, out);
 #else
-        image out = load_image_stb(filename, c);
+    save_image(c, out);
+#endif
+}
+
+image resize_max(image im, int max)
+{
+    int w = im.w;
+    int h = im.h;
+    if(w > h){
+        h = (h * max) / w;
+        w = max;
+    } else {
+        w = (w * max) / h;
+        h = max;
+    }
+    if(w == im.w && h == im.h) return im;
+    image resized = resize_image(im, w, h);
+    return resized;
+}
+
+image resize_min(image im, int min)
+{
+    int w = im.w;
+    int h = im.h;
+    if(w < h){
+        h = (h * min) / w;
+        w = min;
+    } else {
+        w = (w * min) / h;
+        h = min;
+    }
+    if(w == im.w && h == im.h) return im;
+    image resized = resize_image(im, w, h);
+    return resized;
+}
+
+image random_crop_image(image im, int w, int h)
+{
+    int dx = rand_int(0, im.w - w);
+    int dy = rand_int(0, im.h - h);
+    image crop = crop_image(im, dx, dy, w, h);
+    return crop;
+}
+
+image random_augment_image(image im, float angle, float aspect, int low, int high, int size)
+{
+    aspect = rand_scale(aspect);
+    int r = rand_int(low, high);
+    int min = (im.h < im.w*aspect) ? im.h : im.w*aspect;
+    float scale = (float)r / min;
+
+    float rad = rand_uniform(-angle, angle) * TWO_PI / 360.;
+
+    float dx = (im.w*scale/aspect - size) / 2.;
+    float dy = (im.h*scale - size) / 2.;
+    if(dx < 0) dx = 0;
+    if(dy < 0) dy = 0;
+    dx = rand_uniform(-dx, dx);
+    dy = rand_uniform(-dy, dy);
+
+    image crop = rotate_crop_image(im, rad, scale, size, size, dx, dy, aspect);
+
+    return crop;
+}
+
+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 = 0;
+            }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;
+                h = 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 = 6 * 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 translate_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);
+        }
+    }
+}
+
+image binarize_image(image im)
+{
+    image c = copy_image(im);
+    int i;
+    for(i = 0; i < im.w * im.h * im.c; ++i){
+        if(c.data[i] > .5) c.data[i] = 1;
+        else c.data[i] = 0;
+    }
+    return c;
+}
+
+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 hue_image(image im, float hue)
+{
+    rgb_to_hsv(im);
+    int i;
+    for(i = 0; i < im.w*im.h; ++i){
+        im.data[i] = im.data[i] + hue;
+        if (im.data[i] > 1) im.data[i] -= 1;
+        if (im.data[i] < 0) im.data[i] += 1;
+    }
+    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 distort_image(image im, float hue, float sat, float val)
+{
+    rgb_to_hsv(im);
+    scale_image_channel(im, 1, sat);
+    scale_image_channel(im, 2, val);
+    int i;
+    for(i = 0; i < im.w*im.h; ++i){
+        im.data[i] = im.data[i] + hue;
+        if (im.data[i] > 1) im.data[i] -= 1;
+        if (im.data[i] < 0) im.data[i] += 1;
+    }
+    hsv_to_rgb(im);
+    constrain_image(im);
+}
+
+void random_distort_image(image im, float hue, float saturation, float exposure)
+{
+    float dhue = rand_uniform(-hue, hue);
+    float dsat = rand_scale(saturation);
+    float dexp = rand_scale(exposure);
+    distort_image(im, dhue, dsat, dexp);
+}
+
+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);
+}
+
+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);
+    float mag = mag_array(im.data, im.w*im.h*im.c);
+    printf("L2 Norm: %f\n", mag);
+    image gray = grayscale_image(im);
+
+    image c1 = copy_image(im);
+    image c2 = copy_image(im);
+    image c3 = copy_image(im);
+    image c4 = copy_image(im);
+    distort_image(c1, .1, 1.5, 1.5);
+    distort_image(c2, -.1, .66666, .66666);
+    distort_image(c3, .1, 1.5, .66666);
+    distort_image(c4, .1, .66666, 1.5);
+
+
+    show_image(im,   "Original");
+    show_image(gray, "Gray");
+    show_image(c1, "C1");
+    show_image(c2, "C2");
+    show_image(c3, "C3");
+    show_image(c4, "C4");
+#ifdef OPENCV
+    while(1){
+        image aug = random_augment_image(im, 0, .75, 320, 448, 320);
+        show_image(aug, "aug");
+        free_image(aug);
+
+
+        float exposure = 1.15;
+        float saturation = 1.15;
+        float hue = .05;
+
+        image c = copy_image(im);
+
+        float dexp = rand_scale(exposure);
+        float dsat = rand_scale(saturation);
+        float dhue = rand_uniform(-hue, hue);
+
+        distort_image(c, dhue, dsat, dexp);
+        show_image(c, "rand");
+        printf("%f %f %f\n", dhue, dsat, dexp);
+        free_image(c);
+        cvWaitKey(0);
+    }
+#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 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;
+    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)
-    {
-        return load_image(filename, w, h, 3);
-    }
+image load_image_color(char *filename, int w, int h)
+{
+    return load_image(filename, w, h, 3);
+}
 
-    image get_image_layer(image m, int l)
-    {
-        image out = make_image(m.w, m.h, 1);
-        int i;
-        for(i = 0; i < m.h*m.w; ++i){
-            out.data[i] = m.data[i+l*m.h*m.w];
-        }
-        return out;
+image get_image_layer(image m, int l)
+{
+    image out = make_image(m.w, m.h, 1);
+    int i;
+    for(i = 0; i < m.h*m.w; ++i){
+        out.data[i] = m.data[i+l*m.h*m.w];
     }
+    return out;
+}
 
-    float get_pixel(image m, int x, int y, int c)
-    {
-        assert(x < m.w && y < m.h && c < m.c);
-        return m.data[c*m.h*m.w + y*m.w + x];
-    }
-    float get_pixel_extend(image m, int x, int y, int c)
-    {
-        if(x < 0 || x >= m.w || y < 0 || y >= m.h || c < 0 || c >= m.c) return 0;
-        return get_pixel(m, x, y, c);
-    }
-    void set_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 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;
-    }
+float get_pixel(image m, int x, int y, int c)
+{
+    assert(x < m.w && y < m.h && c < m.c);
+    return m.data[c*m.h*m.w + y*m.w + x];
+}
+float get_pixel_extend(image m, int x, int y, int c)
+{
+    if(x < 0) x = 0;
+    if(x >= m.w) x = m.w-1;
+    if(y < 0) y = 0;
+    if(y >= m.h) y = m.h-1;
+    if(c < 0 || c >= m.c) return 0;
+    return get_pixel(m, x, y, c);
+}
+void set_pixel(image m, int x, int y, int c, float val)
+{
+    if (x < 0 || y < 0 || c < 0 || x >= m.w || y >= m.h || c >= m.c) return;
+    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)
-    {
-        int i, j, k;
-        for(i =0 ; i < m.c; ++i){
-            for(j =0 ; j < m.h; ++j){
-                for(k = 0; k < m.w; ++k){
-                    printf("%.2lf, ", m.data[i*m.h*m.w + j*m.w + k]);
-                    if(k > 30) break;
-                }
-                printf("\n");
-                if(j > 30) break;
+void print_image(image m)
+{
+    int i, j, k;
+    for(i =0 ; i < m.c; ++i){
+        for(j =0 ; j < m.h; ++j){
+            for(k = 0; k < m.w; ++k){
+                printf("%.2lf, ", m.data[i*m.h*m.w + j*m.w + k]);
+                if(k > 30) break;
             }
             printf("\n");
+            if(j > 30) break;
         }
         printf("\n");
     }
+    printf("\n");
+}
 
-    image collapse_images_vert(image *ims, int n)
-    {
-        int color = 1;
-        int border = 1;
-        int h,w,c;
-        w = ims[0].w;
-        h = (ims[0].h + border) * n - border;
-        c = ims[0].c;
-        if(c != 3 || !color){
-            w = (w+border)*c - border;
-            c = 1;
-        }
-
-        image filters = make_image(w, h, c);
-        int i,j;
-        for(i = 0; i < n; ++i){
-            int h_offset = i*(ims[0].h+border);
-            image copy = copy_image(ims[i]);
-            //normalize_image(copy);
-            if(c == 3 && color){
-                embed_image(copy, filters, 0, h_offset);
-            }
-            else{
-                for(j = 0; j < copy.c; ++j){
-                    int w_offset = j*(ims[0].w+border);
-                    image layer = get_image_layer(copy, j);
-                    embed_image(layer, filters, w_offset, h_offset);
-                    free_image(layer);
-                }
-            }
-            free_image(copy);
-        }
-        return filters;
-    } 
-
-    image collapse_images_horz(image *ims, int n)
-    {
-        int color = 1;
-        int border = 1;
-        int h,w,c;
-        int size = ims[0].h;
-        h = size;
-        w = (ims[0].w + border) * n - border;
-        c = ims[0].c;
-        if(c != 3 || !color){
-            h = (h+border)*c - border;
-            c = 1;
-        }
-
-        image filters = make_image(w, h, c);
-        int i,j;
-        for(i = 0; i < n; ++i){
-            int w_offset = i*(size+border);
-            image copy = copy_image(ims[i]);
-            //normalize_image(copy);
-            if(c == 3 && color){
-                embed_image(copy, filters, w_offset, 0);
-            }
-            else{
-                for(j = 0; j < copy.c; ++j){
-                    int h_offset = j*(size+border);
-                    image layer = get_image_layer(copy, j);
-                    embed_image(layer, filters, w_offset, h_offset);
-                    free_image(layer);
-                }
-            }
-            free_image(copy);
-        }
-        return filters;
-    } 
-
-    void show_image_normalized(image im, const char *name)
-    {
-        image c = copy_image(im);
-        normalize_image(c);
-        show_image(c, name);
-        free_image(c);
+image collapse_images_vert(image *ims, int n)
+{
+    int color = 1;
+    int border = 1;
+    int h,w,c;
+    w = ims[0].w;
+    h = (ims[0].h + border) * n - border;
+    c = ims[0].c;
+    if(c != 3 || !color){
+        w = (w+border)*c - border;
+        c = 1;
     }
 
-    void show_images(image *ims, int n, char *window)
-    {
-        image m = collapse_images_vert(ims, n);
-        /*
-           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);
+    image filters = make_image(w, h, c);
+    int i,j;
+    for(i = 0; i < n; ++i){
+        int h_offset = i*(ims[0].h+border);
+        image copy = copy_image(ims[i]);
+        //normalize_image(copy);
+        if(c == 3 && color){
+            embed_image(copy, filters, 0, h_offset);
+        }
+        else{
+            for(j = 0; j < copy.c; ++j){
+                int w_offset = j*(ims[0].w+border);
+                image layer = get_image_layer(copy, j);
+                embed_image(layer, filters, w_offset, h_offset);
+                free_image(layer);
+            }
+        }
+        free_image(copy);
+    }
+    return filters;
+} 
+
+image collapse_images_horz(image *ims, int n)
+{
+    int color = 1;
+    int border = 1;
+    int h,w,c;
+    int size = ims[0].h;
+    h = size;
+    w = (ims[0].w + border) * n - border;
+    c = ims[0].c;
+    if(c != 3 || !color){
+        h = (h+border)*c - border;
+        c = 1;
     }
 
-    void free_image(image m)
-    {
+    image filters = make_image(w, h, c);
+    int i,j;
+    for(i = 0; i < n; ++i){
+        int w_offset = i*(size+border);
+        image copy = copy_image(ims[i]);
+        //normalize_image(copy);
+        if(c == 3 && color){
+            embed_image(copy, filters, w_offset, 0);
+        }
+        else{
+            for(j = 0; j < copy.c; ++j){
+                int h_offset = j*(size+border);
+                image layer = get_image_layer(copy, j);
+                embed_image(layer, filters, w_offset, h_offset);
+                free_image(layer);
+            }
+        }
+        free_image(copy);
+    }
+    return filters;
+} 
+
+void show_image_normalized(image im, const char *name)
+{
+    image c = copy_image(im);
+    normalize_image(c);
+    show_image(c, name);
+    free_image(c);
+}
+
+void show_images(image *ims, int n, char *window)
+{
+    image m = collapse_images_vert(ims, n);
+    /*
+       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);
+    save_image(m, window);
+    show_image(m, window);
+    free_image(m);
+}
+
+void free_image(image m)
+{
+    if(m.data){
         free(m.data);
     }
+}

--
Gitblit v1.10.0