Fix integer overflow for the values passed to the pixel functions.

Fri Jan 11 18:05:07 2002  Owen Taylor  <otaylor@redhat.com>

	* pixops/pixops.c: Fix integer overflow for the values
	passed to the pixel functions. (#55148)
This commit is contained in:
Owen Taylor
2002-01-11 23:08:44 +00:00
committed by Owen Taylor
parent a458dd72e5
commit dee2b1e0b2
2 changed files with 9 additions and 4 deletions

View File

@@ -1,3 +1,8 @@
Fri Jan 11 18:05:07 2002 Owen Taylor <otaylor@redhat.com>
* pixops/pixops.c: Fix integer overflow for the values
passed to the pixel functions. (#55148)
Fri Jan 11 17:53:58 2002 Owen Taylor <otaylor@redhat.com>
* pixops/pixops.c (pixops_scale_nearest): Remove meaningless

View File

@@ -30,7 +30,7 @@ typedef guchar *(*PixopsLineFunc) (int *weights, int n_x, int n_y,
typedef void (*PixopsPixelFunc) (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
int src_has_alpha, int check_size, guint32 color1,
guint32 color2,
int r, int g, int b, int a);
guint r, guint g, guint b, guint a);
static int
get_check_shift (int check_size)
@@ -343,7 +343,7 @@ pixops_composite_color_nearest (guchar *dest_buf,
static void
composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
int src_has_alpha, int check_size, guint32 color1, guint32 color2,
int r, int g, int b, int a)
guint r, guint g, guint b, guint a)
{
if (dest_has_alpha)
{
@@ -547,7 +547,7 @@ composite_line_22_4a4_mmx_stub (int *weights, int n_x, int n_y,
static void
composite_pixel_color (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
int src_has_alpha, int check_size, guint32 color1, guint32 color2,
int r, int g, int b, int a)
guint r, guint g, guint b, guint a)
{
int dest_r, dest_g, dest_b;
int check_shift = get_check_shift (check_size);
@@ -693,7 +693,7 @@ composite_line_color_22_4a4_mmx_stub (int *weights, int n_x, int n_y,
static void
scale_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha,
int src_has_alpha, int check_size, guint32 color1, guint32 color2,
int r, int g, int b, int a)
guint r, guint g, guint b, guint a)
{
if (src_has_alpha)
{