mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 10:50:10 +00:00
Changed the functions to return GdkPixBuf* instead of ArtPixBuf*.
This commit is contained in:
parent
2453bc3cca
commit
c512d3864c
@ -11,6 +11,9 @@
|
||||
* src/gdk-pixbuf-drawable.c: Added #include "gdk-pixbuf-drawable.h"
|
||||
to fix compilation.
|
||||
|
||||
* src/gdk-pixbuf-drawable.[ch]: Changed functions to return
|
||||
GdkPixBuf* instead of ArtPixBuf*.
|
||||
|
||||
1999-09-22 Michael Meeks <michael@nuclecu.unam.mx>
|
||||
|
||||
* src/gdk-pixbuf.c (gdk_pixbuf_new): created.
|
||||
|
@ -1,12 +1,14 @@
|
||||
#ifndef _GDK_PIXBUF_DRAWABLE_H_
|
||||
#define _GDK_PIXBUF_DRAWABLE_H_
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
#include <gdk-pixbuf.h>
|
||||
|
||||
ArtPixBuf *art_pixbuf_rgb_from_drawable (GdkWindow *window,
|
||||
GdkPixBuf *gdk_pixbuf_rgb_from_drawable (GdkWindow *window,
|
||||
gint x, gint y,
|
||||
gint width, gint height);
|
||||
ArtPixBuf *art_pixbuf_rgba_from_drawable (GdkWindow *window,
|
||||
gint x, gint y,
|
||||
gint width, gint height);
|
||||
#endif
|
||||
GdkPixBuf *gdk_pixbuf_rgba_from_drawable (GdkWindow *window,
|
||||
gint x, gint y,
|
||||
gint width, gint height);
|
||||
|
||||
#endif /* _GDK_PIXBUF_DRAWABLE_H_ */
|
||||
|
@ -14,8 +14,8 @@
|
||||
|
||||
/* private function */
|
||||
|
||||
static ArtPixBuf *
|
||||
art_pixbuf_from_drawable_core (GdkWindow *window,
|
||||
static GdkPixBuf *
|
||||
gdk_pixbuf_from_drawable_core (GdkWindow *window,
|
||||
gint x, gint y,
|
||||
gint width, gint height,
|
||||
gint with_alpha)
|
||||
@ -113,24 +113,26 @@ art_pixbuf_from_drawable_core (GdkWindow *window,
|
||||
g_error ("art_pixbuf_from_drawable_core (): Unknown depth.");
|
||||
}
|
||||
|
||||
return with_alpha ? art_pixbuf_new_rgba (buff, width, height, rowstride) :
|
||||
art_pixbuf = with_alpha ? art_pixbuf_new_rgba (buff, width, height, rowstride) :
|
||||
art_pixbuf_new_rgb (buff, width, height, rowstride);
|
||||
|
||||
return gdk_pixbuf_new(art_pixbuf, NULL);
|
||||
}
|
||||
|
||||
/* Public functions */
|
||||
|
||||
ArtPixBuf *
|
||||
art_pixbuf_rgb_from_drawable (GdkWindow *window,
|
||||
GdkPixBuf *
|
||||
gdk_pixbuf_rgb_from_drawable (GdkWindow *window,
|
||||
gint x, gint y,
|
||||
gint width, gint height)
|
||||
{
|
||||
return art_pixbuf_from_drawable_core (window, x, y, width, height, 0);
|
||||
return gdk_pixbuf_from_drawable_core (window, x, y, width, height, 0);
|
||||
}
|
||||
|
||||
ArtPixBuf *
|
||||
art_pixbuf_rgba_from_drawable (GdkWindow *window,
|
||||
GdkPixBuf *
|
||||
gdk_pixbuf_rgba_from_drawable (GdkWindow *window,
|
||||
gint x, gint y,
|
||||
gint width, gint height)
|
||||
{
|
||||
return art_pixbuf_from_drawable_core (window, x, y, width, height, 1);
|
||||
return gdk_pixbuf_from_drawable_core (window, x, y, width, height, 1);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user