* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#include "config.h"
#include "gdk-pixbuf-private.h"
+#include "gdk-pixbuf-alias.h"
#include <string.h>
\f
/**
* 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.
+ * @pixbuf: A #GdkPixbuf.
+ * @substitute_color: Whether to set a color to 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.
+ * Takes an existing pixbuf and adds an alpha channel to it.
+ * If the existing pixbuf already had an alpha channel, the channel
+ * values are copied from the original; otherwise, the alpha channel
+ * is initialized to 255 (full opacity).
+ *
+ * If @substitute_color is %TRUE, then the color specified by (@r, @g, @b) will be
+ * assigned zero opacity. That is, if you pass (255, 255, 255) for the
+ * substitute color, all white pixels will become fully transparent.
*
* Return value: A newly-created pixbuf with a reference count of 1.
**/
GdkPixbuf *new_pixbuf;
int x, y;
- g_return_val_if_fail (pixbuf != NULL, NULL);
+ g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), 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 (!new_pixbuf)
return NULL;
- return new_pixbuf;
- }
-
- new_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, pixbuf->width, pixbuf->height);
+ if (!substitute_color)
+ return new_pixbuf;
+ } else {
+ new_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, pixbuf->width, pixbuf->height);
+ }
+
if (!new_pixbuf)
return NULL;
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;
+
+ if (pixbuf->has_alpha) {
+ /* Just subst color, we already copied everything else */
+ for (x = 0; x < pixbuf->width; x++) {
+ if (src[0] == r && src[1] == g && src[2] == b)
+ dest[3] = 0;
+ src += 4;
+ dest += 4;
+ }
+ } else {
+ 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;
+ }
}
}
*
* Copies a rectangular area from @src_pixbuf to @dest_pixbuf. Conversion of
* pixbuf formats is done automatically.
+ *
+ * If the source rectangle overlaps the destination rectangle on the
+ * same pixbuf, it will be overwritten during the copy operation.
+ * Therefore, you can not use this function to scroll a pixbuf.
**/
void
gdk_pixbuf_copy_area (const GdkPixbuf *src_pixbuf,
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);
+ g_return_if_fail (!(gdk_pixbuf_get_has_alpha (src_pixbuf) && !gdk_pixbuf_get_has_alpha (dest_pixbuf)));
+
/* This will perform format conversions automatically */
gdk_pixbuf_scale (src_pixbuf,
-#define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11)
-
/**
* gdk_pixbuf_saturate_and_pixelate:
* @src: source image
* @saturation: saturation factor
* @pixelate: whether to pixelate
*
- * Modifies saturation and optionally pixelates @src, placing the
- * result in @dest. @src and @dest may be the same pixbuf with no ill
- * effects. If @saturation is 1.0 then saturation is not changed. If
- * it's less than 1.0, saturation is reduced (the image is darkened);
- * if greater than 1.0, saturation is increased (the image is
- * brightened). If @pixelate is TRUE, then pixels are faded in a
- * checkerboard pattern to create a pixelated image. @src and @dest
- * must have the same image format, size, and rowstride.
+ * Modifies saturation and optionally pixelates @src, placing the result in
+ * @dest. @src and @dest may be the same pixbuf with no ill effects. If
+ * @saturation is 1.0 then saturation is not changed. If it's less than 1.0,
+ * saturation is reduced (the image turns toward grayscale); if greater than
+ * 1.0, saturation is increased (the image gets more vivid colors). If @pixelate
+ * is %TRUE, then pixels are faded in a checkerboard pattern to create a
+ * pixelated image. @src and @dest must have the same image format, size, and
+ * rowstride.
*
**/
void
g_return_if_fail (GDK_IS_PIXBUF (dest));
g_return_if_fail (gdk_pixbuf_get_height (src) == gdk_pixbuf_get_height (dest));
g_return_if_fail (gdk_pixbuf_get_width (src) == gdk_pixbuf_get_width (dest));
- g_return_if_fail (gdk_pixbuf_get_rowstride (src) == gdk_pixbuf_get_rowstride (dest));
+ g_return_if_fail (gdk_pixbuf_get_has_alpha (src) == gdk_pixbuf_get_has_alpha (dest));
g_return_if_fail (gdk_pixbuf_get_colorspace (src) == gdk_pixbuf_get_colorspace (dest));
if (saturation == 1.0 && !pixelate) {
if (dest != src)
- memcpy (gdk_pixbuf_get_pixels (dest),
- gdk_pixbuf_get_pixels (src),
- gdk_pixbuf_get_height (src) * gdk_pixbuf_get_rowstride (src));
-
- return;
+ gdk_pixbuf_copy_area (src, 0, 0,
+ gdk_pixbuf_get_width (src),
+ gdk_pixbuf_get_height (src),
+ dest, 0, 0);
} else {
- gint i, j;
- gint width, height, has_alpha, rowstride;
- guchar *target_pixels;
- guchar *original_pixels;
- guchar *current_pixel;
+ int i, j, t;
+ int width, height, has_alpha, src_rowstride, dest_rowstride, bytes_per_pixel;
+ guchar *src_line;
+ guchar *dest_line;
+ guchar *src_pixel;
+ guchar *dest_pixel;
guchar intensity;
has_alpha = gdk_pixbuf_get_has_alpha (src);
+ bytes_per_pixel = has_alpha ? 4 : 3;
width = gdk_pixbuf_get_width (src);
height = gdk_pixbuf_get_height (src);
- rowstride = gdk_pixbuf_get_rowstride (src);
+ src_rowstride = gdk_pixbuf_get_rowstride (src);
+ dest_rowstride = gdk_pixbuf_get_rowstride (dest);
- target_pixels = gdk_pixbuf_get_pixels (dest);
- original_pixels = gdk_pixbuf_get_pixels (src);
-
- for (i = 0; i < height; i++) {
- for (j = 0; j < width; j++) {
- current_pixel = original_pixels + i*rowstride + j*(has_alpha?4:3);
- intensity = INTENSITY (*(current_pixel), *(current_pixel + 1), *(current_pixel + 2));
- if (pixelate && (i+j)%2 == 0) {
- *(target_pixels + i*rowstride + j*(has_alpha?4:3)) = intensity/2 + 127;
- *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 1) = intensity/2 + 127;
- *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 2) = intensity/2 + 127;
- } else if (pixelate) {
+ src_line = gdk_pixbuf_get_pixels (src);
+ dest_line = gdk_pixbuf_get_pixels (dest);
+
#define DARK_FACTOR 0.7
- *(target_pixels + i*rowstride + j*(has_alpha?4:3)) =
- (guchar) (((1.0 - saturation) * intensity
- + saturation * (*(current_pixel)))) * DARK_FACTOR;
- *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 1) =
- (guchar) (((1.0 - saturation) * intensity
- + saturation * (*(current_pixel + 1)))) * DARK_FACTOR;
- *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 2) =
- (guchar) (((1.0 - saturation) * intensity
- + saturation * (*(current_pixel + 2)))) * DARK_FACTOR;
+#define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11)
+#define CLAMP_UCHAR(v) (t = (v), CLAMP (t, 0, 255))
+#define SATURATE(v) ((1.0 - saturation) * intensity + saturation * (v))
+
+ for (i = 0 ; i < height ; i++) {
+ src_pixel = src_line;
+ src_line += src_rowstride;
+ dest_pixel = dest_line;
+ dest_line += dest_rowstride;
+
+ for (j = 0 ; j < width ; j++) {
+ intensity = INTENSITY (src_pixel[0], src_pixel[1], src_pixel[2]);
+ if (pixelate && (i + j) % 2 == 0) {
+ dest_pixel[0] = intensity / 2 + 127;
+ dest_pixel[1] = intensity / 2 + 127;
+ dest_pixel[2] = intensity / 2 + 127;
+ } else if (pixelate) {
+ dest_pixel[0] = CLAMP_UCHAR ((SATURATE (src_pixel[0])) * DARK_FACTOR);
+ dest_pixel[1] = CLAMP_UCHAR ((SATURATE (src_pixel[1])) * DARK_FACTOR);
+ dest_pixel[2] = CLAMP_UCHAR ((SATURATE (src_pixel[2])) * DARK_FACTOR);
} else {
- *(target_pixels + i*rowstride + j*(has_alpha?4:3)) =
- (guchar) ((1.0 - saturation) * intensity
- + saturation * (*(current_pixel)));
- *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 1) =
- (guchar) ((1.0 - saturation) * intensity
- + saturation * (*(current_pixel + 1)));
- *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 2) =
- (guchar) ((1.0 - saturation) * intensity
- + saturation * (*(current_pixel + 2)));
+ dest_pixel[0] = CLAMP_UCHAR (SATURATE (src_pixel[0]));
+ dest_pixel[1] = CLAMP_UCHAR (SATURATE (src_pixel[1]));
+ dest_pixel[2] = CLAMP_UCHAR (SATURATE (src_pixel[2]));
}
-
+
if (has_alpha)
- *(target_pixels + i*rowstride + j*(has_alpha?4:3) + 3) = *(current_pixel + 3);
- }
+ dest_pixel[3] = src_pixel[3];
+
+ src_pixel += bytes_per_pixel;
+ dest_pixel += bytes_per_pixel;
+ }
}
+ }
+}
+
- return;
+/**
+ * gdk_pixbuf_apply_embedded_orientation:
+ * @src: A #GdkPixbuf.
+ *
+ * Takes an existing pixbuf and checks for the presence of an
+ * associated "orientation" option, which may be provided by the
+ * jpeg loader (which reads the exif orientation tag) or the
+ * tiff loader (which reads the tiff orientation tag, and
+ * compensates it for the partial transforms performed by
+ * libtiff). If an orientation option/tag is present, the
+ * appropriate transform will be performed so that the pixbuf
+ * is oriented correctly.
+ *
+ * Return value: A newly-created pixbuf, or a reference to the
+ * input pixbuf (with an increased reference count).
+ *
+ * Since: 2.12
+ **/
+GdkPixbuf *
+gdk_pixbuf_apply_embedded_orientation (GdkPixbuf *src)
+{
+ const gchar *orientation_string;
+ int transform = 0;
+ GdkPixbuf *temp;
+ GdkPixbuf *dest;
+
+ g_return_val_if_fail (GDK_IS_PIXBUF (src), NULL);
+
+ /* Read the orientation option associated with the pixbuf */
+ orientation_string = gdk_pixbuf_get_option (src, "orientation");
+
+ if (orientation_string) {
+ /* If an orientation option was found, convert the
+ orientation string into an integer. */
+ transform = (int) g_ascii_strtoll (orientation_string, NULL, 10);
+ }
+
+ /* Apply the actual transforms, which involve rotations and flips.
+ The meaning of orientation values 1-8 and the required transforms
+ are defined by the TIFF and EXIF (for JPEGs) standards. */
+ switch (transform) {
+ case 1:
+ dest = src;
+ g_object_ref (dest);
+ break;
+ case 2:
+ dest = gdk_pixbuf_flip (src, TRUE);
+ break;
+ case 3:
+ dest = gdk_pixbuf_rotate_simple (src, GDK_PIXBUF_ROTATE_UPSIDEDOWN);
+ break;
+ case 4:
+ dest = gdk_pixbuf_flip (src, FALSE);
+ break;
+ case 5:
+ temp = gdk_pixbuf_rotate_simple (src, GDK_PIXBUF_ROTATE_CLOCKWISE);
+ dest = gdk_pixbuf_flip (temp, TRUE);
+ g_object_unref (temp);
+ break;
+ case 6:
+ dest = gdk_pixbuf_rotate_simple (src, GDK_PIXBUF_ROTATE_CLOCKWISE);
+ break;
+ case 7:
+ temp = gdk_pixbuf_rotate_simple (src, GDK_PIXBUF_ROTATE_CLOCKWISE);
+ dest = gdk_pixbuf_flip (temp, FALSE);
+ g_object_unref (temp);
+ break;
+ case 8:
+ dest = gdk_pixbuf_rotate_simple (src, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE);
+ break;
+ default:
+ /* if no orientation tag was present */
+ dest = src;
+ g_object_ref (dest);
+ break;
}
+
+ return dest;
}
+
+
+#define __GDK_PIXBUF_UTIL_C__
+#include "gdk-pixbuf-aliasdef.c"
+
projects / ~andy / gtk / blobdiff