diff options
author | Søren Sandmann Pedersen <ssp@l3000.localdomain> | 2010-09-25 23:51:38 -0400 |
---|---|---|
committer | Søren Sandmann Pedersen <ssp@l3000.localdomain> | 2010-09-27 13:44:21 -0400 |
commit | 6235d222a29739152df9f1fa0f07ef3ad78cc3eb (patch) | |
tree | c679e4d3d75220225b6d92d5cb42fdd2d1aa2641 | |
parent | 8e8c2791eaee8c7e24a3b7ce4783f376b41973f1 (diff) |
warnings
-rw-r--r-- | gtk-utils.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gtk-utils.c b/gtk-utils.c index 11f64f9..fa129f1 100644 --- a/gtk-utils.c +++ b/gtk-utils.c @@ -1,3 +1,5 @@ +#include <math.h> +#include <stdlib.h> #include <stdint.h> #include <gtk/gtk.h> #include "fft.h" @@ -58,10 +60,8 @@ pixbuf_from_buffer (complex_t *buffer, int n) #endif #define SADD(v,a) (((v) + (a) > 0xff)? 0xff : ((v) + (a) < 0)? 0 : ((v) + (a))) - -#if 0 + g = ((double)w / n) * 255; -#endif #if 0 if (vi + g > 0xff) @@ -79,7 +79,10 @@ pixbuf_from_buffer (complex_t *buffer, int n) gg = 0x20 + 0.5 * g; bb = 0 + 0.3 * g; - int x = drand48() > 0.5; + pb[0] = SADD (rr, vi); + pb[1] = SADD (gg, - (vi)); + pb[2] = SADD (bb, vi); + pb[3] = 0xff; pb[0] = SADD (rr, 0.5 * vi); pb[1] = SADD (gg, - 0.5 * vi); @@ -133,7 +136,6 @@ on_expose (GtkWidget *widget, GdkEventExpose *expose, gpointer data) pixbuf, 0, 0, j, i, pwidth, pheight, GDK_RGB_DITHER_NONE, 0, 0); - } } return TRUE; @@ -152,21 +154,21 @@ show_image (const char *name, complex_t *image, int n) argv = (char **)&arg0; gtk_init (&argc, &argv); - + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); da = gtk_drawing_area_new (); - gtk_container_add (window, da); - + gtk_container_add (GTK_CONTAINER (window), da); + gtk_window_set_default_size (GTK_WINDOW (window), SIZE, SIZE); pixbuf = pixbuf_from_buffer (image, n); - + 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 (); } |