summaryrefslogtreecommitdiffstats
path: root/hacks/webcollage-helper.c
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-06 14:43:39 +0200
committerSimon Rettberg2021-04-07 13:38:37 +0200
commit38886de0c3e9ea5729ef23e4c653fa2822f52e8f (patch)
tree9b799c8c968a92cc77746a95e0e8bdd90b6b13c3 /hacks/webcollage-helper.c
parentMaybe not remove, but ... (diff)
downloadxscreensaver-38886de0c3e9ea5729ef23e4c653fa2822f52e8f.tar.gz
xscreensaver-38886de0c3e9ea5729ef23e4c653fa2822f52e8f.tar.xz
xscreensaver-38886de0c3e9ea5729ef23e4c653fa2822f52e8f.zip
xscreensaver 6.00v28r1openslx
Diffstat (limited to 'hacks/webcollage-helper.c')
-rw-r--r--hacks/webcollage-helper.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/hacks/webcollage-helper.c b/hacks/webcollage-helper.c
index 46ec608..ade45a4 100644
--- a/hacks/webcollage-helper.c
+++ b/hacks/webcollage-helper.c
@@ -1,5 +1,5 @@
/* webcollage-helper --- scales and pastes one image into another
- * xscreensaver, Copyright (c) 2002-2017 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 2002-2020 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -28,10 +28,20 @@
#include <sys/types.h>
#include <sys/stat.h>
+# if (__GNUC__ >= 4) /* Ignore useless warnings generated by GTK headers */
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wlong-long"
+# pragma GCC diagnostic ignored "-Wvariadic-macros"
+# pragma GCC diagnostic ignored "-Wpedantic"
+# endif
+
#undef HAVE_STDLIB_H /* stupid jconfig.h! */
#include <jpeglib.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
+# if (__GNUC__ >= 4)
+# pragma GCC diagnostic pop
+# endif
char *progname;
static int verbose_p = 0;
@@ -529,6 +539,8 @@ main (int argc, char **argv)
s = strrchr (progname, '/');
if (s) progname = s+1;
+ if (argc < 2) usage();
+
if (!strcmp(argv[i], "-v"))
verbose_p++, i++;