Move iterator initialization to the respective image files

[profile/ivi/pixman.git] / pixman / pixman-private.h

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 59d9c5d..d42c114 100644 (file)
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -20,7 +20,6 @@
  * Images
  */
 typedef struct image_common image_common_t;
-typedef struct source_image source_image_t;
 typedef struct solid_fill solid_fill_t;
 typedef struct gradient gradient_t;
 typedef struct linear_gradient linear_gradient_t;
@@ -65,7 +64,6 @@ typedef enum
 {
     SOURCE_IMAGE_CLASS_UNKNOWN,
     SOURCE_IMAGE_CLASS_HORIZONTAL,
-    SOURCE_IMAGE_CLASS_VERTICAL,
 } source_image_class_t;
 
 typedef source_image_class_t (*classify_func_t) (pixman_image_t *image,
@@ -109,15 +107,9 @@ struct image_common
     pixman_format_code_t       extended_format_code;
 };
 
-struct source_image
-{
-    image_common_t common;
-    source_image_class_t class;
-};
-
 struct solid_fill
 {
-    source_image_t common;
+    image_common_t common;
     pixman_color_t color;
     
     uint32_t      color_32;
@@ -126,10 +118,9 @@ struct solid_fill
 
 struct gradient
 {
-    source_image_t          common;
+    image_common_t         common;
     int                     n_stops;
     pixman_gradient_stop_t *stops;
-    int                     stop_range;
 };
 
 struct linear_gradient
@@ -152,10 +143,11 @@ struct radial_gradient
 
     circle_t   c1;
     circle_t   c2;
-    double     cdx;
-    double     cdy;
-    double     dr;
-    double     A;
+
+    circle_t   delta;
+    double     a;
+    double     inva;
+    double     mindr;
 };
 
 struct conical_gradient
@@ -194,7 +186,6 @@ union pixman_image
     image_type_t       type;
     image_common_t     common;
     bits_image_t       bits;
-    source_image_t     source;
     gradient_t         gradient;
     linear_gradient_t  linear;
     conical_gradient_t conical;
@@ -202,10 +193,62 @@ union pixman_image
     solid_fill_t       solid;
 };
 
+typedef struct pixman_iter_t pixman_iter_t;
+typedef enum
+{
+    ITER_NARROW        = (1 << 0),
+} iter_flags_t;
+
+struct pixman_iter_t
+{
+    uint32_t *(* get_scanline) (pixman_iter_t *iter, const uint32_t *mask);
+    void      (* write_back)   (pixman_iter_t *iter);
+
+    pixman_image_t *    image;
+    uint32_t *          buffer;
+    int                 x, y;
+    int                 width;
+};
+
 void
 _pixman_bits_image_setup_accessors (bits_image_t *image);
 
 void
+_pixman_bits_image_src_iter_init (pixman_image_t *image,
+                                 pixman_iter_t *iter,
+                                 int x, int y, int width, int height,
+                                 uint8_t *buffer, iter_flags_t flags);
+void
+_pixman_bits_image_dest_iter_init (pixman_image_t *image,
+                                  pixman_iter_t *iter,
+                                  int x, int y, int width, int height,
+                                  uint8_t *buffer, iter_flags_t flags);
+
+void
+_pixman_solid_fill_iter_init (pixman_image_t *image,
+                             pixman_iter_t  *iter,
+                             int x, int y, int width, int height,
+                             uint8_t *buffer, iter_flags_t flags);
+
+void
+_pixman_linear_gradient_iter_init (pixman_image_t *image,
+                                  pixman_iter_t  *iter,
+                                  int x, int y, int width, int height,
+                                  uint8_t *buffer, iter_flags_t flags);
+
+void
+_pixman_radial_gradient_iter_init (pixman_image_t *image,
+                                  pixman_iter_t *iter,
+                                  int x, int y, int width, int height,
+                                  uint8_t *buffer, iter_flags_t flags);
+
+void
+_pixman_conical_gradient_iter_init (pixman_image_t *image,
+                                   pixman_iter_t *iter,
+                                   int x, int y, int width, int height,
+                                   uint8_t *buffer, iter_flags_t flags);
+
+void
 _pixman_image_get_scanline_generic_64  (pixman_image_t *image,
                                         int             x,
                                         int             y,
@@ -239,23 +282,6 @@ _pixman_image_get_scanline_64 (pixman_image_t *image,
                                uint32_t *      buffer,
                                const uint32_t *unused);
 
-void
-_pixman_image_store_scanline_32 (bits_image_t *  image,
-                                 int             x,
-                                 int             y,
-                                 int             width,
-                                 const uint32_t *buffer);
-
-/* Even though the type of buffer is uint32_t *, the function
- * actually expects a uint64_t *buffer.
- */
-void
-_pixman_image_store_scanline_64 (bits_image_t *  image,
-                                 int             x,
-                                 int             y,
-                                 int             width,
-                                 const uint32_t *buffer);
-
 pixman_image_t *
 _pixman_image_allocate (void);
 
@@ -535,6 +561,8 @@ _pixman_choose_implementation (void);
 /*
  * Utilities
  */
+uint32_t *
+_pixman_iter_get_scanline_noop (pixman_iter_t *iter, const uint32_t *mask);
 
 /* These "formats" all have depth 0, so they
  * will never clash with any real ones
@@ -560,17 +588,15 @@ _pixman_choose_implementation (void);
 #define FAST_PATH_UNIFIED_ALPHA                        (1 <<  9)
 #define FAST_PATH_SCALE_TRANSFORM              (1 << 10)
 #define FAST_PATH_NEAREST_FILTER               (1 << 11)
-#define FAST_PATH_SIMPLE_REPEAT                        (1 << 12)
+#define FAST_PATH_HAS_TRANSFORM                        (1 << 12)
 #define FAST_PATH_IS_OPAQUE                    (1 << 13)
-#define FAST_PATH_NEEDS_WORKAROUND             (1 << 14)
+#define FAST_PATH_NO_NORMAL_REPEAT             (1 << 14)
 #define FAST_PATH_NO_NONE_REPEAT               (1 << 15)
 #define FAST_PATH_SAMPLES_COVER_CLIP           (1 << 16)
 #define FAST_PATH_X_UNIT_POSITIVE              (1 << 17)
 #define FAST_PATH_AFFINE_TRANSFORM             (1 << 18)
 #define FAST_PATH_Y_UNIT_ZERO                  (1 << 19)
 #define FAST_PATH_BILINEAR_FILTER              (1 << 20)
-#define FAST_PATH_NO_NORMAL_REPEAT             (1 << 21)
-#define FAST_PATH_HAS_TRANSFORM                        (1 << 22)
 
 #define FAST_PATH_PAD_REPEAT                                           \
     (FAST_PATH_NO_NONE_REPEAT          |                               \