Changeset 15d0046 in mainline for uspace/lib/draw/source.c

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/draw/source.c (modified) (6 diffs)

uspace/lib/draw/source.c

@@ -45 +45 @@
         source->color = PIXEL(0, 0, 0, 0);
         source->texture = NULL;
-        source->texture_tile = false;
+        source->texture_extend = PIXELMAP_EXTEND_TRANSPARENT_BLACK;
 
         source->alpha = PIXEL(255, 0, 0, 0);
         source->mask = NULL;
-        source->mask_tile = false;
+        source->mask_extend = PIXELMAP_EXTEND_TRANSPARENT_BLACK;
 }
 
@@ -73 +73 @@
 }
 
-void source_set_texture(source_t *source, surface_t *texture, bool tile)
+void source_set_texture(source_t *source, surface_t *texture,
+    pixelmap_extend_t extend)
 {
         source->texture = texture;
-        source->texture_tile = tile;
+        source->texture_extend = extend;
 }
 
@@ -84 +85 @@
 }
 
-void source_set_mask(source_t *source, surface_t *mask, bool tile)
+void source_set_mask(source_t *source, surface_t *mask,
+    pixelmap_extend_t extend)
 {
         source->mask = mask;
-        source->mask_tile = tile;
+        source->mask_extend = extend;
 }
 
@@ -95 +97 @@
             (source->alpha == (pixel_t) PIXEL(255, 0, 0, 0)) &&
             (source->texture != NULL) &&
-            (source->texture_tile == false) &&
             (transform_is_fast(&source->transform)));
 }
@@ -120 +121 @@
                 mask_pix = source->filter(
                     surface_pixmap_access(source->mask),
-                    x, y, source->mask_tile);
+                    x, y, source->mask_extend);
         } else {
                 mask_pix = source->alpha;
@@ -133 +134 @@
                 texture_pix = source->filter(
                     surface_pixmap_access(source->texture),
-                    x, y, source->texture_tile);
+                    x, y, source->texture_extend);
         } else {
                 texture_pix = source->color;