X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fwebcollage-helper.c;h=e6e2da7a81b5c9476cad96dc377b55dd9f752595;hb=c494fd2e6b3b25582375d62e40f4f5cc984ca424;hp=a661b3a41f278b0d78a84aa8ea2297a134ee6d39;hpb=96a411663168b0ba5432b407a83be55f3df0c802;p=xscreensaver diff --git a/hacks/webcollage-helper.c b/hacks/webcollage-helper.c index a661b3a4..e6e2da7a 100644 --- a/hacks/webcollage-helper.c +++ b/hacks/webcollage-helper.c @@ -1,5 +1,5 @@ /* webcollage-helper --- scales and pastes one image into another - * xscreensaver, Copyright (c) 2002, 2003 Jamie Zawinski + * xscreensaver, Copyright (c) 2002-2005 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -10,6 +10,10 @@ * implied warranty. */ +/* This is the GDK + JPEGlib implementation. See webcollage-helper-cocoa.m + for the Cocoa implementation. + */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -18,11 +22,13 @@ #include #include +#include #include #include #include #include +#undef HAVE_STDLIB_H /* stupid jconfig.h! */ #include #include @@ -59,11 +65,114 @@ load_pixbuf (const char *file) return pb; } + +static void +bevel_image (GdkPixbuf **pbP, int bevel_pct, + int x, int y, int w, int h) +{ + GdkPixbuf *pb = *pbP; + int small_size = (w > h ? h : w); + + int bevel_size = small_size * (bevel_pct / 100.0); + + /* Use a proportionally larger bevel size for especially small images. */ + if (bevel_size < 20 && small_size > 40) bevel_size = 20; + else if (bevel_size < 10 && small_size > 20) bevel_size = 10; + else if (bevel_size < 5) /* too small to bother bevelling */ + return; + + /* Ensure the pixbuf has an alpha channel. */ + if (! gdk_pixbuf_get_has_alpha (pb)) + { + GdkPixbuf *pb2 = gdk_pixbuf_add_alpha (pb, FALSE, 0, 0, 0); + gdk_pixbuf_unref (pb); + pb = pb2; + } + + { + guchar *data = gdk_pixbuf_get_pixels (pb); + guchar *line; + int rs = gdk_pixbuf_get_rowstride (pb); + int ch = gdk_pixbuf_get_n_channels (pb); + int xx, yy; + double *ramp = (double *) malloc (sizeof(*ramp) * (bevel_size + 1)); + + if (!ramp) + { + fprintf (stderr, "%s: out of memory (%d)\n", progname, bevel_size); + exit (1); + } + + for (xx = 0; xx <= bevel_size; xx++) + { + +# if 0 /* linear */ + ramp[xx] = xx / (double) bevel_size; + +# else /* sinusoidal */ + double p = (xx / (double) bevel_size); + double s = sin (p * M_PI / 2); + ramp[xx] = s; +# endif + } + + line = data + (rs * y); + for (yy = 0; yy < h; yy++) + { + guchar *p = line + (x * ch); + for (xx = 0; xx < w; xx++) + { + double rx, ry, r; + + if (xx < bevel_size) rx = ramp[xx]; + else if (xx >= w - bevel_size) rx = ramp[w - xx - 1]; + else rx = 1; + + if (yy < bevel_size) ry = ramp[yy]; + else if (yy >= h - bevel_size) ry = ramp[h - yy - 1]; + else ry = 1; + + r = rx * ry; + if (r != 1) + p[ch-1] *= r; + + p += ch; + } + line += rs; + } + +#if 0 /* show the ramp */ + line = data + (rs * y); + for (yy = 0; yy < h; yy++) + { + guchar *p = line + (x * ch); + for (xx = 0; xx < w; xx++) + { + int cc = 0; + for (cc = 0; cc < ch-1; cc++) + p[cc] = 255; + p += ch; + } + line += rs; + } +#endif + + free (ramp); + + if (verbose_p) + fprintf (stderr, "%s: added %d%% bevel (%d px)\n", progname, + bevel_pct, bevel_size); + } + + *pbP = pb; +} + + static void paste (const char *paste_file, const char *base_file, double from_scale, - double opacity, + double opacity, int bevel_pct, int from_x, int from_y, int to_x, int to_y, int w, int h) { @@ -183,18 +292,32 @@ paste (const char *paste_file, } } - if (opacity == 1.0) + if (bevel_pct > 0) + bevel_image (&paste_pb, bevel_pct, + from_x, from_y, w, h); + + if (opacity == 1.0 && bevel_pct == 0) gdk_pixbuf_copy_area (paste_pb, from_x, from_y, w, h, base_pb, to_x, to_y); else - gdk_pixbuf_composite (paste_pb, base_pb, - to_x, to_y, w, h, - to_x - from_x, to_y - from_y, - 1.0, 1.0, - GDK_INTERP_HYPER, - opacity * 255); + { + from_x++; /* gdk_pixbuf_composite gets confused about the bevel: */ + from_y++; /* it leaves a stripe on the top and left if we try to */ + to_x++; /* start at 0,0, so pull it right and down by 1 pixel. */ + to_y++; /* (problem seen in gtk2-2.4.14-2.fc3) */ + w--; + h--; + + if (w > 0 && h > 0) + gdk_pixbuf_composite (paste_pb, base_pb, + to_x, to_y, w, h, + to_x - from_x, to_y - from_y, + 1.0, 1.0, + GDK_INTERP_HYPER, + opacity * 255); + } if (verbose_p) fprintf (stderr, "%s: pasted %dx%d from %d,%d to %d,%d\n", @@ -279,7 +402,7 @@ write_pixbuf (GdkPixbuf *pb, const char *file) perror (buf); exit (1); } - fprintf (stderr, " %luK\n", (st.st_size + 1023) / 1024); + fprintf (stderr, " %luK\n", ((unsigned long) st.st_size + 1023) / 1024); } fclose (out); @@ -329,7 +452,7 @@ main (int argc, char **argv) int i; char *paste_file, *base_file, *s, dummy; double from_scale, opacity; - int from_x, from_y, to_x, to_y, w, h; + int from_x, from_y, to_x, to_y, w, h, bevel_pct; i = 0; progname = argv[i++]; @@ -362,6 +485,8 @@ main (int argc, char **argv) s = argv[i++]; if (1 != sscanf (s, " %d %c", &w, &dummy)) usage(); s = argv[i++]; if (1 != sscanf (s, " %d %c", &h, &dummy)) usage(); + bevel_pct = 10; /* #### */ + if (w < 0) usage(); if (h < 0) usage(); @@ -370,7 +495,7 @@ main (int argc, char **argv) #endif /* HAVE_GTK2 */ paste (paste_file, base_file, - from_scale, opacity, + from_scale, opacity, bevel_pct, from_x, from_y, to_x, to_y, w, h); exit (0);