Changeset b0b4592e in mainline for uspace/lib/draw/source.c

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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) (2 diffs)

uspace/lib/draw/source.c

@@ -92 +92 @@
 bool source_is_fast(source_t *source)
 {
-        return (source->mask == NULL)
-            && (source->alpha == (pixel_t) PIXEL(255, 0, 0, 0))
-            && (source->texture != NULL)
-            && (source->texture_tile == false)
-            && transform_is_fast(&source->transform);
+        return ((source->mask == NULL) &&
+            (source->alpha == (pixel_t) PIXEL(255, 0, 0, 0)) &&
+            (source->texture != NULL) &&
+            (source->texture_tile == false) &&
+            (transform_is_fast(&source->transform)));
 }
 
@@ -103 +103 @@
         assert(source_is_fast(source));
 
-        long _x = (long) (x + source->transform.m[0][2]);
-        long _y = (long) (y + source->transform.m[1][2]);
+        long _x = (long) (x + source->transform.matrix[0][2]);
+        long _y = (long) (y + source->transform.matrix[1][2]);
 
         return pixelmap_pixel_at(