fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-02-15 02:10:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop3' into 'master'

Browse source 
miscellaneous math fixes

See merge request cairo/cairo!280
This commit is contained in:
Uli Schlachter 2022-02-20 12:09:02 +00:00
commit 2ec0a87403
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cairo-array.c
View file

@ -181,7 +181,7 @@ _cairo_array_index (cairo_array_t *array, unsigned int index)
assert (index < array->num_elements);
return array->elements + index * array->element_size;
return array->elements + (size_t)index * array->element_size;
}
/**
@ -225,7 +225,7 @@ _cairo_array_index_const (const cairo_array_t *array, unsigned int index)
assert (index < array->num_elements);
return array->elements + index * array->element_size;
return array->elements + (size_t)index * array->element_size;
}
/**
@ -289,7 +289,7 @@ _cairo_array_append_multiple (cairo_array_t *array,
if (unlikely (status))
return status;
memcpy (dest, elements, num_elements * array->element_size);
memcpy (dest, elements, (size_t)num_elements * array->element_size);
return CAIRO_STATUS_SUCCESS;
}
@ -320,7 +320,7 @@ _cairo_array_allocate (cairo_array_t *array,
assert (array->num_elements + num_elements <= array->size);
*elements = array->elements + array->num_elements * array->element_size;
*elements = array->elements + (size_t)array->num_elements * array->element_size;
array->num_elements += num_elements;
@ -412,7 +412,7 @@ void *
_cairo_user_data_array_get_data (cairo_user_data_array_t *array,
const cairo_user_data_key_t *key)
{
int i, num_slots;
unsigned int i, num_slots;
cairo_user_data_slot_t *slots;
/* We allow this to support degenerate objects such as cairo_surface_nil. */
@ -452,7 +452,7 @@ _cairo_user_data_array_set_data (cairo_user_data_array_t *array,
cairo_destroy_func_t destroy)
{
cairo_status_t status;
int i, num_slots;
unsigned int i, num_slots;
cairo_user_data_slot_t *slots, *slot, new_slot;
if (user_data) {
@ -523,7 +523,7 @@ _cairo_user_data_array_foreach (cairo_user_data_array_t *array,
void *closure)
{
cairo_user_data_slot_t *slots;
int i, num_slots;
unsigned int i, num_slots;
num_slots = array->num_elements;
slots = _cairo_array_index (array, 0);

10
src/cairo-ft-font.c
View file

@ -1194,7 +1194,7 @@ _fill_xrender_bitmap(FT_Bitmap *target,
#ifdef FT_LOAD_COLOR
case FT_PIXEL_MODE_BGRA:
for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch)
memcpy (dstLine, srcLine, width * 4);
memcpy (dstLine, srcLine, (size_t)width * 4);
break;
#endif
@ -1241,7 +1241,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
if (stride == bitmap->pitch) {
memcpy (data, bitmap->buffer, stride * height);
memcpy (data, bitmap->buffer, (size_t)stride * height);
} else {
int i;
unsigned char *source, *dest;
@ -1294,7 +1294,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
if (!data)
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
memcpy (data, bitmap->buffer, stride * height);
memcpy (data, bitmap->buffer, (size_t)stride * height);
}
format = CAIRO_FORMAT_A8;
@ -1315,7 +1315,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
if (!data)
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
memcpy (data, bitmap->buffer, stride * height);
memcpy (data, bitmap->buffer, (size_t)stride * height);
}
if (!_cairo_is_little_endian ())
@ -1371,7 +1371,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
}
}
memcpy (data, bitmap->buffer, stride * height);
memcpy (data, bitmap->buffer, (size_t)stride * height);
break;
}
/* fall through */

12
src/cairoint.h
View file

@ -351,10 +351,10 @@ static inline cairo_bool_t
_cairo_rectangle_intersects (const cairo_rectangle_int_t *dst,
const cairo_rectangle_int_t *src)
{
return !(src->x >= dst->x + (int) dst->width ||
src->x + (int) src->width <= dst->x ||
src->y >= dst->y + (int) dst->height ||
src->y + (int) src->height <= dst->y);
return !(src->x >= dst->x + dst->width ||
src->x + src->width <= dst->x ||
src->y >= dst->y + dst->height ||
src->y + src->height <= dst->y);
}
static inline cairo_bool_t
@ -362,9 +362,9 @@ _cairo_rectangle_contains_rectangle (const cairo_rectangle_int_t *a,
const cairo_rectangle_int_t *b)
{
return (a->x <= b->x &&
a->x + (int) a->width >= b->x + (int) b->width &&
a->x + a->width >= b->x + b->width &&
a->y <= b->y &&
a->y + (int) a->height >= b->y + (int) b->height);
a->y + a->height >= b->y + b->height);
}
cairo_private void