pixman: Branch 'master' - 3 commits
Søren Sandmann Pedersen
sandmann at kemper.freedesktop.org
Mon Jul 27 05:16:07 PDT 2009
pixman/pixman-access.c | 268 ++++++++++++++++++++--------------------
pixman/pixman-bits-image.c | 29 +---
pixman/pixman-general.c | 2
pixman/pixman-image.c | 6
pixman/pixman-linear-gradient.c | 2
pixman/pixman-private.h | 18 +-
pixman/pixman-solid-fill.c | 2
pixman/pixman-utils.c | 6
8 files changed, 164 insertions(+), 169 deletions(-)
New commits:
commit fdd01bcbd473f7a46c66ce8538657e32400974ed
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date: Wed Jul 22 04:51:08 2009 -0400
Remove a couple of unused variables
diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
index 2fd621f..b57299c 100644
--- a/pixman/pixman-bits-image.c
+++ b/pixman/pixman-bits-image.c
@@ -527,14 +527,9 @@ bits_image_fetch_transformed (pixman_image_t * image,
uint32_t tmp_buffer[2 * N_TMP_PIXELS];
pixman_vector_t unit;
pixman_vector_t v;
- uint32_t *bits;
- int32_t stride;
int32_t *coords;
int i;
- bits = image->bits.bits;
- stride = image->bits.rowstride;
-
/* reference point is the center of the pixel */
v.vector[0] = pixman_int_to_fixed (x) + pixman_fixed_1 / 2;
v.vector[1] = pixman_int_to_fixed (y) + pixman_fixed_1 / 2;
commit 845910c200db3f279229da67fbd330d903776777
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date: Wed Jul 22 04:32:07 2009 -0400
Rename source_pict_class_t to source_image_class_t
diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index 6414b01..3ead3da 100644
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -73,7 +73,7 @@ general_composite_rect (pixman_implementation_t *imp,
fetch_scanline_t fetch_src = NULL, fetch_mask = NULL, fetch_dest = NULL;
pixman_combine_32_func_t compose;
store_scanline_t store;
- source_pict_class_t src_class, mask_class;
+ source_image_class_t src_class, mask_class;
pixman_bool_t component_alpha;
uint32_t *bits;
int32_t stride;
diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index d28e453..163d247 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -125,7 +125,7 @@ _pixman_image_allocate (void)
return image;
}
-source_pict_class_t
+source_image_class_t
_pixman_image_classify (pixman_image_t *image,
int x,
int y,
diff --git a/pixman/pixman-linear-gradient.c b/pixman/pixman-linear-gradient.c
index b940d76..aafdd3b 100644
--- a/pixman/pixman-linear-gradient.c
+++ b/pixman/pixman-linear-gradient.c
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include "pixman-private.h"
-static source_pict_class_t
+static source_image_class_t
linear_gradient_classify (pixman_image_t *image,
int x,
int y,
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 5f05835..8e62d57 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -58,9 +58,9 @@ typedef enum
SOURCE_IMAGE_CLASS_UNKNOWN,
SOURCE_IMAGE_CLASS_HORIZONTAL,
SOURCE_IMAGE_CLASS_VERTICAL,
-} source_pict_class_t;
+} source_image_class_t;
-typedef source_pict_class_t (*classify_func_t) (pixman_image_t *image,
+typedef source_image_class_t (*classify_func_t) (pixman_image_t *image,
int x,
int y,
int width,
@@ -100,7 +100,7 @@ struct image_common
struct source_image
{
image_common_t common;
- source_pict_class_t class;
+ source_image_class_t class;
};
struct solid_fill
@@ -210,7 +210,7 @@ _pixman_image_get_scanline_generic_64 (pixman_image_t *image,
const uint32_t *mask,
uint32_t mask_bits);
-source_pict_class_t
+source_image_class_t
_pixman_image_classify (pixman_image_t *image,
int x,
int y,
diff --git a/pixman/pixman-solid-fill.c b/pixman/pixman-solid-fill.c
index 6a61227..67aec92 100644
--- a/pixman/pixman-solid-fill.c
+++ b/pixman/pixman-solid-fill.c
@@ -44,7 +44,7 @@ solid_fill_get_scanline_32 (pixman_image_t *image,
return;
}
-static source_pict_class_t
+static source_image_class_t
solid_fill_classify (pixman_image_t *image,
int x,
int y,
commit edd476d5be8f248ea21d9d80cf1986d0ccdecc3b
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date: Wed Jul 22 04:28:08 2009 -0400
Replace a bunch of 'pict's with 'image'
diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
index a5e1c0f..22f41cb 100644
--- a/pixman/pixman-access.c
+++ b/pixman/pixman-access.c
@@ -70,7 +70,7 @@
offset0 + (offset0 >> 2)
/* Note no trailing semicolon on the above macro; if it's there, then
- * the typical usage of YV12_SETUP(pict); will have an extra trailing ;
+ * the typical usage of YV12_SETUP(image); will have an extra trailing ;
* that some compilers will interpret as a statement -- and then any further
* variable declarations will cause an error.
*/
@@ -1138,7 +1138,7 @@ fetch_scanline_yv12 (pixman_image_t *image,
/* Despite the type, expects a uint64_t buffer */
static void
-fetch_pixels_a2r10g10b10_64 (bits_image_t *pict,
+fetch_pixels_a2r10g10b10_64 (bits_image_t *image,
uint32_t * b,
int n_pixels)
{
@@ -1156,8 +1156,8 @@ fetch_pixels_a2r10g10b10_64 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t p = READ (pict, bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t p = READ (image, bits + offset);
uint64_t a = p >> 30;
uint64_t r = (p >> 20) & 0x3ff;
uint64_t g = (p >> 10) & 0x3ff;
@@ -1179,7 +1179,7 @@ fetch_pixels_a2r10g10b10_64 (bits_image_t *pict,
/* Despite the type, this function expects a uint64_t buffer */
static void
-fetch_pixels_x2r10g10b10_64 (bits_image_t *pict,
+fetch_pixels_x2r10g10b10_64 (bits_image_t *image,
uint32_t * b,
int n_pixels)
{
@@ -1197,8 +1197,8 @@ fetch_pixels_x2r10g10b10_64 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t p = READ (pict, bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t p = READ (image, bits + offset);
uint64_t r = (p >> 20) & 0x3ff;
uint64_t g = (p >> 10) & 0x3ff;
uint64_t b = p & 0x3ff;
@@ -1214,7 +1214,7 @@ fetch_pixels_x2r10g10b10_64 (bits_image_t *pict,
/* Despite the type, expects a uint64_t buffer */
static void
-fetch_pixels_a2b10g10r10_64 (bits_image_t *pict,
+fetch_pixels_a2b10g10r10_64 (bits_image_t *image,
uint32_t * b,
int n_pixels)
{
@@ -1232,8 +1232,8 @@ fetch_pixels_a2b10g10r10_64 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t p = READ (pict, bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t p = READ (image, bits + offset);
uint64_t a = p >> 30;
uint64_t b = (p >> 20) & 0x3ff;
uint64_t g = (p >> 10) & 0x3ff;
@@ -1255,7 +1255,7 @@ fetch_pixels_a2b10g10r10_64 (bits_image_t *pict,
/* Despite the type, this function expects a uint64_t buffer */
static void
-fetch_pixels_x2b10g10r10_64 (bits_image_t *pict,
+fetch_pixels_x2b10g10r10_64 (bits_image_t *image,
uint32_t * b,
int n_pixels)
{
@@ -1273,8 +1273,8 @@ fetch_pixels_x2b10g10r10_64 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t p = READ (pict, bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t p = READ (image, bits + offset);
uint64_t b = (p >> 20) & 0x3ff;
uint64_t g = (p >> 10) & 0x3ff;
uint64_t r = p & 0x3ff;
@@ -1289,7 +1289,7 @@ fetch_pixels_x2b10g10r10_64 (bits_image_t *pict,
}
static void
-fetch_pixels_a8r8g8b8 (bits_image_t *pict,
+fetch_pixels_a8r8g8b8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1306,14 +1306,14 @@ fetch_pixels_a8r8g8b8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- buffer[i] = READ (pict, (uint32_t *)bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ buffer[i] = READ (image, (uint32_t *)bits + offset);
}
}
}
static void
-fetch_pixels_x8r8g8b8 (bits_image_t *pict,
+fetch_pixels_x8r8g8b8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1330,14 +1330,14 @@ fetch_pixels_x8r8g8b8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- buffer[i] = READ (pict, (uint32_t *)bits + offset) | 0xff000000;
+ uint32_t *bits = image->bits + line * image->rowstride;
+ buffer[i] = READ (image, (uint32_t *)bits + offset) | 0xff000000;
}
}
}
static void
-fetch_pixels_a8b8g8r8 (bits_image_t *pict,
+fetch_pixels_a8b8g8r8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1354,8 +1354,8 @@ fetch_pixels_a8b8g8r8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint32_t *)bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint32_t *)bits + offset);
buffer[i] = ((pixel & 0xff000000) |
((pixel >> 16) & 0xff) |
@@ -1366,7 +1366,7 @@ fetch_pixels_a8b8g8r8 (bits_image_t *pict,
}
static void
-fetch_pixels_x8b8g8r8 (bits_image_t *pict,
+fetch_pixels_x8b8g8r8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1383,8 +1383,8 @@ fetch_pixels_x8b8g8r8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint32_t *)bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint32_t *)bits + offset);
buffer[i] = (0xff000000) |
((pixel >> 16) & 0xff) |
@@ -1395,7 +1395,7 @@ fetch_pixels_x8b8g8r8 (bits_image_t *pict,
}
static void
-fetch_pixels_b8g8r8a8 (bits_image_t *pict,
+fetch_pixels_b8g8r8a8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1412,8 +1412,8 @@ fetch_pixels_b8g8r8a8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint32_t *)bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint32_t *)bits + offset);
buffer[i] = ((pixel & 0xff000000) >> 24 |
(pixel & 0x00ff0000) >> 8 |
@@ -1424,7 +1424,7 @@ fetch_pixels_b8g8r8a8 (bits_image_t *pict,
}
static void
-fetch_pixels_b8g8r8x8 (bits_image_t *pict,
+fetch_pixels_b8g8r8x8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1441,8 +1441,8 @@ fetch_pixels_b8g8r8x8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint32_t *)bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint32_t *)bits + offset);
buffer[i] = ((0xff000000) |
(pixel & 0xff000000) >> 24 |
@@ -1453,7 +1453,7 @@ fetch_pixels_b8g8r8x8 (bits_image_t *pict,
}
static void
-fetch_pixels_r8g8b8 (bits_image_t *pict,
+fetch_pixels_r8g8b8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1470,26 +1470,26 @@ fetch_pixels_r8g8b8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
+ uint32_t *bits = image->bits + line * image->rowstride;
uint8_t *pixel = ((uint8_t *) bits) + (offset * 3);
#ifdef WORDS_BIGENDIAN
buffer[i] = (0xff000000 |
- (READ (pict, pixel + 0) << 16) |
- (READ (pict, pixel + 1) << 8) |
- (READ (pict, pixel + 2)));
+ (READ (image, pixel + 0) << 16) |
+ (READ (image, pixel + 1) << 8) |
+ (READ (image, pixel + 2)));
#else
buffer[i] = (0xff000000 |
- (READ (pict, pixel + 2) << 16) |
- (READ (pict, pixel + 1) << 8) |
- (READ (pict, pixel + 0)));
+ (READ (image, pixel + 2) << 16) |
+ (READ (image, pixel + 1) << 8) |
+ (READ (image, pixel + 0)));
#endif
}
}
}
static void
-fetch_pixels_b8g8r8 (bits_image_t *pict,
+fetch_pixels_b8g8r8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1506,25 +1506,25 @@ fetch_pixels_b8g8r8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
+ uint32_t *bits = image->bits + line * image->rowstride;
uint8_t *pixel = ((uint8_t *) bits) + (offset * 3);
#ifdef WORDS_BIGENDIAN
buffer[i] = (0xff000000 |
- (READ (pict, pixel + 2) << 16) |
- (READ (pict, pixel + 1) << 8) |
- (READ (pict, pixel + 0)));
+ (READ (image, pixel + 2) << 16) |
+ (READ (image, pixel + 1) << 8) |
+ (READ (image, pixel + 0)));
#else
buffer[i] = (0xff000000 |
- (READ (pict, pixel + 0) << 16) |
- (READ (pict, pixel + 1) << 8) |
- (READ (pict, pixel + 2)));
+ (READ (image, pixel + 0) << 16) |
+ (READ (image, pixel + 1) << 8) |
+ (READ (image, pixel + 2)));
#endif
}
}
}
static void
-fetch_pixels_r5g6b5 (bits_image_t *pict,
+fetch_pixels_r5g6b5 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1541,8 +1541,8 @@ fetch_pixels_r5g6b5 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
uint32_t r, g, b;
r = ((pixel & 0xf800) | ((pixel & 0xe000) >> 5)) << 8;
@@ -1555,7 +1555,7 @@ fetch_pixels_r5g6b5 (bits_image_t *pict,
}
static void
-fetch_pixels_b5g6r5 (bits_image_t *pict,
+fetch_pixels_b5g6r5 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1573,8 +1573,8 @@ fetch_pixels_b5g6r5 (bits_image_t *pict,
else
{
uint32_t r, g, b;
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
b = ((pixel & 0xf800) | ((pixel & 0xe000) >> 5)) >> 8;
g = ((pixel & 0x07e0) | ((pixel & 0x0600) >> 6)) << 5;
@@ -1586,7 +1586,7 @@ fetch_pixels_b5g6r5 (bits_image_t *pict,
}
static void
-fetch_pixels_a1r5g5b5 (bits_image_t *pict,
+fetch_pixels_a1r5g5b5 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1603,8 +1603,8 @@ fetch_pixels_a1r5g5b5 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
uint32_t a, r, g, b;
a = (uint32_t) ((uint8_t) (0 - ((pixel & 0x8000) >> 15))) << 24;
@@ -1618,7 +1618,7 @@ fetch_pixels_a1r5g5b5 (bits_image_t *pict,
}
static void
-fetch_pixels_x1r5g5b5 (bits_image_t *pict,
+fetch_pixels_x1r5g5b5 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1635,8 +1635,8 @@ fetch_pixels_x1r5g5b5 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
uint32_t r, g, b;
r = ((pixel & 0x7c00) | ((pixel & 0x7000) >> 5)) << 9;
@@ -1649,7 +1649,7 @@ fetch_pixels_x1r5g5b5 (bits_image_t *pict,
}
static void
-fetch_pixels_a1b5g5r5 (bits_image_t *pict,
+fetch_pixels_a1b5g5r5 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1666,8 +1666,8 @@ fetch_pixels_a1b5g5r5 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
uint32_t a, r, g, b;
a = (uint32_t) ((uint8_t) (0 - ((pixel & 0x8000) >> 15))) << 24;
@@ -1681,7 +1681,7 @@ fetch_pixels_a1b5g5r5 (bits_image_t *pict,
}
static void
-fetch_pixels_x1b5g5r5 (bits_image_t *pict,
+fetch_pixels_x1b5g5r5 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1698,8 +1698,8 @@ fetch_pixels_x1b5g5r5 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
uint32_t r, g, b;
b = ((pixel & 0x7c00) | ((pixel & 0x7000) >> 5)) >> 7;
@@ -1712,7 +1712,7 @@ fetch_pixels_x1b5g5r5 (bits_image_t *pict,
}
static void
-fetch_pixels_a4r4g4b4 (bits_image_t *pict,
+fetch_pixels_a4r4g4b4 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1729,8 +1729,8 @@ fetch_pixels_a4r4g4b4 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
uint32_t a, r, g, b;
a = ((pixel & 0xf000) | ((pixel & 0xf000) >> 4)) << 16;
@@ -1744,7 +1744,7 @@ fetch_pixels_a4r4g4b4 (bits_image_t *pict,
}
static void
-fetch_pixels_x4r4g4b4 (bits_image_t *pict,
+fetch_pixels_x4r4g4b4 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1761,8 +1761,8 @@ fetch_pixels_x4r4g4b4 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
uint32_t r, g, b;
r = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) << 12;
@@ -1775,7 +1775,7 @@ fetch_pixels_x4r4g4b4 (bits_image_t *pict,
}
static void
-fetch_pixels_a4b4g4r4 (bits_image_t *pict,
+fetch_pixels_a4b4g4r4 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1792,8 +1792,8 @@ fetch_pixels_a4b4g4r4 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
uint32_t a, r, g, b;
a = ((pixel & 0xf000) | ((pixel & 0xf000) >> 4)) << 16;
@@ -1807,7 +1807,7 @@ fetch_pixels_a4b4g4r4 (bits_image_t *pict,
}
static void
-fetch_pixels_x4b4g4r4 (bits_image_t *pict,
+fetch_pixels_x4b4g4r4 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1824,8 +1824,8 @@ fetch_pixels_x4b4g4r4 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint16_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint16_t *) bits + offset);
uint32_t r, g, b;
b = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) >> 4;
@@ -1838,7 +1838,7 @@ fetch_pixels_x4b4g4r4 (bits_image_t *pict,
}
static void
-fetch_pixels_a8 (bits_image_t *pict,
+fetch_pixels_a8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1855,8 +1855,8 @@ fetch_pixels_a8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint8_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint8_t *) bits + offset);
buffer[i] = pixel << 24;
}
@@ -1864,7 +1864,7 @@ fetch_pixels_a8 (bits_image_t *pict,
}
static void
-fetch_pixels_r3g3b2 (bits_image_t *pict,
+fetch_pixels_r3g3b2 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1881,8 +1881,8 @@ fetch_pixels_r3g3b2 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint8_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint8_t *) bits + offset);
uint32_t r, g, b;
r = ((pixel & 0xe0) |
@@ -1904,7 +1904,7 @@ fetch_pixels_r3g3b2 (bits_image_t *pict,
}
static void
-fetch_pixels_b2g3r3 (bits_image_t *pict,
+fetch_pixels_b2g3r3 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1921,8 +1921,8 @@ fetch_pixels_b2g3r3 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint8_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint8_t *) bits + offset);
uint32_t r, g, b;
b = ((pixel & 0xc0) |
@@ -1944,7 +1944,7 @@ fetch_pixels_b2g3r3 (bits_image_t *pict,
}
static void
-fetch_pixels_a2r2g2b2 (bits_image_t *pict,
+fetch_pixels_a2r2g2b2 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1961,8 +1961,8 @@ fetch_pixels_a2r2g2b2 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint8_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint8_t *) bits + offset);
uint32_t a, r, g, b;
a = ((pixel & 0xc0) * 0x55) << 18;
@@ -1976,7 +1976,7 @@ fetch_pixels_a2r2g2b2 (bits_image_t *pict,
}
static void
-fetch_pixels_a2b2g2r2 (bits_image_t *pict,
+fetch_pixels_a2b2g2r2 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -1993,8 +1993,8 @@ fetch_pixels_a2b2g2r2 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint8_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint8_t *) bits + offset);
uint32_t a, r, g, b;
a = ((pixel & 0xc0) * 0x55) << 18;
@@ -2008,7 +2008,7 @@ fetch_pixels_a2b2g2r2 (bits_image_t *pict,
}
static void
-fetch_pixels_c8 (bits_image_t *pict,
+fetch_pixels_c8 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2025,9 +2025,9 @@ fetch_pixels_c8 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint8_t *) bits + offset);
- const pixman_indexed_t * indexed = pict->indexed;
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint8_t *) bits + offset);
+ const pixman_indexed_t * indexed = image->indexed;
buffer[i] = indexed->rgba[pixel];
}
@@ -2035,7 +2035,7 @@ fetch_pixels_c8 (bits_image_t *pict,
}
static void
-fetch_pixels_x4a4 (bits_image_t *pict,
+fetch_pixels_x4a4 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2052,8 +2052,8 @@ fetch_pixels_x4a4 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, (uint8_t *) bits + offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, (uint8_t *) bits + offset);
buffer[i] = ((pixel & 0xf) | ((pixel & 0xf) << 4)) << 24;
}
@@ -2061,7 +2061,7 @@ fetch_pixels_x4a4 (bits_image_t *pict,
}
static void
-fetch_pixels_a4 (bits_image_t *pict,
+fetch_pixels_a4 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2078,8 +2078,8 @@ fetch_pixels_a4 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = FETCH_4 (pict, bits, offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = FETCH_4 (image, bits, offset);
pixel |= pixel << 4;
buffer[i] = pixel << 24;
@@ -2088,7 +2088,7 @@ fetch_pixels_a4 (bits_image_t *pict,
}
static void
-fetch_pixels_r1g2b1 (bits_image_t *pict,
+fetch_pixels_r1g2b1 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2105,8 +2105,8 @@ fetch_pixels_r1g2b1 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = FETCH_4 (pict, bits, offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = FETCH_4 (image, bits, offset);
uint32_t r, g, b;
r = ((pixel & 0x8) * 0xff) << 13;
@@ -2119,7 +2119,7 @@ fetch_pixels_r1g2b1 (bits_image_t *pict,
}
static void
-fetch_pixels_b1g2r1 (bits_image_t *pict,
+fetch_pixels_b1g2r1 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2136,8 +2136,8 @@ fetch_pixels_b1g2r1 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = FETCH_4 (pict, bits, offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = FETCH_4 (image, bits, offset);
uint32_t r, g, b;
b = ((pixel & 0x8) * 0xff) >> 3;
@@ -2150,7 +2150,7 @@ fetch_pixels_b1g2r1 (bits_image_t *pict,
}
static void
-fetch_pixels_a1r1g1b1 (bits_image_t *pict,
+fetch_pixels_a1r1g1b1 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2167,8 +2167,8 @@ fetch_pixels_a1r1g1b1 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = FETCH_4 (pict, bits, offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = FETCH_4 (image, bits, offset);
uint32_t a, r, g, b;
a = ((pixel & 0x8) * 0xff) << 21;
@@ -2182,7 +2182,7 @@ fetch_pixels_a1r1g1b1 (bits_image_t *pict,
}
static void
-fetch_pixels_a1b1g1r1 (bits_image_t *pict,
+fetch_pixels_a1b1g1r1 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2199,8 +2199,8 @@ fetch_pixels_a1b1g1r1 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = FETCH_4 (pict, bits, offset);
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = FETCH_4 (image, bits, offset);
uint32_t a, r, g, b;
a = ((pixel & 0x8) * 0xff) << 21;
@@ -2214,7 +2214,7 @@ fetch_pixels_a1b1g1r1 (bits_image_t *pict,
}
static void
-fetch_pixels_c4 (bits_image_t *pict,
+fetch_pixels_c4 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2231,9 +2231,9 @@ fetch_pixels_c4 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = FETCH_4 (pict, bits, offset);
- const pixman_indexed_t * indexed = pict->indexed;
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = FETCH_4 (image, bits, offset);
+ const pixman_indexed_t * indexed = image->indexed;
buffer[i] = indexed->rgba[pixel];
}
@@ -2241,7 +2241,7 @@ fetch_pixels_c4 (bits_image_t *pict,
}
static void
-fetch_pixels_a1 (bits_image_t *pict,
+fetch_pixels_a1 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2258,8 +2258,8 @@ fetch_pixels_a1 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, bits + (offset >> 5));
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, bits + (offset >> 5));
uint32_t a;
#ifdef WORDS_BIGENDIAN
@@ -2278,7 +2278,7 @@ fetch_pixels_a1 (bits_image_t *pict,
}
static void
-fetch_pixels_g1 (bits_image_t *pict,
+fetch_pixels_g1 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2295,9 +2295,9 @@ fetch_pixels_g1 (bits_image_t *pict,
}
else
{
- uint32_t *bits = pict->bits + line * pict->rowstride;
- uint32_t pixel = READ (pict, bits + (offset >> 5));
- const pixman_indexed_t * indexed = pict->indexed;
+ uint32_t *bits = image->bits + line * image->rowstride;
+ uint32_t pixel = READ (image, bits + (offset >> 5));
+ const pixman_indexed_t * indexed = image->indexed;
uint32_t a;
#ifdef WORDS_BIGENDIAN
@@ -2313,7 +2313,7 @@ fetch_pixels_g1 (bits_image_t *pict,
}
static void
-fetch_pixels_yuy2 (bits_image_t *pict,
+fetch_pixels_yuy2 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2330,7 +2330,7 @@ fetch_pixels_yuy2 (bits_image_t *pict,
}
else
{
- const uint32_t *bits = pict->bits + pict->rowstride * line;
+ const uint32_t *bits = image->bits + image->rowstride * line;
int16_t y, u, v;
int32_t r, g, b;
@@ -2357,7 +2357,7 @@ fetch_pixels_yuy2 (bits_image_t *pict,
}
static void
-fetch_pixels_yv12 (bits_image_t *pict,
+fetch_pixels_yv12 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
@@ -2374,7 +2374,7 @@ fetch_pixels_yv12 (bits_image_t *pict,
}
else
{
- YV12_SETUP (pict);
+ YV12_SETUP (image);
int16_t y = YV12_Y (line)[offset] - 16;
int16_t u = YV12_U (line)[offset >> 1] - 128;
int16_t v = YV12_V (line)[offset >> 1] - 128;
@@ -3259,13 +3259,13 @@ fetch_scanline_generic_64 (pixman_image_t *image,
/* Despite the type, this function expects a uint64_t *buffer */
static void
-fetch_pixels_generic_64 (bits_image_t *pict,
+fetch_pixels_generic_64 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
- pict->fetch_pixels_raw_32 (pict, buffer, n_pixels);
+ image->fetch_pixels_raw_32 (image, buffer, n_pixels);
- pixman_expand ((uint64_t *)buffer, buffer, pict->format, n_pixels);
+ pixman_expand ((uint64_t *)buffer, buffer, image->format, n_pixels);
}
/*
@@ -3275,14 +3275,14 @@ fetch_pixels_generic_64 (bits_image_t *pict,
* WARNING: This function loses precision!
*/
static void
-fetch_pixels_generic_lossy_32 (bits_image_t *pict,
+fetch_pixels_generic_lossy_32 (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
/* Since buffer contains n_pixels coordinate pairs, it also has enough
* room for n_pixels 64 bit pixels.
*/
- pict->fetch_pixels_raw_64 (pict, buffer, n_pixels);
+ image->fetch_pixels_raw_64 (image, buffer, n_pixels);
pixman_contract (buffer, (uint64_t *)buffer, n_pixels);
}
diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
index ff29620..2fd621f 100644
--- a/pixman/pixman-bits-image.c
+++ b/pixman/pixman-bits-image.c
@@ -491,31 +491,31 @@ bits_image_fetch_convolution_pixels (bits_image_t *image,
}
static void
-bits_image_fetch_filtered (bits_image_t *pict,
+bits_image_fetch_filtered (bits_image_t *image,
uint32_t * buffer,
int n_pixels)
{
- switch (pict->common.filter)
+ switch (image->common.filter)
{
case PIXMAN_FILTER_NEAREST:
case PIXMAN_FILTER_FAST:
- bits_image_fetch_nearest_pixels (pict, buffer, n_pixels);
+ bits_image_fetch_nearest_pixels (image, buffer, n_pixels);
break;
case PIXMAN_FILTER_BILINEAR:
case PIXMAN_FILTER_GOOD:
case PIXMAN_FILTER_BEST:
- bits_image_fetch_bilinear_pixels (pict, buffer, n_pixels);
+ bits_image_fetch_bilinear_pixels (image, buffer, n_pixels);
break;
case PIXMAN_FILTER_CONVOLUTION:
- bits_image_fetch_convolution_pixels (pict, buffer, n_pixels);
+ bits_image_fetch_convolution_pixels (image, buffer, n_pixels);
break;
}
}
static void
-bits_image_fetch_transformed (pixman_image_t * pict,
+bits_image_fetch_transformed (pixman_image_t * image,
int x,
int y,
int width,
@@ -532,8 +532,8 @@ bits_image_fetch_transformed (pixman_image_t * pict,
int32_t *coords;
int i;
- bits = pict->bits.bits;
- stride = pict->bits.rowstride;
+ bits = image->bits.bits;
+ stride = image->bits.rowstride;
/* reference point is the center of the pixel */
v.vector[0] = pixman_int_to_fixed (x) + pixman_fixed_1 / 2;
@@ -542,14 +542,14 @@ bits_image_fetch_transformed (pixman_image_t * pict,
/* when using convolution filters or PIXMAN_REPEAT_PAD one
* might get here without a transform */
- if (pict->common.transform)
+ if (image->common.transform)
{
- if (!pixman_transform_point_3d (pict->common.transform, &v))
+ if (!pixman_transform_point_3d (image->common.transform, &v))
return;
- unit.vector[0] = pict->common.transform->matrix[0][0];
- unit.vector[1] = pict->common.transform->matrix[1][0];
- unit.vector[2] = pict->common.transform->matrix[2][0];
+ unit.vector[0] = image->common.transform->matrix[0][0];
+ unit.vector[1] = image->common.transform->matrix[1][0];
+ unit.vector[2] = image->common.transform->matrix[2][0];
affine = (v.vector[2] == pixman_fixed_1 && unit.vector[2] == 0);
}
@@ -606,7 +606,7 @@ bits_image_fetch_transformed (pixman_image_t * pict,
v.vector[1] += unit.vector[1];
}
- bits_image_fetch_filtered (&pict->bits, tmp_buffer, n_pixels);
+ bits_image_fetch_filtered (&image->bits, tmp_buffer, n_pixels);
for (j = 0; j < n_pixels; ++j)
buffer[i++] = tmp_buffer[j];
diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index 8b4fb64..d28e453 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -62,7 +62,7 @@ _pixman_init_gradient (gradient_t * gradient,
* depth, but that's a project for the future.
*/
void
-_pixman_image_get_scanline_generic_64 (pixman_image_t * pict,
+_pixman_image_get_scanline_generic_64 (pixman_image_t * image,
int x,
int y,
int width,
@@ -85,7 +85,7 @@ _pixman_image_get_scanline_generic_64 (pixman_image_t * pict,
}
/* Fetch the source image into the first half of buffer. */
- _pixman_image_get_scanline_32 (pict, x, y, width, (uint32_t*)buffer, mask8,
+ _pixman_image_get_scanline_32 (image, x, y, width, (uint32_t*)buffer, mask8,
mask_bits);
/* Expand from 32bpp to 64bpp in place. */
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 052f3a9..5f05835 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -26,7 +26,7 @@ typedef struct radial_gradient radial_gradient_t;
typedef struct bits_image bits_image_t;
typedef struct circle circle_t;
-typedef void (*fetch_scanline_t) (pixman_image_t *pict,
+typedef void (*fetch_scanline_t) (pixman_image_t *image,
int x,
int y,
int width,
@@ -202,7 +202,7 @@ void
_pixman_bits_image_setup_raw_accessors (bits_image_t *image);
void
-_pixman_image_get_scanline_generic_64 (pixman_image_t *pict,
+_pixman_image_get_scanline_generic_64 (pixman_image_t *image,
int x,
int y,
int width,
@@ -279,14 +279,14 @@ uint32_t
_pixman_image_get_solid (pixman_image_t * image,
pixman_format_code_t format);
-#define PIXMAN_IMAGE_GET_LINE(pict, x, y, type, out_stride, line, mul) \
+#define PIXMAN_IMAGE_GET_LINE(image, x, y, type, out_stride, line, mul) \
do \
{ \
uint32_t *__bits__; \
int __stride__; \
\
- __bits__ = pict->bits.bits; \
- __stride__ = pict->bits.rowstride; \
+ __bits__ = image->bits.bits; \
+ __stride__ = image->bits.rowstride; \
(out_stride) = \
__stride__ * (int) sizeof (uint32_t) / (int) sizeof (type); \
(line) = \
diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index a981418..1396fb7 100644
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -80,7 +80,7 @@ clip_general_image (pixman_region32_t * region,
static inline pixman_bool_t
clip_source_image (pixman_region32_t * region,
- pixman_image_t * picture,
+ pixman_image_t * image,
int dx,
int dy)
{
@@ -89,11 +89,11 @@ clip_source_image (pixman_region32_t * region,
* the clip was not set by a client, then it is a hierarchy
* clip and those should always be ignored for sources).
*/
- if (!picture->common.clip_sources || !picture->common.client_clip)
+ if (!image->common.clip_sources || !image->common.client_clip)
return TRUE;
return clip_general_image (region,
- &picture->common.clip_region,
+ &image->common.clip_region,
dx, dy);
}
More information about the xorg-commit
mailing list