diff options
| -rw-r--r-- | boilerplate/cairo-boilerplate.c | 4 | ||||
| -rw-r--r-- | src/cairo-image-compositor.c | 4 | ||||
| -rw-r--r-- | src/cairo-image-surface-private.h | 2 | ||||
| -rw-r--r-- | src/cairo-mesh-pattern-rasterizer.c | 2 | ||||
| -rw-r--r-- | src/cairo-png.c | 2 | ||||
| -rw-r--r-- | src/cairo-script-surface.c | 3 |
6 files changed, 10 insertions, 7 deletions
diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c index 7fdbf798b..4804deaff 100644 --- a/boilerplate/cairo-boilerplate.c +++ b/boilerplate/cairo-boilerplate.c @@ -42,6 +42,7 @@ #undef CAIRO_VERSION_H #include "../cairo-version.h" +#include <stddef.h> #include <stdlib.h> #include <ctype.h> #include <assert.h> @@ -976,7 +977,8 @@ cairo_surface_t * cairo_boilerplate_image_surface_create_from_ppm_stream (FILE *file) { char format; - int width, height, stride; + int width, height; + ptrdiff_t stride; int x, y; unsigned char *data; cairo_surface_t *image = NULL; diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c index 2d25a31bb..9f4e0adad 100644 --- a/src/cairo-image-compositor.c +++ b/src/cairo-image-compositor.c @@ -1581,7 +1581,7 @@ typedef struct _cairo_image_span_renderer { pixman_image_t *src, *mask; union { struct fill { - int stride; + ptrdiff_t stride; uint8_t *data; uint32_t pixel; } fill; @@ -1600,7 +1600,7 @@ typedef struct _cairo_image_span_renderer { struct finish { cairo_rectangle_int_t extents; int src_x, src_y; - int stride; + ptrdiff_t stride; uint8_t *data; } mask; } u; diff --git a/src/cairo-image-surface-private.h b/src/cairo-image-surface-private.h index 8ca694c5e..7e78d6153 100644 --- a/src/cairo-image-surface-private.h +++ b/src/cairo-image-surface-private.h @@ -71,7 +71,7 @@ struct _cairo_image_surface { int width; int height; - int stride; + ptrdiff_t stride; int depth; unsigned owns_data : 1; diff --git a/src/cairo-mesh-pattern-rasterizer.c b/src/cairo-mesh-pattern-rasterizer.c index 1b63ca8a6..e7f0db666 100644 --- a/src/cairo-mesh-pattern-rasterizer.c +++ b/src/cairo-mesh-pattern-rasterizer.c @@ -470,7 +470,7 @@ draw_pixel (unsigned char *data, int width, int height, int stride, tg += tg >> 16; tb += tb >> 16; - *((uint32_t*) (data + y*stride + 4*x)) = ((ta << 16) & 0xff000000) | + *((uint32_t*) (data + y*(ptrdiff_t)stride + 4*x)) = ((ta << 16) & 0xff000000) | ((tr >> 8) & 0xff0000) | ((tg >> 16) & 0xff00) | (tb >> 24); } } diff --git a/src/cairo-png.c b/src/cairo-png.c index eab2537bc..5ea49f097 100644 --- a/src/cairo-png.c +++ b/src/cairo-png.c @@ -678,7 +678,7 @@ read_png (struct png_read_closure_t *png_closure) } for (i = 0; i < png_height; i++) - row_pointers[i] = &data[i * stride]; + row_pointers[i] = &data[i * (ptrdiff_t)stride]; png_read_image (png, row_pointers); png_read_end (png, info); diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c index ea0117dab..91e4baae7 100644 --- a/src/cairo-script-surface.c +++ b/src/cairo-script-surface.c @@ -1202,7 +1202,8 @@ static cairo_status_t _write_image_surface (cairo_output_stream_t *output, const cairo_image_surface_t *image) { - int stride, row, width; + int row, width; + ptrdiff_t stride; uint8_t row_stack[CAIRO_STACK_BUFFER_SIZE]; uint8_t *rowdata; uint8_t *data; |