From 4a2a2250f9470e28e83c9e5db900e8ff71dfc416 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 20 Jun 2018 23:42:39 +0000
Subject: [PATCH] Fixed removing escape symbols for command line arguments
---
src/image.c | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/image.c b/src/image.c
index 625e7df..dd0098f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -966,10 +966,15 @@
if( (src = cvLoadImage(filename, flag)) == 0 )
{
- fprintf(stderr, "Cannot load image \"%s\"\n", filename);
- char buff[256];
- sprintf(buff, "echo %s >> bad.list", filename);
- system(buff);
+ char shrinked_filename[1024];
+ if (strlen(filename) >= 1024) sprintf(shrinked_filename, "name is too long");
+ else sprintf(shrinked_filename, "%s", filename);
+ fprintf(stderr, "Cannot load image \"%s\"\n", shrinked_filename);
+ FILE* fw = fopen("bad.list", "a");
+ fwrite(shrinked_filename, sizeof(char), strlen(shrinked_filename), fw);
+ char *new_line = "\n";
+ fwrite(new_line, sizeof(char), strlen(new_line), fw);
+ fclose(fw);
return make_image(10,10,3);
//exit(EXIT_FAILURE);
}
@@ -1063,6 +1068,18 @@
return im;
}
+int get_stream_fps(CvCapture *cap, int cpp_video_capture)
+{
+ int fps = 25;
+ if (cpp_video_capture) {
+ fps = get_stream_fps_cpp(cap);
+ }
+ else {
+ fps = cvGetCaptureProperty(cap, CV_CAP_PROP_FPS);
+ }
+ return fps;
+}
+
void save_image_jpg(image p, const char *name)
{
image copy = copy_image(p);
@@ -1764,10 +1781,15 @@
int w, h, c;
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());
- char buff[256];
- sprintf(buff, "echo %s >> bad.list", filename);
- system(buff);
+ char shrinked_filename[1024];
+ if (strlen(filename) >= 1024) sprintf(shrinked_filename, "name is too long");
+ else sprintf(shrinked_filename, "%s", filename);
+ fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", shrinked_filename, stbi_failure_reason());
+ FILE* fw = fopen("bad.list", "a");
+ fwrite(shrinked_filename, sizeof(char), strlen(shrinked_filename), fw);
+ char *new_line = "\n";
+ fwrite(new_line, sizeof(char), strlen(new_line), fw);
+ fclose(fw);
return make_image(10, 10, 3);
//exit(EXIT_FAILURE);
}
--
Gitblit v1.10.0