From c6ca54b411478a8bcf3ec8bc7615e80d63bdaba7 Mon Sep 17 00:00:00 2001
From: Vinjn Zhang <vinjn@users.noreply.github.com>
Date: Sun, 20 May 2018 13:12:35 +0000
Subject: [PATCH] darknet.py - apply the same changes to build/darknet/x64/
---
src/image.c | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/image.c b/src/image.c
index 467b95c..a1e4c77 100644
--- a/src/image.c
+++ b/src/image.c
@@ -237,10 +237,12 @@
{
int selected_num = 0;
detection_with_class* result_arr = calloc(dets_num, sizeof(detection_with_class));
- for (int i = 0; i < dets_num; ++i) {
+ int i;
+ for (i = 0; i < dets_num; ++i) {
int best_class = -1;
float best_class_prob = thresh;
- for (int j = 0; j < dets[i].classes; ++j) {
+ int j;
+ for (j = 0; j < dets[i].classes; ++j) {
if (dets[i].prob[j] > best_class_prob ) {
best_class = j;
best_class_prob = dets[i].prob[j];
@@ -280,17 +282,19 @@
// text output
qsort(selected_detections, selected_detections_num, sizeof(*selected_detections), compare_by_lefts);
- for (int i = 0; i < selected_detections_num; ++i) {
+ int i;
+ for (i = 0; i < selected_detections_num; ++i) {
const int best_class = selected_detections[i].best_class;
printf("%s: %.0f%%", names[best_class], selected_detections[i].det.prob[best_class] * 100);
if (ext_output)
- printf("\t(left: %.0f\ttop: %.0f\tw: %0.f\th: %0.f)\n",
+ printf("\t(left: %.0f \ttop: %.0f \tw: %0.f \th: %0.f)\n",
(selected_detections[i].det.bbox.x - selected_detections[i].det.bbox.w / 2)*im.w,
(selected_detections[i].det.bbox.y - selected_detections[i].det.bbox.h / 2)*im.h,
selected_detections[i].det.bbox.w*im.w, selected_detections[i].det.bbox.h*im.h);
else
printf("\n");
- for (int j = 0; j < classes; ++j) {
+ int j;
+ for (j = 0; j < classes; ++j) {
if (selected_detections[i].det.prob[j] > thresh && j != best_class) {
printf("%s: %.0f%%\n", names[j], selected_detections[i].det.prob[j] * 100);
}
@@ -299,7 +303,7 @@
// image output
qsort(selected_detections, selected_detections_num, sizeof(*selected_detections), compare_by_probs);
- for (int i = 0; i < selected_detections_num; ++i) {
+ for (i = 0; i < selected_detections_num; ++i) {
int width = im.h * .006;
if (width < 1)
width = 1;
@@ -346,7 +350,8 @@
if (alphabet) {
char labelstr[4096] = { 0 };
strcat(labelstr, names[selected_detections[i].best_class]);
- for (int j = 0; j < classes; ++j) {
+ int j;
+ for (j = 0; j < classes; ++j) {
if (selected_detections[i].det.prob[j] > thresh && j != selected_detections[i].best_class) {
strcat(labelstr, ", ");
strcat(labelstr, names[j]);
@@ -436,6 +441,8 @@
{
int i, j;
if (!show_img) return;
+ static int frame_id = 0;
+ frame_id++;
for (i = 0; i < num; ++i) {
char labelstr[4096] = { 0 };
@@ -511,6 +518,16 @@
color.val[1] = green * 256;
color.val[2] = blue * 256;
+ // you should create directory: result_img
+ //static int img_id = 0;
+ //img_id++;
+ //char image_name[1024];
+ //sprintf(image_name, "result_img/img_%d_%d_%d.jpg", frame_id, img_id, class_id);
+ //CvRect rect = cvRect(pt1.x, pt1.y, pt2.x - pt1.x, pt2.y - pt1.y);
+ //cvSetImageROI(show_img, rect);
+ //cvSaveImage(image_name, show_img, 0);
+ //cvResetImageROI(show_img);
+
cvRectangle(show_img, pt1, pt2, color, width, 8, 0);
//printf("left=%d, right=%d, top=%d, bottom=%d, obj_id=%d, obj=%s \n", left, right, top, bot, class_id, names[class_id]);
cvRectangle(show_img, pt_text_bg1, pt_text_bg2, color, width, 8, 0);
@@ -945,7 +962,7 @@
sprintf(buff, "echo %s >> bad.list", filename);
system(buff);
return make_image(10,10,3);
- //exit(0);
+ //exit(EXIT_FAILURE);
}
image out = ipl_to_image(src);
cvReleaseImage(&src);
@@ -1686,7 +1703,11 @@
unsigned char *data = stbi_load(filename, &w, &h, &c, channels);
if (!data) {
fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", filename, stbi_failure_reason());
- exit(0);
+ char buff[256];
+ sprintf(buff, "echo %s >> bad.list", filename);
+ system(buff);
+ return make_image(10, 10, 3);
+ //exit(EXIT_FAILURE);
}
if(channels) c = channels;
int i,j,k;
--
Gitblit v1.10.0