Mercurial > geeqie
changeset 821:fb249b8e63e4
Move some functions from image.[ch] to image-overlay.c and make them static:
- image_overlay_add()
- image_overlay_set()
- image_overlay_remove()
- image_overlay_get() (unused)
| author | zas_ |
|---|---|
| date | Thu, 12 Jun 2008 20:17:22 +0000 |
| parents | e9e3fb483cdc |
| children | df541dc41707 |
| files | src/image-overlay.c src/image.c src/image.h |
| diffstat | 3 files changed, 23 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image-overlay.c Thu Jun 12 18:30:33 2008 +0000 +++ b/src/image-overlay.c Thu Jun 12 20:17:22 2008 +0000 @@ -697,6 +697,29 @@ return icon; } +static gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y, + gint relative, gint always) +{ + return pixbuf_renderer_overlay_add((PixbufRenderer *)imd->pr, pixbuf, x, y, relative, always); +} + +static void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y) +{ + pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y); +} + +#if 0 /* unused for now */ +static gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y) +{ + return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y); +} +#endif + +static void image_overlay_remove(ImageWindow *imd, gint id) +{ + pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id); +} + static void image_osd_icon_show(OverlayStateData *osd, ImageOSDFlag flag) { GdkPixbuf *pixbuf;
--- a/src/image.c Thu Jun 12 18:30:33 2008 +0000 +++ b/src/image.c Thu Jun 12 20:17:22 2008 +0000 @@ -1138,27 +1138,6 @@ return TRUE; } -gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y, - gint relative, gint always) -{ - return pixbuf_renderer_overlay_add((PixbufRenderer *)imd->pr, pixbuf, x, y, relative, always); -} - -void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y) -{ - pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y); -} - -gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y) -{ - return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y); -} - -void image_overlay_remove(ImageWindow *imd, gint id) -{ - pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id); -} - static gint image_scroll_cb(GtkWidget *widget, GdkEventScroll *event, gpointer data) { ImageWindow *imd = data;
--- a/src/image.h Thu Jun 12 18:30:33 2008 +0000 +++ b/src/image.h Thu Jun 12 20:17:22 2008 +0000 @@ -114,13 +114,6 @@ /* wallpaper util */ void image_to_root_window(ImageWindow *imd, gint scaled); -/* overlays */ -gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y, - gint relative, gint always); -void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y); -gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y); -void image_overlay_remove(ImageWindow *imd, gint id); - void image_set_image_as_tiles(ImageWindow *imd, gint width, gint height,