[Swfdec-commits] swfdec/swfdec_sprite_movie_as.c

[Pekka Lampila]

 swfdec/swfdec_sprite_movie_as.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f2356bce30c95cddc08594c07e66ef7e3b8be73d
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Fri May 2 19:09:53 2008 +0300

    Fix hitTest when used with shapeFlag enabled

diff --git a/swfdec/swfdec_sprite_movie_as.c b/swfdec/swfdec_sprite_movie_as.c
index 3644d51..6d10e95 100644
--- a/swfdec/swfdec_sprite_movie_as.c
+++ b/swfdec/swfdec_sprite_movie_as.c
@@ -545,11 +545,12 @@ swfdec_sprite_movie_hitTest (SwfdecAsContext *cx, SwfdecAsObject *object,
     y = swfdec_as_value_to_number (cx, &argv[1]) * SWFDEC_TWIPS_SCALE_FACTOR;
     shape = (argc >= 3 && swfdec_as_value_to_boolean (cx, &argv[2]));
 
-    swfdec_movie_global_to_local (movie, &x, &y);
-
     if (shape) {
+      if (movie->parent)
+	swfdec_movie_global_to_local (movie->parent, &x, &y);
       ret = swfdec_movie_contains (movie, x, y);
     } else {
+      swfdec_movie_global_to_local (movie, &x, &y);
       ret = swfdec_rect_contains (&movie->original_extents, x, y);
     }
     SWFDEC_AS_VALUE_SET_BOOLEAN (rval, ret);