From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz

[xscreensaver] / hacks / xanalogtv.c

diff --git a/hacks/xanalogtv.c b/hacks/xanalogtv.c
index d1f3e1b707c5cb583de6704763d0c872c6efbd10..dfaf05de8b66ff730aa6641eec931633ce60553a 100644 (file)
--- a/hacks/xanalogtv.c
+++ b/hacks/xanalogtv.c
@@ -1,4 +1,4 @@
-/* xanalogtv, Copyright (c) 2003 Trevor Blackwell <tlb@tlb.org>
+/* xanalogtv, Copyright (c) 2003-2018 Trevor Blackwell <tlb@tlb.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -39,7 +39,7 @@
 #endif
 
 #include "screenhack.h"
-#include "xpm-pixmap.h"
+#include "ximage-loader.h"
 #include "analogtv.h"
 
 #include "images/logo-50.xpm"
@@ -388,26 +388,6 @@ analogtv_load_random_image(struct state *st)
 }
 
 
-#if 0
-static int
-analogtv_load_xpm(analogtv *it, analogtv_input *input, char **xpm)
-{
-  Pixmap pixmap;
-  XImage *image;
-  int width,height;
-  int rc;
-
-  pixmap=xpm_data_to_pixmap (it->dpy, it->window, xpm,
-                             &width, &height, NULL);
-  image = XGetImage(it->dpy, pixmap, 0, 0, width, height, ~0L, ZPixmap);
-  XFreePixmap(it->dpy, pixmap);
-  rc=analogtv_load_ximage(it, input, image);
-  if (image) XDestroyImage(image);
-  return rc;
-}
-#endif
-
-
 static void add_stations(struct state *st)
 {
   while (st->n_stations < MAX_STATIONS) {