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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/image.c b/src/image.c
index ae8ca0a..92c9066 100644
--- a/src/image.c
+++ b/src/image.c
@@ -188,7 +188,7 @@
int x,y,k;
image copy = copy_image(p);
constrain_image(copy);
- rgbgr_image(copy);
+ if(p.c == 3) rgbgr_image(copy);
//normalize_image(copy);
char buff[256];
@@ -249,6 +249,7 @@
}
}
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);
}
@@ -849,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