Move display functionality to image.[ch]

1 files changed, 3 insertions, 62 deletions

diff --git a/pngtrans.c b/pngtrans.c
index e3558a0..fea0160 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -6,65 +6,6 @@
 #include "fft.h"
 #include "image.h"
 
-#define SIZE 1024
-#define SIZE 1024
-
-static gboolean
-on_expose (GtkWidget *widget, GdkEventExpose *expose, gpointer data)
-{
-    GdkPixbuf *pixbuf = data;
-    int i, j;
-    int pwidth = gdk_pixbuf_get_width (pixbuf);
-    int pheight = gdk_pixbuf_get_height (pixbuf);
-    int dwidth, dheight;
-    
-    gdk_drawable_get_size (widget->window, &dwidth, &dheight);
-    
-    for (i = 0; i < dheight; i += pheight)
-    {
-	for (j = 0; j < dwidth; j += pwidth)
-	{
-	    gdk_draw_pixbuf (widget->window, NULL,
-			     pixbuf, 0, 0, j, i, pwidth, pheight,
-			     GDK_RGB_DITHER_NONE,
-			     0, 0);
-	}
-    }
-    return TRUE;
-}
-
-static void
-display (const char *name, complex_image_t *image, convert_type_t type)
-{
-    GtkWidget *window, *da;
-    GdkPixbuf *pixbuf;
-    int argc;
-    char **argv;
-    char *arg0 = g_strdup (name);
-    
-    argc = 1;
-    argv = (char **)&arg0;
-    
-    gtk_init (&argc, &argv);
-    
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    
-    da = gtk_drawing_area_new ();
-    
-    gtk_container_add (GTK_CONTAINER (window), da);
-    
-    gtk_window_set_default_size (GTK_WINDOW (window), SIZE, SIZE);
-    
-    pixbuf = pixbuf_from_complex_image (image, type);
-    
-    g_signal_connect (da, "expose_event", G_CALLBACK (on_expose), pixbuf);
-    g_signal_connect (window, "delete_event", G_CALLBACK (gtk_main_quit), NULL);
-    
-    gtk_widget_show_all (window);
-    
-    gtk_main ();
-}
-
 static void
 image_fft (complex_image_t *image)
 {
@@ -144,15 +85,15 @@ main (int argc, char **argv)
     
     image_fft (image);
     
-    display ("test", image, CONVERT_MAG);
+    complex_image_show ("test", image, CONVERT_MAG);
     
     low_pass (image, 2 * image->width);
     
-    display ("test", image, CONVERT_MAG);
+    complex_image_show ("test", image, CONVERT_MAG);
     
     image_ifft (image);
     
-    display ("test", image, CONVERT_RE);
+    complex_image_show ("test", image, CONVERT_RE);
     
     return 0;
 }