X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=utils%2Fgrabscreen.h;h=f0d7a0b653f37ba8c19728777fee791629ebfc6b;hp=65e53412d428cc34f8405b1c006d82338dce5e62;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869

diff --git a/utils/grabscreen.h b/utils/grabscreen.h
index 65e53412..f0d7a0b6 100644
--- a/utils/grabscreen.h
+++ b/utils/grabscreen.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992-2012 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2014 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -84,19 +84,27 @@ extern void grab_screen_image_internal (Screen *, Window);
 /* For debugging: turn on verbosity. */
 extern void grabscreen_verbose (void);
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
 /* Don't use these: internal interface of grabclient.c. */
 extern Bool osx_grab_desktop_image (Screen *, Window, Drawable,
                                     XRectangle *geom_ret);
 extern Bool osx_load_image_file (Screen *, Window, Drawable,
                                  const char *filename, XRectangle *geom_ret);
-#endif /* HAVE_COCOA */
+#endif /* HAVE_JWXYZ */
 
 #ifdef USE_IPHONE
 extern void ios_load_random_image (void (*callback) (void *uiimage,
                                                      const char *filename,
+                                                     int w, int h,
                                                      void *closure),
-                                   void *closure);
+                                   void *closure,
+                                   int width, int height);
 #endif /* USE_IPHONE */
 
+#ifdef HAVE_ANDROID
+char *jwxyz_load_random_image (Display *dpy,  /* utils/grabclient.c */
+                               int *width_ret, int *height_ret,
+                               char **name_ret);
+#endif
+
 #endif /* __GRABSCREEN_H__ */