From 8bcdee86585f496afe1a8a38d608ea0504a11243 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 01 Sep 2015 18:22:03 +0000
Subject: [PATCH] Some bug fixes, random stuff
---
src/image.c | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/image.c b/src/image.c
index 8669294..fa0bceb 100644
--- a/src/image.c
+++ b/src/image.c
@@ -271,31 +271,27 @@
if(!success) fprintf(stderr, "Failed to write image %s\n", buff);
}
- /*
- void save_image_cv(image p, char *name)
- {
- int x,y,k;
- image copy = copy_image(p);
- //normalize_image(copy);
+#ifdef OPENCV
+ void save_image_jpg(image p, char *name)
+ {
+ int x,y,k;
- char buff[256];
- //sprintf(buff, "%s (%d)", name, windows);
- sprintf(buff, "%s.png", name);
+ 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);
+ 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(p,x,y,k)*255);
+ }
+ }
+ }
+ cvSaveImage(buff, disp,0);
+ cvReleaseImage(&disp);
}
- }
- }
- free_image(copy);
- cvSaveImage(buff, disp,0);
- cvReleaseImage(&disp);
- }
- */
+ #endif
void show_image_layers(image p, char *name)
{
@@ -868,6 +864,7 @@
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){
@@ -875,6 +872,9 @@
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);
--
Gitblit v1.10.0