45f2b0c70a
information (multiple APP1 chunks). xv reads them all, but libjpeg frowns about writing multiple APP1. So, - ignore subsequent chunks (like exiv2 does) - add a small framework to report error messages from libjpeg (might be adaptable to other gfx formats). okay sthen@
31 lines
981 B
Plaintext
31 lines
981 B
Plaintext
$OpenBSD: patch-xvdir_c,v 1.3 2014/10/29 16:45:09 espie Exp $
|
|
--- xvdir.c.orig Tue Oct 28 14:28:11 2014
|
|
+++ xvdir.c Tue Oct 28 14:29:57 2014
|
|
@@ -1874,18 +1874,23 @@ FILE *OpenOutFile(filename)
|
|
|
|
|
|
/***************************************/
|
|
-int CloseOutFile(fp, filename, failed)
|
|
+int CloseOutFileWhy(fp, filename, failed, why)
|
|
FILE *fp;
|
|
const char *filename;
|
|
int failed;
|
|
+ const char *why;
|
|
{
|
|
char buf[64];
|
|
|
|
/* close output file, and if piping, deal... Returns '0' if everything OK */
|
|
|
|
if (failed) { /* failure during format-specific output routine */
|
|
- char str[512];
|
|
- sprintf(str,"Couldn't write file '%s'.", outFName);
|
|
+ char str[2048];
|
|
+ if (why)
|
|
+ snprintf(str, 2048, "Couldn't write file '%s' (%s).", outFName,
|
|
+ why);
|
|
+ else
|
|
+ snprintf(str, 2048, "Couldn't write file '%s'.", outFName);
|
|
ErrPopUp(str, "\nBummer!");
|
|
unlink(outFName); /* couldn't properly write file: delete it */
|
|
return 1;
|