mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-01-20 12:48:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix saving of pictures with highres (#564)

Browse Source
This commit is contained in:
Mr-DaveDev
2017-12-07 17:25:59 -07:00
committed by Mr-Dave
parent caea41df75
commit fe0f201345
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
picture.c
View File

@@ -1194,6 +1194,7 @@ void preview_save(struct context *cnt)
char previewname[PATH_MAX];
char filename[PATH_MAX];
struct image_data *saved_current_image;
int passthrough;
if (cnt->imgs.preview_image.diffs) {
/* Save current global context. */
@@ -1217,7 +1218,14 @@ void preview_save(struct context *cnt)
previewname[basename_len] = '\0';
strcat(previewname, imageext(cnt));
put_picture(cnt, previewname, cnt->imgs.preview_image.image_norm , FTYPE_IMAGE);
passthrough = util_check_passthrough(cnt);
if ((cnt->imgs.size_high > 0) && (!passthrough)) {
put_picture(cnt, previewname, cnt->imgs.preview_image.image_high , FTYPE_IMAGE);
} else {
put_picture(cnt, previewname, cnt->imgs.preview_image.image_norm , FTYPE_IMAGE);
}
} else {
/*
* Save best preview-shot also when no movies are recorded or imagepath
@@ -1236,7 +1244,12 @@ void preview_save(struct context *cnt)
mystrftime(cnt, filename, sizeof(filename), imagepath, &cnt->imgs.preview_image.timestamp_tv, NULL, 0);
snprintf(previewname, PATH_MAX, "%s/%s.%s", cnt->conf.filepath, filename, imageext(cnt));
put_picture(cnt, previewname, cnt->imgs.preview_image.image_norm, FTYPE_IMAGE);
passthrough = util_check_passthrough(cnt);
if ((cnt->imgs.size_high > 0) && (!passthrough)) {
put_picture(cnt, previewname, cnt->imgs.preview_image.image_high , FTYPE_IMAGE);
} else {
put_picture(cnt, previewname, cnt->imgs.preview_image.image_norm, FTYPE_IMAGE);
}
}
/* Restore global context values. */