From de1421394c397fc3e45207fe5b8ef8799c45eb0f Mon Sep 17 00:00:00 2001 From: David Maciejak Date: Wed, 16 Apr 2014 22:29:49 +0200 Subject: [PATCH] wrlib: Fixed and improved NETPBM examples The tests examples were not compiling because of a missing X11 lib. Signed-off-by: Carlos R. Mafra --- wrlib/tests/Makefile.am | 2 +- wrlib/tests/testdraw.c | 2 ++ wrlib/tests/view.c | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wrlib/tests/Makefile.am b/wrlib/tests/Makefile.am index e447e974..76c9872f 100644 --- a/wrlib/tests/Makefile.am +++ b/wrlib/tests/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = test.png tile.xpm ballot_box.xpm AM_CPPFLAGS = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@ -LIBLIST = $(top_builddir)/wrlib/libwraster.la +LIBLIST = $(top_builddir)/wrlib/libwraster.la @XLIBS@ testdraw_SOURCES = testdraw.c testdraw_LDADD = $(LIBLIST) diff --git a/wrlib/tests/testdraw.c b/wrlib/tests/testdraw.c index 8d416bbc..df8c27d0 100644 --- a/wrlib/tests/testdraw.c +++ b/wrlib/tests/testdraw.c @@ -562,6 +562,8 @@ int main(int argc, char **argv) RContextAttributes attr; int visualID = -1; + (void) argc; + ProgName = strrchr(argv[0], '/'); if (!ProgName) ProgName = argv[0]; diff --git a/wrlib/tests/view.c b/wrlib/tests/view.c index 6b107afa..52c3aded 100644 --- a/wrlib/tests/view.c +++ b/wrlib/tests/view.c @@ -24,8 +24,10 @@ int main(int argc, char **argv) attr.colors_per_channel = 4; ctx = RCreateContext(dpy, DefaultScreen(dpy), &attr); - if (argc < 2) + if (argc < 2) { + printf("using default image as none was provided\n"); img = RGetImageFromXPMData(ctx, image_name); + } else img = RLoadImage(ctx, argv[1], 0); @@ -70,7 +72,7 @@ int main(int argc, char **argv) exit(1); } - printf("%ix%i\n", img->width, img->height); + printf("size is %ix%i\n", img->width, img->height); win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, img->width, img->height, 0, 0, 0); XSetWindowBackgroundPixmap(dpy, win, pix);