diff options
author | Søren Sandmann Pedersen <ssp@redhat.com> | 2011-08-01 20:04:25 -0400 |
---|---|---|
committer | Søren Sandmann Pedersen <ssp@redhat.com> | 2011-08-01 20:04:25 -0400 |
commit | 7a71a49b5a5787bc13e75be1b6074a207aacd860 (patch) | |
tree | a79eecebe1d03577793907e5687bec78c81dca19 | |
parent | 70a6d042fa3bac52624555e242112df189709c9c (diff) | |
parent | 31c16561ba85bafc15948dc74eea8c908ab86ccc (diff) |
Merge branch 'master' of git+ssh://freedesktop.org/home/sandmann/fourier
Conflicts:
pngtrans.c
-rw-r--r-- | pngtrans.c | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -25,7 +25,7 @@ complex_image_new (int width, int height) image->red = g_new0 (complex_t, width * height); image->green = g_new0 (complex_t, width * height); image->blue = g_new0 (complex_t, width * height); - + return image; } @@ -47,7 +47,7 @@ complex_image_from_pixbuf (GdkPixbuf *pixbuf) n_channels = 3 + has_alpha; printf ("has alpha: %d\n", has_alpha); - + result = complex_image_new (w, h); for (i = 0; i < h; ++i) @@ -133,17 +133,20 @@ convert_mag (complex_t d) { double m = complex_mag (d); - m = log (m) / 10.0; + m = log (m + 1) / 12.0; if (m > 1.0) { printf ("%f\n", m); m = 1.0; } - + if (m < 0) + { + printf ("%f\n", m); m = 0; - + } + return (uint8_t) (m * 255.0 + 0.5); } @@ -154,7 +157,7 @@ convert_re (complex_t c) c.re = 1.0; if (c.re < 0) c.re = 0; - + return c.re * 255.0 + 0.5; } @@ -188,7 +191,7 @@ display (const char *name, complex_image_t *image, display_type_t type) default: g_assert_not_reached(); } - + pixbuf = pixbuf_from_complex_image (image, convert); g_signal_connect (da, "expose_event", G_CALLBACK (on_expose), pixbuf); @@ -265,7 +268,7 @@ main (int argc, char **argv) input = argv[1]; output = argv[2]; - + if (!(pb = gdk_pixbuf_new_from_file (input, NULL))) { printf ("Could not open %s\n", input); @@ -283,10 +286,10 @@ main (int argc, char **argv) low_pass (image, 2 * image->width); display ("test", image, DISPLAY_MAG); - + image_ifft (image); display ("test", image, DISPLAY_RE); - + return 0; } |