From 829ed02435b643c2b3da57dfc1f5abb8124e55cc Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 11 Apr 2000 07:03:25 +0000 Subject: Most of this patch is based on a patch by Havoc Pennington (hp@redhat.com) 2000-04-11 Federico Mena Quintero Most of this patch is based on a patch by Havoc Pennington (hp@redhat.com) to make GdkPixbuf's structures opaque and to remove the libart dependency. * gdk-pixbuf/gdk-pixbuf.h: Removed the public structures. (GdkColorspace): New enum that for now only contains GDK_COLORSPACE_RGB. (GdkPixbufDestroyNotify): New type for the pixbuf's pixels destroy notification function. (GdkInterpType): New num with interpolation types. * *.[ch]: Replace the libart stuff with our own stuff. * pixops/*.[ch]: Likewise. * gdk-pixbuf/gdk-pixbuf-private.h: New file with the private declarations of the GdkPixbuf structures. * gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_new_from_art_pixbuf): Removed function. (gdk_pixbuf_get_format): Constify. (gdk_pixbuf_get_n_channels): Constify. (gdk_pixbuf_get_has_alpha): Constify. (gdk_pixbuf_get_bits_per_sample): Constify. (gdk_pixbuf_get_pixels): Constify. (gdk_pixbuf_get_width): Constify. (gdk_pixbuf_get_height): Constify. (gdk_pixbuf_get_rowstride): Constify. * gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_copy): New function to copy a pixbuf. * gdk-pixbuf/gdk-pixbuf-data.c (gdk_pixbuf_new_from_data): Added a bits_per_sample argument; currently only 8 bits per sample are supported. * gdk-pixbuf/gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_pixbuf): New accessor. (gdk_pixbuf_frame_get_x_offset): New accessor. (gdk_pixbuf_frame_get_y_offset): New accessor. (gdk_pixbuf_frame_get_delay_time): New accessor. (gdk_pixbuf_frame_get_action): New accessor. * gdk-pixbuf/gdk-pixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask): Instead of returning a solid mask rectangle for pixbufs without an alpha channel, set the *mask_return to NULL. * gdk-pixbuf/gdk-pixbuf-util.c (gdk_pixbuf_add_alpha): Constify. * gdk-pixbuf/gdk-pixbuf-scale.c: Fix includes. * gdk-pixbuf/gdk-pixbuf-scale.c (gdk_pixbuf_scale): Added some preconditions. Maybe we should also check for the colorspace, bits per pixel, and such. (gdk_pixbuf_composite): Likewise. (gdk_pixbuf_composite_color): Likewise. (gdk_pixbuf_scale_simple): Likewise, and fail gracefully if we cannot allocate the new pixbuf. (gdk_pixbuf_composite_color_simple): Likewise. * gdk-pixbuf/gnome-canvas-pixbuf.c (gnome_canvas_pixbuf_render): Use art_rgb_rgba_affine() or art_rgb_affine() since we no longer have an ArtPixBuf. * gdk-pixbuf/io-bmp.c: Fix includes. * gdk-pixbuf/pixops/pixops.c (pixops_scale_nearest): Fixed cast in an lvalue. * TODO: Populated. * configure.in: Removed checks for libart. * gdk-pixbuf/Makefile.am: Removed references to libart. (noinst_HEADERS): Added gdk-pixbuf-private.h. * gdk-pixbuf/Makefile.am (libgdk_pixbuf_la_LDFLAGS): Incremented the version number of the libtool library to indicate that this definitely is not compatible with the old usage. I know you love me. I know you do. * configure.in: Bumped version number to 0.7.0. * README: Updated. * gdk-pixbuf-config.in (--libs): We no longer require libart. * DEPENDS.libgdk_pixbuf: We no longer depend on libart. * gdk-pixbuf.spec.in: Updated, but I don't guarantee anything. --- demos/testpixbuf-drawable.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'demos/testpixbuf-drawable.c') diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c index a465aa4c82..c250f2dfb3 100644 --- a/demos/testpixbuf-drawable.c +++ b/demos/testpixbuf-drawable.c @@ -15,7 +15,7 @@ int expose_cb(GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data) pixbuf = (GdkPixbuf *) gtk_object_get_data(GTK_OBJECT(drawing_area), "pixbuf"); - if(pixbuf->art_pixbuf->has_alpha) + if(gdk_pixbuf_get_has_alpha (pixbuf)) { gdk_draw_rgb_32_image(drawing_area->window, drawing_area->style->black_gc, @@ -23,10 +23,10 @@ int expose_cb(GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data) evt->area.width, evt->area.height, GDK_RGB_DITHER_MAX, - pixbuf->art_pixbuf->pixels + - (evt->area.y * pixbuf->art_pixbuf->rowstride) + - (evt->area.x * pixbuf->art_pixbuf->n_channels), - pixbuf->art_pixbuf->rowstride); + gdk_pixbuf_get_pixels (pixbuf) + + (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) + + (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)), + gdk_pixbuf_get_rowstride (pixbuf)); } else { @@ -36,10 +36,10 @@ int expose_cb(GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data) evt->area.width, evt->area.height, GDK_RGB_DITHER_NORMAL, - pixbuf->art_pixbuf->pixels + - (evt->area.y * pixbuf->art_pixbuf->rowstride) + - (evt->area.x * pixbuf->art_pixbuf->n_channels), - pixbuf->art_pixbuf->rowstride); + gdk_pixbuf_get_pixels (pixbuf) + + (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) + + (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)), + gdk_pixbuf_get_rowstride (pixbuf)); } return FALSE; } @@ -52,7 +52,7 @@ int configure_cb(GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data) "pixbuf"); g_print("X:%d Y:%d\n", evt->width, evt->height); - if(evt->width != pixbuf->art_pixbuf->width || evt->height != pixbuf->art_pixbuf->height) + if(evt->width != gdk_pixbuf_get_width (pixbuf) || evt->height != gdk_pixbuf_get_height (pixbuf)) { GdkWindow *root; GdkPixbuf *new_pixbuf; @@ -97,8 +97,8 @@ int main(int argc, char **argv) drawing_area = gtk_drawing_area_new(); gtk_drawing_area_size(GTK_DRAWING_AREA(drawing_area), - pixbuf->art_pixbuf->width, - pixbuf->art_pixbuf->height); + gdk_pixbuf_get_width (pixbuf), + gdk_pixbuf_get_height (pixbuf)); gtk_signal_connect(GTK_OBJECT(drawing_area), "expose_event", GTK_SIGNAL_FUNC(expose_cb), NULL); -- cgit v1.2.1