From d3bebaf731b4e1714653b50a4a861171f497b42f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Tue, 23 Jun 2009 21:10:52 -0400 Subject: [PATCH] Rename fetchProc32 to fetch_scanline_t and fetch_pixels_32_t to fetch_pixels_t --- pixman/pixman-access.c | 8 ++++---- pixman/pixman-private.h | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c index dc1c29c..1382488 100644 --- a/pixman/pixman-access.c +++ b/pixman/pixman-access.c @@ -2499,10 +2499,10 @@ fbFetchPixel32_generic_lossy (bits_image_t *pict, uint32_t *buffer, int n_pixels typedef struct { pixman_format_code_t format; - fetchProc32 fetch_scanline_raw_32; - fetchProc32 fetch_scanline_raw_64; - fetch_pixels_32_t fetch_pixels_raw_32; - fetch_pixels_32_t fetch_pixels_raw_64; + fetch_scanline_t fetch_scanline_raw_32; + fetch_scanline_t fetch_scanline_raw_64; + fetch_pixels_t fetch_pixels_raw_32; + fetch_pixels_t fetch_pixels_raw_64; store_scanline_t store_scanline_raw_32; store_scanline_t store_scanline_raw_64; } format_info_t; diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index 889493b..48f9e44 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -26,14 +26,15 @@ typedef struct radial_gradient radial_gradient_t; typedef struct bits_image bits_image_t; typedef struct circle circle_t; +typedef void (*fetch_scanline_t) (bits_image_t *pict, + int x, int y, int width, + uint32_t *buffer); +typedef void (*fetch_pixels_t) (bits_image_t *image, + uint32_t *buffer, int n_pixels); typedef void (*store_scanline_t) (bits_image_t *image, int x, int y, int width, const uint32_t *values); -typedef void (*fetchProc32) (bits_image_t *pict, - int x, int y, int width, - uint32_t *buffer); -typedef void (*fetch_pixels_32_t) (bits_image_t *image, - uint32_t *buffer, int n_pixels); + typedef void (*scanFetchProc) (pixman_image_t *, int, int, int, uint32_t *, uint32_t *, uint32_t); @@ -159,12 +160,12 @@ struct bits_image int rowstride; /* in number of uint32_t's */ /* Fetch raw pixels, with no regard for transformations, alpha map etc. */ - fetch_pixels_32_t fetch_pixels_raw_32; - fetch_pixels_32_t fetch_pixels_raw_64; + fetch_pixels_t fetch_pixels_raw_32; + fetch_pixels_t fetch_pixels_raw_64; /* Fetch raw scanlines, with no regard for transformations, alpha maps etc. */ - fetchProc32 fetch_scanline_raw_32; - fetchProc32 fetch_scanline_raw_64; + fetch_scanline_t fetch_scanline_raw_32; + fetch_scanline_t fetch_scanline_raw_64; /* Store scanlines with no regard for alpha maps */ store_scanline_t store_scanline_raw_32; -- 2.7.4