From 228d3663f871d0e4bdee468572eb80141cb4fe3f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 15 Feb 2014 00:09:07 +0000
Subject: [PATCH] Extracting features from VOC with temp filters
---
src/image.c | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/image.c b/src/image.c
index 460df3d..fad454d 100644
--- a/src/image.c
+++ b/src/image.c
@@ -342,21 +342,11 @@
return outImg;
}
-image load_image(char *filename, int h, int w)
+image ipl_to_image(IplImage* src)
{
- IplImage* src = 0;
- if( (src = cvLoadImage(filename,-1)) == 0 )
- {
- printf("Cannot load file image %s\n", filename);
- exit(0);
- }
- cvShowImage("Orig", src);
- IplImage *resized = resizeImage(src, h, w, 1);
- cvShowImage("Sized", resized);
- cvWaitKey(0);
- cvReleaseImage(&src);
- src = resized;
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(h,w,c);
@@ -369,6 +359,21 @@
}
}
}
+ return out;
+}
+
+image load_image(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);
+ }
+ IplImage *resized = resizeImage(src, h, w, 1);
+ cvReleaseImage(&src);
+ src = resized;
+ image out = ipl_to_image(src);
cvReleaseImage(&src);
return out;
}
--
Gitblit v1.10.0