mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-20 14:00:10 +00:00
829ed02435
2000-04-11 Federico Mena Quintero <federico@helixcode.com> 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.
105 lines
2.5 KiB
C
105 lines
2.5 KiB
C
/* FIXME FIXME FIXME
|
|
*
|
|
* This file is not being used. The gdk_pixbuf_scale() here is not useful
|
|
* anymore, since we have the new functions in gdk-pixbuf-scale.c.
|
|
*
|
|
* The rotation function needs to be implemented without libart if it is
|
|
* to go inside the GdkPixbuf library.
|
|
*/
|
|
|
|
GdkPixbuf *
|
|
gdk_pixbuf_scale (const GdkPixbuf *pixbuf, gint w, gint h)
|
|
{
|
|
guchar *pixels;
|
|
gint rowstride;
|
|
double affine[6];
|
|
ArtAlphaGamma *alphagamma;
|
|
ArtPixBuf *art_pixbuf = NULL;
|
|
GdkPixbuf *copy = NULL;
|
|
|
|
alphagamma = NULL;
|
|
|
|
affine[1] = affine[2] = affine[4] = affine[5] = 0;
|
|
|
|
affine[0] = w / (double)(pixbuf->width);
|
|
affine[3] = h / (double)(pixbuf->height);
|
|
|
|
/* rowstride = w * pixbuf->n_channels; */
|
|
rowstride = w * 3;
|
|
|
|
pixels = art_alloc (h * rowstride);
|
|
art_rgb_pixbuf_affine (pixels, 0, 0, w, h, rowstride,
|
|
pixbuf->art_pixbuf,
|
|
affine, ART_FILTER_NEAREST, alphagamma);
|
|
|
|
if (pixbuf->art_pixbuf->has_alpha)
|
|
/* should be rgba */
|
|
art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride);
|
|
else
|
|
art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride);
|
|
|
|
copy = gdk_pixbuf_new (art_pixbuf, NULL);
|
|
|
|
if (!copy)
|
|
art_free (pixels);
|
|
|
|
return copy;
|
|
}
|
|
|
|
GdkPixbuf *
|
|
gdk_pixbuf_rotate (GdkPixbuf *pixbuf, gdouble angle)
|
|
{
|
|
art_u8 *pixels;
|
|
gint rowstride, w, h;
|
|
gdouble rad;
|
|
double rot[6], trans[6], affine[6];
|
|
ArtAlphaGamma *alphagamma = NULL;
|
|
ArtPixBuf *art_pixbuf = NULL;
|
|
|
|
w = pixbuf->art_pixbuf->width;
|
|
h = pixbuf->art_pixbuf->height;
|
|
|
|
rad = (M_PI * angle / 180.0);
|
|
|
|
rot[0] = cos(rad);
|
|
rot[1] = sin(rad);
|
|
rot[2] = -sin(rad);
|
|
rot[3] = cos(rad);
|
|
rot[4] = rot[5] = 0;
|
|
|
|
trans[0] = trans[3] = 1;
|
|
trans[1] = trans[2] = 0;
|
|
trans[4] = -(double)w / 2.0;
|
|
trans[5] = -(double)h / 2.0;
|
|
|
|
art_affine_multiply(rot, trans, rot);
|
|
|
|
trans[0] = trans[3] = 1;
|
|
trans[1] = trans[2] = 0;
|
|
trans[4] = (double)w / 2.0;
|
|
trans[5] = (double)h / 2.0;
|
|
|
|
art_affine_multiply(affine, rot, trans);
|
|
/*
|
|
g_print("Affine: %e %e %e %e %e %e\n", affine[0], affine[1], affine[2],
|
|
affine[3], affine[4], affine[5]);
|
|
*/
|
|
/* rowstride = w * pixbuf->art_pixbuf->n_channels; */
|
|
rowstride = w * 3;
|
|
|
|
pixels = art_alloc (h * rowstride);
|
|
art_rgb_pixbuf_affine (pixels, 0, 0, w, h, rowstride,
|
|
pixbuf->art_pixbuf,
|
|
affine, ART_FILTER_NEAREST, alphagamma);
|
|
if (pixbuf->art_pixbuf->has_alpha)
|
|
/* should be rgba */
|
|
art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride);
|
|
else
|
|
art_pixbuf = art_pixbuf_new_rgb(pixels, w, h, rowstride);
|
|
|
|
art_pixbuf_free (pixbuf->art_pixbuf);
|
|
pixbuf->art_pixbuf = art_pixbuf;
|
|
|
|
return pixbuf;
|
|
}
|