From 01b9bd93101c7f09835d793a458689c78c3bb270 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 11 Feb 2002 19:36:12 +0000 Subject: [PATCH] Fix handing of overall alpha. Mon Feb 11 14:31:53 2002 Owen Taylor * pixops/pixops.c (bilinear_make_weights): Fix handing of overall alpha. --- gdk-pixbuf/ChangeLog | 5 +++++ gdk-pixbuf/pixops/pixops.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index c7b259670f..52461ec732 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +Mon Feb 11 14:31:53 2002 Owen Taylor + + * pixops/pixops.c (bilinear_make_weights): Fix handing of + overall alpha. + 2002-02-10 Matthias Clasen * test-loaders.c (main): Enable some tests which should work diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c index 12ba7f754c..0bcbcec011 100644 --- a/gdk-pixbuf/pixops/pixops.c +++ b/gdk-pixbuf/pixops/pixops.c @@ -1144,7 +1144,7 @@ tile_make_weights (PixopsFilter *filter, double x_scale, double y_scale, double *(pixel_weights + n_x * i + j) = weight; } - *(pixel_weights + n_x * n_y - 1) += 65536 - total; + *(pixel_weights + n_x * n_y - 1) += (int)(0.5 + 65536 * overall_alpha) - total; } } } @@ -1266,7 +1266,7 @@ bilinear_make_fast_weights (PixopsFilter *filter, double x_scale, double y_scale total += weight; } - *(pixel_weights + n_x * n_y - 1) += 65536 - total; + *(pixel_weights + n_x * n_y - 1) += (int)(0.5 + 65536 * overall_alpha) - total; } g_free (x_weights); @@ -1368,7 +1368,7 @@ bilinear_make_weights (PixopsFilter *filter, double x_scale, double y_scale, dou total += weight; } - *(pixel_weights + n_x * n_y - 1) += 65536 - total; + *(pixel_weights + n_x * n_y - 1) += (int)(0.5 + 65536 * overall_alpha) - total; } }