projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.35.tar.gz
[xscreensaver]
/
hacks
/
webcollage-helper.c
diff --git
a/hacks/webcollage-helper.c
b/hacks/webcollage-helper.c
index 8ba09d73733cd5e4a0d06337ae7c1a686a3f963c..19786ba129f3204bdc08e5a293bc0fec631a9801 100644
(file)
--- a/
hacks/webcollage-helper.c
+++ b/
hacks/webcollage-helper.c
@@
-10,6
+10,10
@@
* implied warranty.
*/
* 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
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@
-24,6
+28,7
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
+#undef HAVE_STDLIB_H /* stupid jconfig.h! */
#include <jpeglib.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <jpeglib.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@
-80,7
+85,7
@@
bevel_image (GdkPixbuf **pbP, int bevel_pct,
if (! gdk_pixbuf_get_has_alpha (pb))
{
GdkPixbuf *pb2 = gdk_pixbuf_add_alpha (pb, FALSE, 0, 0, 0);
if (! gdk_pixbuf_get_has_alpha (pb))
{
GdkPixbuf *pb2 = gdk_pixbuf_add_alpha (pb, FALSE, 0, 0, 0);
- g
dk_pixbuf
_unref (pb);
+ g
_object
_unref (pb);
pb = pb2;
}
pb = pb2;
}
@@
-200,7
+205,7
@@
paste (const char *paste_file,
int new_h = paste_h * from_scale;
GdkPixbuf *new_pb = gdk_pixbuf_scale_simple (paste_pb, new_w, new_h,
GDK_INTERP_HYPER);
int new_h = paste_h * from_scale;
GdkPixbuf *new_pb = gdk_pixbuf_scale_simple (paste_pb, new_w, new_h,
GDK_INTERP_HYPER);
- g
dk_pixbuf
_unref (paste_pb);
+ g
_object
_unref (paste_pb);
paste_pb = new_pb;
paste_w = gdk_pixbuf_get_width (paste_pb);
paste_h = gdk_pixbuf_get_height (paste_pb);
paste_pb = new_pb;
paste_w = gdk_pixbuf_get_width (paste_pb);
paste_h = gdk_pixbuf_get_height (paste_pb);
@@
-318,9
+323,9
@@
paste (const char *paste_file,
fprintf (stderr, "%s: pasted %dx%d from %d,%d to %d,%d\n",
progname, paste_w, paste_h, from_x, from_y, to_x, to_y);
fprintf (stderr, "%s: pasted %dx%d from %d,%d to %d,%d\n",
progname, paste_w, paste_h, from_x, from_y, to_x, to_y);
- g
dk_pixbuf
_unref (paste_pb);
+ g
_object
_unref (paste_pb);
write_pixbuf (base_pb, base_file);
write_pixbuf (base_pb, base_file);
- g
dk_pixbuf
_unref (base_pb);
+ g
_object
_unref (base_pb);
}
}
@@
-414,7
+419,7
@@
add_jpeg_comment (struct jpeg_compress_struct *cinfo)
" Generated by WebCollage: Exterminate All Rational Thought. \r\n"
" Copyright (c) 1999-%Y by Jamie Zawinski <jwz@jwz.org> \r\n"
"\r\n"
" Generated by WebCollage: Exterminate All Rational Thought. \r\n"
" Copyright (c) 1999-%Y by Jamie Zawinski <jwz@jwz.org> \r\n"
"\r\n"
- " http://www.jwz.org/webcollage/ \r\n"
+ " http
s
://www.jwz.org/webcollage/ \r\n"
"\r\n"
" This is what the web looked like on %d %b %Y at %I:%M:%S %p %Z. \r\n"
"\r\n";
"\r\n"
" This is what the web looked like on %d %b %Y at %I:%M:%S %p %Z. \r\n"
"\r\n";
@@
-486,7
+491,9
@@
main (int argc, char **argv)
if (h < 0) usage();
#ifdef HAVE_GTK2
if (h < 0) usage();
#ifdef HAVE_GTK2
+#if !GLIB_CHECK_VERSION(2, 36 ,0)
g_type_init ();
g_type_init ();
+#endif
#endif /* HAVE_GTK2 */
paste (paste_file, base_file,
#endif /* HAVE_GTK2 */
paste (paste_file, base_file,