From c6ecf1e0420737eafeb99b27b1d716b46a6cbb7a Mon Sep 17 00:00:00 2001
From: Jud White <github@judsonwhite.com>
Date: Sun, 25 Mar 2018 20:41:48 +0000
Subject: [PATCH] README.md: add notes to How to compile on Windows
---
src/image.c | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/image.c b/src/image.c
index e3edb7c..84919eb 100644
--- a/src/image.c
+++ b/src/image.c
@@ -14,12 +14,12 @@
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/core/version.hpp"
-#include "http_stream.h"
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio_c.h"
#include "opencv2/imgcodecs/imgcodecs_c.h"
#include "http_stream.h"
#endif
+#include "http_stream.h"
#endif
int windows = 0;
@@ -207,7 +207,6 @@
alphabet = 0;
}
- printf("%s: %.0f%%\n", names[class_id], prob*100);
int offset = class_id*123457 % classes;
float red = get_color(2,offset,classes);
float green = get_color(1,offset,classes);
@@ -230,7 +229,12 @@
if(right > im.w-1) right = im.w-1;
if(top < 0) top = 0;
if(bot > im.h-1) bot = im.h-1;
+ printf("%s: %.0f%%", names[class_id], prob * 100);
+
+ //printf(" - id: %d, x_center: %d, y_center: %d, width: %d, height: %d",
+ // class_id, (right + left) / 2, (bot - top) / 2, right - left, bot - top);
+ printf("\n");
draw_box_width(im, left, top, right, bot, width, red, green, blue);
if (alphabet) {
image label = get_label(alphabet, names[class_id], (im.h*.03)/10);
@@ -318,11 +322,12 @@
IplImage* img = cvCreateImage(cvSize(img_size, img_size), 8, 3);
cvSet(img, CV_RGB(255, 255, 255), 0);
CvPoint pt1, pt2, pt_text;
- pt1.x = img_offset; pt2.x = img_size, pt_text.x = 10;
CvFont font;
cvInitFont(&font, CV_FONT_HERSHEY_COMPLEX_SMALL, 0.7, 0.7, 0, 1, CV_AA);
char char_buff[100];
int i;
+ // vertical lines
+ pt1.x = img_offset; pt2.x = img_size, pt_text.x = 10;
for (i = 1; i <= number_of_lines; ++i) {
pt1.y = pt2.y = (float)i * draw_size / number_of_lines;
cvLine(img, pt1, pt2, CV_RGB(224, 224, 224), 1, 8, 0);
@@ -333,6 +338,7 @@
cvLine(img, pt1, pt2, CV_RGB(128, 128, 128), 1, 8, 0);
}
}
+ // horizontal lines
pt1.y = draw_size; pt2.y = 0, pt_text.y = draw_size + 15;
for (i = 0; i <= number_of_lines; ++i) {
pt1.x = pt2.x = img_offset + (float)i * draw_size / number_of_lines;
@@ -346,6 +352,7 @@
}
cvPutText(img, "Iteration number", cvPoint(draw_size / 2, img_size - 10), &font, CV_RGB(0, 0, 0));
cvPutText(img, "Press 's' to save: chart.jpg", cvPoint(5, img_size - 10), &font, CV_RGB(0, 0, 0));
+ printf(" If error occurs - run training with flag: -dont_show \n");
cvNamedWindow("average loss", CV_WINDOW_NORMAL);
cvMoveWindow("average loss", 0, 0);
cvResizeWindow("average loss", img_size, img_size);
@@ -676,9 +683,12 @@
return im;
}
-image get_image_from_stream_resize(CvCapture *cap, int w, int h, IplImage** in_img)
+image get_image_from_stream_resize(CvCapture *cap, int w, int h, IplImage** in_img, int use_webcam)
{
- IplImage* src = cvQueryFrame(cap);
+ IplImage* src;
+ if (use_webcam) src = get_webcam_frame(cap);
+ else src = cvQueryFrame(cap);
+
if (!src) return make_empty_image(0, 0, 0);
IplImage* new_img = cvCreateImage(cvSize(w, h), IPL_DEPTH_8U, 3);
*in_img = cvCreateImage(cvSize(src->width, src->height), IPL_DEPTH_8U, 3);
--
Gitblit v1.10.0