diff options
author | Simon Rettberg | 2021-04-06 14:23:46 +0200 |
---|---|---|
committer | Simon Rettberg | 2021-04-06 14:23:46 +0200 |
commit | 26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9 (patch) | |
tree | a51e1637554bcd84e63cccb1cb220c898a2c4ee8 /hacks/webcollage-helper.c | |
parent | 5.44 (diff) | |
download | xscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.tar.gz xscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.tar.xz xscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.zip |
xscreensaver 6.00
Diffstat (limited to 'hacks/webcollage-helper.c')
-rw-r--r-- | hacks/webcollage-helper.c | 14 |
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++; |