mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-18 09:00:34 +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.
134 lines
4.2 KiB
C
134 lines
4.2 KiB
C
/* GdkPixbuf library - Utilities and miscellaneous convenience functions
|
||
*
|
||
* Copyright (C) 1999 The Free Software Foundation
|
||
*
|
||
* Authors: Federico Mena-Quintero <federico@gimp.org>
|
||
* Cody Russell <bratsche@dfw.net>
|
||
*
|
||
* This library is free software; you can redistribute it and/or
|
||
* modify it under the terms of the GNU Library General Public
|
||
* License as published by the Free Software Foundation; either
|
||
* version 2 of the License, or (at your option) any later version.
|
||
*
|
||
* This library is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
* Library General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU Library General Public
|
||
* License along with this library; if not, write to the
|
||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
* Boston, MA 02111-1307, USA.
|
||
*/
|
||
|
||
#include <config.h>
|
||
#include "gdk-pixbuf-private.h"
|
||
|
||
|
||
|
||
/**
|
||
* gdk_pixbuf_add_alpha:
|
||
* @pixbuf: A pixbuf.
|
||
* @substitute_color: Whether to substitute a color for zero opacity. If this
|
||
* is #FALSE, then the (@r, @g, @b) arguments will be ignored.
|
||
* @r: Red value to substitute.
|
||
* @g: Green value to substitute.
|
||
* @b: Blue value to substitute.
|
||
*
|
||
* Takes an existing pixbuf and adds an alpha channel to it. If the original
|
||
* pixbuf already had alpha information, then the contents of the new pixbuf are
|
||
* exactly the same as the original's. Otherwise, the new pixbuf will have all
|
||
* pixels with full opacity if @substitute_color is #FALSE. If
|
||
* @substitute_color is #TRUE, then the color specified by (@r, @g, @b) will be
|
||
* substituted for zero opacity.
|
||
*
|
||
* Return value: A newly-created pixbuf with a reference count of 1.
|
||
**/
|
||
GdkPixbuf *
|
||
gdk_pixbuf_add_alpha (const GdkPixbuf *pixbuf,
|
||
gboolean substitute_color, guchar r, guchar g, guchar b)
|
||
{
|
||
GdkPixbuf *new_pixbuf;
|
||
int x, y;
|
||
|
||
g_return_val_if_fail (pixbuf != NULL, NULL);
|
||
g_return_val_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB, NULL);
|
||
g_return_val_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4, NULL);
|
||
g_return_val_if_fail (pixbuf->bits_per_sample == 8, NULL);
|
||
|
||
if (pixbuf->has_alpha) {
|
||
new_pixbuf = gdk_pixbuf_copy (pixbuf);
|
||
if (!new_pixbuf)
|
||
return NULL;
|
||
|
||
return new_pixbuf;
|
||
}
|
||
|
||
new_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, pixbuf->width, pixbuf->height);
|
||
if (!new_pixbuf)
|
||
return NULL;
|
||
|
||
for (y = 0; y < pixbuf->height; y++) {
|
||
guchar *src, *dest;
|
||
guchar tr, tg, tb;
|
||
|
||
src = pixbuf->pixels + y * pixbuf->rowstride;
|
||
dest = new_pixbuf->pixels + y * new_pixbuf->rowstride;
|
||
|
||
for (x = 0; x < pixbuf->width; x++) {
|
||
tr = *dest++ = *src++;
|
||
tg = *dest++ = *src++;
|
||
tb = *dest++ = *src++;
|
||
|
||
if (substitute_color && tr == r && tg == g && tb == b)
|
||
*dest++ = 0;
|
||
else
|
||
*dest++ = 255;
|
||
}
|
||
}
|
||
|
||
return new_pixbuf;
|
||
}
|
||
|
||
/**
|
||
* gdk_pixbuf_copy_area:
|
||
* @src_pixbuf: Source pixbuf.
|
||
* @src_x: Source X coordinate within @src_pixbuf.
|
||
* @src_y: Source Y coordinate within @src_pixbuf.
|
||
* @width: Width of the area to copy.
|
||
* @height: Height of the area to copy.
|
||
* @dest_pixbuf: Destination pixbuf.
|
||
* @dest_x: X coordinate within @dest_pixbuf.
|
||
* @dest_y: Y coordinate within @dest_pixbuf.
|
||
*
|
||
* Copies a rectangular area from @src_pixbuf to @dest_pixbuf. Conversion of
|
||
* pixbuf formats is done automatically.
|
||
**/
|
||
void
|
||
gdk_pixbuf_copy_area (const GdkPixbuf *src_pixbuf,
|
||
int src_x, int src_y,
|
||
int width, int height,
|
||
GdkPixbuf *dest_pixbuf,
|
||
int dest_x, int dest_y)
|
||
{
|
||
g_return_if_fail (src_pixbuf != NULL);
|
||
g_return_if_fail (dest_pixbuf != NULL);
|
||
|
||
g_return_if_fail (src_x >= 0 && src_x + width <= src_pixbuf->width);
|
||
g_return_if_fail (src_y >= 0 && src_y + height <= src_pixbuf->height);
|
||
|
||
g_return_if_fail (dest_x >= 0 && dest_x + width <= dest_pixbuf->width);
|
||
g_return_if_fail (dest_y >= 0 && dest_y + height <= dest_pixbuf->height);
|
||
|
||
/* This will perform format conversions automatically */
|
||
|
||
gdk_pixbuf_scale (src_pixbuf,
|
||
dest_pixbuf,
|
||
dest_x, dest_y,
|
||
width, height,
|
||
(double) (dest_x - src_x),
|
||
(double) (dest_y - src_y),
|
||
1.0, 1.0,
|
||
GDK_INTERP_NEAREST);
|
||
}
|