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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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,