From edbccdfcaf46f11e631afe98796f3e6e170da5d0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 26 Oct 2014 05:04:34 +0000
Subject: [PATCH] Maybe something changed?
---
src/image.c | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/image.c b/src/image.c
index 453919f..da8b54a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -138,7 +138,7 @@
}
free_image(copy);
if(disp->height < 500 || disp->width < 500 || disp->height > 1000){
- int w = 1500;
+ int w = 500;
int h = w*p.h/p.w;
if(h > 1000){
h = 1000;
@@ -199,6 +199,7 @@
image make_empty_image(int h, int w, int c)
{
image out;
+ out.data = 0;
out.h = h;
out.w = w;
out.c = c;
@@ -368,7 +369,6 @@
// Will do a scaled image resize with the correct aspect ratio.
outImg = resizeImage(croppedImg, newHeight, newWidth, 0);
cvReleaseImage( &croppedImg );
-
}
else {
@@ -414,6 +414,25 @@
return out;
}
+image load_image_color(char *filename, int h, int w)
+{
+ IplImage* src = 0;
+ if( (src = cvLoadImage(filename, 1)) == 0 )
+ {
+ printf("Cannot load file image %s\n", filename);
+ exit(0);
+ }
+ if(h && w && (src->height != h || src->width != w)){
+ printf("Resized!\n");
+ IplImage *resized = resizeImage(src, h, w, 1);
+ cvReleaseImage(&src);
+ src = resized;
+ }
+ image out = ipl_to_image(src);
+ cvReleaseImage(&src);
+ return out;
+}
+
image load_image(char *filename, int h, int w)
{
IplImage* src = 0;
@@ -719,7 +738,7 @@
void show_images(image *ims, int n, char *window)
{
image m = collapse_images_vert(ims, n);
- save_image(m, window);
+ //save_image(m, window);
show_image(m, window);
free_image(m);
}
--
Gitblit v1.10.0