[gthumb] renamed _cairo_multiply to _cairo_multiply_alpha
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] renamed _cairo_multiply to _cairo_multiply_alpha
- Date: Thu, 28 Apr 2011 13:20:02 +0000 (UTC)
commit 768c88c49e84aa7943fc2bf239f8d0d9c5b4d6fd
Author: Paolo Bacchilega <paobac src gnome org>
Date: Thu Apr 28 14:54:44 2011 +0200
renamed _cairo_multiply to _cairo_multiply_alpha
gthumb/cairo-utils.c | 10 +++++-----
gthumb/cairo-utils.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gthumb/cairo-utils.c b/gthumb/cairo-utils.c
index 6df2744..f5ed20f 100644
--- a/gthumb/cairo-utils.c
+++ b/gthumb/cairo-utils.c
@@ -53,8 +53,8 @@ surface_pixels_free (void *data)
inline int
-_cairo_multiply (int color,
- int alpha)
+_cairo_multiply_alpha (int color,
+ int alpha)
{
int temp = (alpha * color) + 0x80;
return ((temp + (temp >> 8)) >> 8);
@@ -268,9 +268,9 @@ _cairo_image_surface_create_from_pixbuf (GdkPixbuf *pixbuf)
pixel = 0;
}
else {
- r = _cairo_multiply (p_iter[0], a);
- g = _cairo_multiply (p_iter[1], a);
- b = _cairo_multiply (p_iter[2], a);
+ r = _cairo_multiply_alpha (p_iter[0], a);
+ g = _cairo_multiply_alpha (p_iter[1], a);
+ b = _cairo_multiply_alpha (p_iter[2], a);
pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, a);
}
memcpy (s_iter, &pixel, sizeof (guint32));
diff --git a/gthumb/cairo-utils.h b/gthumb/cairo-utils.h
index 9270e8c..46ffa9d 100644
--- a/gthumb/cairo-utils.h
+++ b/gthumb/cairo-utils.h
@@ -129,7 +129,7 @@ extern const unsigned char cairo_channel[4];
/* math */
-int _cairo_multiply (int color,
+int _cairo_multiply_alpha (int color,
int alpha);
/* colors */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]