Displaying 18 results from an estimated 18 matches for "original_transform".
2007 Jun 14
0
Branch 'as' - 7 commits - libswfdec/swfdec_movie.c libswfdec/swfdec_player.c libswfdec/swfdec_sprite_movie.c libswfdec/swfdec_tag.c player/Makefile.am
...nd y0 on unmodified movies
diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c
index 0a0056c..be3e877 100644
--- a/libswfdec/swfdec_movie.c
+++ b/libswfdec/swfdec_movie.c
@@ -138,7 +138,15 @@ swfdec_movie_update_matrix (SwfdecMovie
{
double d, e;
- movie->matrix = movie->original_transform;
+ /* we operate on x0 and y0 when setting movie._x and movie._y */
+ if (movie->modified) {
+ movie->matrix.xx = movie->original_transform.xx;
+ movie->matrix.yx = movie->original_transform.yx;
+ movie->matrix.xy = movie->original_transform.xy;
+ movie->matrix...
2007 Jun 14
0
Branch 'as' - 4 commits - libswfdec/swfdec_edittext_movie.c libswfdec/swfdec_movie.c libswfdec/swfdec_movie.h libswfdec/swfdec_sprite.c libswfdec/swfdec_sprite_movie.c player/swfdec_debug_movies.c
...copy x0 and y0, too
diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c
index 3bfd642..361f68d 100644
--- a/libswfdec/swfdec_movie.c
+++ b/libswfdec/swfdec_movie.c
@@ -138,10 +138,7 @@ swfdec_movie_update_matrix (SwfdecMovie
{
double d, e;
- movie->matrix.xx = movie->original_transform.xx;
- movie->matrix.xy = movie->original_transform.xy;
- movie->matrix.yx = movie->original_transform.yx;
- movie->matrix.yy = movie->original_transform.yy;
+ movie->matrix = movie->original_transform;
d = movie->xscale / swfdec_matrix_get_xscale (&movie->...
2007 Jun 13
1
Branch 'as' - libswfdec/swfdec_movie.c
...culation - 3 lines got lost in the reorg
diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c
index cee0ba6..53ca79e 100644
--- a/libswfdec/swfdec_movie.c
+++ b/libswfdec/swfdec_movie.c
@@ -951,6 +951,9 @@ swfdec_movie_set_static_properties (Swfd
}
if (transform) {
movie->original_transform = *transform;
+ movie->xscale = swfdec_matrix_get_xscale (&movie->original_transform);
+ movie->yscale = swfdec_matrix_get_yscale (&movie->original_transform);
+ movie->rotation = swfdec_matrix_get_rotation (&movie->original_transform);
swfdec_movie_queue...
2007 Jul 11
0
Branch 'as' - 4 commits - libswfdec/swfdec_color.c libswfdec/swfdec_movie_asprops.c libswfdec/swfdec_movie.c test/trace
...ue, d'oh
diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c
index 98cb397..3c2462f 100644
--- a/libswfdec/swfdec_movie.c
+++ b/libswfdec/swfdec_movie.c
@@ -152,8 +152,10 @@ swfdec_movie_update_matrix (SwfdecMovie
d = movie->xscale / swfdec_matrix_get_xscale (&movie->original_transform);
e = movie->yscale / swfdec_matrix_get_yscale (&movie->original_transform);
cairo_matrix_scale (&movie->matrix, d, e);
- d = movie->rotation - swfdec_matrix_get_rotation (&movie->original_transform);
- cairo_matrix_rotate (&movie->matrix, d * G_PI / 180);...
2007 Aug 22
0
8 commits - libswfdec/swfdec_movie.c libswfdec/swfdec_movie.h libswfdec/swfdec_player.c libswfdec/swfdec_player_internal.h libswfdec/swfdec_sprite_movie_as.c vivified/core
...re the first update of the
matrix.
diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c
index 0f3cb91..03cc00c 100644
--- a/libswfdec/swfdec_movie.c
+++ b/libswfdec/swfdec_movie.c
@@ -1044,6 +1044,8 @@ swfdec_movie_set_static_properties (Swfd
}
if (transform) {
movie->original_transform = *transform;
+ movie->matrix.x0 = movie->original_transform.x0;
+ movie->matrix.y0 = movie->original_transform.y0;
movie->xscale = swfdec_matrix_get_xscale (&movie->original_transform);
movie->yscale = swfdec_matrix_get_yscale (&movie->original_trans...
2007 Dec 10
0
6 commits - libswfdec/Makefile.am libswfdec/swfdec_as_interpret.c libswfdec/swfdec_color_as.c libswfdec/swfdec_graphic_movie.c libswfdec/swfdec_image_decoder.c libswfdec/swfdec_morph_movie.c libswfdec/swfdec_movie_as_drawing.c
...= g_list_sort (movie->parent->list, swfdec_movie_compare_depths);
@@ -1523,17 +1595,17 @@ swfdec_movie_set_static_properties (SwfdecMovie *movie, const cairo_matrix_t *tr
return;
}
if (transform) {
+ swfdec_movie_queue_update (movie, SWFDEC_MOVIE_INVALID_MATRIX);
movie->original_transform = *transform;
movie->matrix.x0 = movie->original_transform.x0;
movie->matrix.y0 = movie->original_transform.y0;
movie->xscale = swfdec_matrix_get_xscale (&movie->original_transform);
movie->yscale = swfdec_matrix_get_yscale (&movie->original_trans...
2007 Jun 13
0
Branch 'as' - 6 commits - libswfdec/swfdec_as_array.c libswfdec/swfdec_button_movie.c libswfdec/swfdec_morph_movie.c libswfdec/swfdec_movie_asprops.c libswfdec/swfdec_movie.c libswfdec/swfdec_movie.h libswfdec/swfdec_player.c libswfdec/swfdec_sprite.c
...CONTENT_DEFAULT;
-
G_DEFINE_ABSTRACT_TYPE (SwfdecMovie, swfdec_movie, SWFDEC_TYPE_AS_OBJECT)
static void
swfdec_movie_init (SwfdecMovie * movie)
{
- movie->content = &default_content;
-
movie->xscale = 100;
movie->yscale = 100;
+ cairo_matrix_init_identity (&movie->original_transform);
cairo_matrix_init_identity (&movie->matrix);
cairo_matrix_init_identity (&movie->inverse_matrix);
+
swfdec_color_transform_init_identity (&movie->color_transform);
+ swfdec_color_transform_init_identity (&movie->original_ctrans);
movie->visible = TRUE...
2007 Nov 08
0
libswfdec/swfdec_load_object.c libswfdec/swfdec_movie.c libswfdec/swfdec_player.c libswfdec/swfdec_player_internal.h libswfdec/swfdec_resource.c libswfdec/swfdec_resource.h
...v->depth, mov->parent, resource, NULL, mov->name);
+ if (copy == NULL)
+ return FALSE;
+ copy->original_name = mov->original_name;
+ /* FIXME: are events copied? If so, wouldn't that be a security issue? */
+ swfdec_movie_set_static_properties (copy, &mov->original_transform,
+ &mov->original_ctrans, mov->original_ratio, mov->clip_depth,
+ mov->blend_mode, NULL);
+ swfdec_movie_remove (mov);
+ movie = SWFDEC_SPRITE_MOVIE (copy);
+ }
+ swfdec_player_unroot_object (player, G_OBJECT (resource));
+ return TRUE;
+}
+
static void
swfdec_resource_l...
2007 Dec 11
0
3 commits - libswfdec/swfdec_as_context.c libswfdec/swfdec_movie.c test/trace
..._movie.c b/libswfdec/swfdec_movie.c
index cf6786a..92a0edb 100644
--- a/libswfdec/swfdec_movie.c
+++ b/libswfdec/swfdec_movie.c
@@ -1604,8 +1604,8 @@ swfdec_movie_set_static_properties (SwfdecMovie *movie, const cairo_matrix_t *tr
movie->rotation = swfdec_matrix_get_rotation (&movie->original_transform);
}
if (ctrans) {
- movie->original_ctrans = *ctrans;
swfdec_movie_invalidate_last (movie);
+ movie->original_ctrans = *ctrans;
}
if (ratio >= 0 && (guint) ratio != movie->original_ratio) {
SwfdecMovieClass *klass;
diff --git a/test/trace/Makefile.am...
2007 Nov 12
0
13 commits - libswfdec/Makefile.am libswfdec/swfdec_decoder.c libswfdec/swfdec_decoder.h libswfdec/swfdec_flv_decoder.c libswfdec/swfdec_flv_decoder.h libswfdec/swfdec_image.c libswfdec/swfdec_image_decoder.c libswfdec/swfdec_image_decoder.h
...ame;
+ copy->modified = mov->modified;
+ copy->xscale = mov->xscale;
+ copy->yscale = mov->yscale;
+ copy->rotation = mov->rotation;
/* FIXME: are events copied? If so, wouldn't that be a security issue? */
swfdec_movie_set_static_properties (copy, &mov->original_transform,
&mov->original_ctrans, mov->original_ratio, mov->clip_depth,
mov->blend_mode, NULL);
swfdec_movie_remove (mov);
+ swfdec_movie_queue_update (copy, SWFDEC_MOVIE_INVALID_MATRIX);
return SWFDEC_SPRITE_MOVIE (copy);
}
commit 74c1e34359f4ecfbe78896a42ff6bf3f79b2...
2007 Jun 20
0
Branch 'as' - 5 commits - libswfdec/swfdec_graphic_movie.c libswfdec/swfdec_movie.c libswfdec/swfdec_sprite_movie.c test/image
...robably needs to be improved a _lot_ */
+ if (SWFDEC_IS_GRAPHIC_MOVIE (cur)) {
+ SwfdecMovieClass *klass = SWFDEC_MOVIE_GET_CLASS (prev);
+ if (klass->replace)
+ klass->replace (prev, SWFDEC_GRAPHIC_MOVIE (cur)->graphic);
+ }
swfdec_movie_set_static_properties (prev, &cur->original_transform,
&cur->original_ctrans, cur->original_ratio, cur->clip_depth, cur->events);
swfdec_movie_destroy (cur);
diff-tree 04c26849608a5a5728ef1873661349e6903c6956 (from 5a91029f4be976e4ceed5d68fd947b071a57215c)
Author: Benjamin Otte <otte at gnome.org>
Date: Wed Jun 20 11:54...
2007 Aug 29
0
15 commits - libswfdec/swfdec_as_strings.c libswfdec/swfdec_initialize.as libswfdec/swfdec_initialize.h libswfdec/swfdec_movie.c libswfdec/swfdec_movie.h libswfdec/swfdec_sprite.c libswfdec/swfdec_sprite_movie.c libswfdec/swfdec_system_as.c
...+ swfdec_movie_invalidate (movie);
+ }
if (events) {
if (movie->events)
swfdec_event_list_free (movie->events);
@@ -1172,7 +1177,8 @@ swfdec_movie_duplicate (SwfdecMovie *mov
if (copy == NULL)
return NULL;
swfdec_movie_set_static_properties (copy, &movie->original_transform,
- &movie->original_ctrans, movie->original_ratio, movie->clip_depth, movie->events);
+ &movie->original_ctrans, movie->original_ratio, movie->clip_depth,
+ movie->blend_mode, movie->events);
return copy;
}
@@ -1193,7 +1199,7 @@ swfdec_movie_...
2007 Oct 25
0
6 commits - libswfdec/swfdec_as_interpret.c libswfdec/swfdec_event.c libswfdec/swfdec_event.h libswfdec/swfdec_movie.c libswfdec/swfdec_movie.h libswfdec/swfdec_player.c libswfdec/swfdec_player_internal.h libswfdec/swfdec_resource.c
...GUINT_TO_POINTER (condition));
- return TRUE;
+ swfdec_player_add_action (player, movie, condition, importance);
+ return ret;
}
/**
@@ -1391,6 +1391,12 @@ swfdec_movie_duplicate (SwfdecMovie *movie, const char *name, int depth)
swfdec_movie_set_static_properties (copy, &movie->original_transform,
&movie->original_ctrans, movie->original_ratio, movie->clip_depth,
movie->blend_mode, movie->events);
+ if (SWFDEC_IS_SPRITE_MOVIE (copy)) {
+ swfdec_movie_queue_script (copy, SWFDEC_EVENT_INITIALIZE);
+ swfdec_movie_queue_script (copy, SWFDEC_EVENT_LOAD);...
2007 Nov 10
0
10 commits - libswfdec/swfdec_as_interpret.c libswfdec/swfdec_as_types.c libswfdec/swfdec_initialize.as libswfdec/swfdec_initialize.h libswfdec/swfdec_movie.c libswfdec/swfdec_movie_clip_loader.c libswfdec/swfdec_movie.h libswfdec/swfdec_resource.c
...+ mov->depth, mov->parent, resource, NULL, mov->name);
+ if (copy == NULL)
+ return FALSE;
+ copy->original_name = mov->original_name;
+ /* FIXME: are events copied? If so, wouldn't that be a security issue? */
+ swfdec_movie_set_static_properties (copy, &mov->original_transform,
+ &mov->original_ctrans, mov->original_ratio, mov->clip_depth,
+ mov->blend_mode, NULL);
+ swfdec_movie_remove (mov);
+ return SWFDEC_SPRITE_MOVIE (copy);
+}
+
static gboolean
swfdec_resource_create_movie (SwfdecResource *resource)
{
@@ -186,21 +206,7 @@ swfdec_reso...
2007 Oct 18
0
18 commits - doc/swfdec-sections.txt libswfdec/Makefile.am libswfdec/swfdec_as_interpret.c libswfdec/swfdec_as_strings.c libswfdec/swfdec_button_movie.c libswfdec/swfdec_event.c libswfdec/swfdec_event.h libswfdec/swfdec_flash_security.c
...y);
}
copy = swfdec_movie_new (SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context), depth,
- parent, movie->graphic, name);
+ parent, movie->resource, movie->graphic, name);
if (copy == NULL)
return NULL;
swfdec_movie_set_static_properties (copy, &movie->original_transform,
@@ -1393,7 +1401,7 @@ swfdec_movie_new_for_content (SwfdecMovie *parent, const SwfdecContent *content)
SWFDEC_DEBUG ("new movie for parent %p", parent);
player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (parent)->context);
- movie = swfdec_movie_new (player, content->depth, parent,...
2007 Nov 07
0
36 commits - doc/swfdec-sections.txt libswfdec/Makefile.am libswfdec/swfdec_amf.c libswfdec/swfdec_as_interpret.c libswfdec/swfdec_as_object.c libswfdec/swfdec_as_object.h libswfdec/swfdec_as_strings.c libswfdec/swfdec_buffer.c libswfdec/swfdec_buffer.h
...+ mov->depth, mov->parent, resource, NULL, mov->name);
+ if (copy == NULL)
+ return;
+ copy->original_name = mov->original_name;
+ /* FIXME: are events copied? If so, wouldn't that be a security issue? */
+ swfdec_movie_set_static_properties (copy, &mov->original_transform,
+ &mov->original_ctrans, mov->original_ratio, mov->clip_depth,
+ mov->blend_mode, NULL);
+ swfdec_movie_remove (mov);
+ movie = SWFDEC_SPRITE_MOVIE (copy);
}
+ g_object_unref (resource);
g_object_unref (loader);
return;
commit 8d970ce1bad7b4678824dace4bac8ad89eb8...
2007 Nov 27
0
12 commits - libswfdec/swfdec_as_interpret.c libswfdec/swfdec_as_strings.c libswfdec/swfdec_loader.c libswfdec/swfdec_loader_internal.h libswfdec/swfdec_load_object_as.c libswfdec/swfdec_load_object.c libswfdec/swfdec_load_object.h
...fdec/swfdec_movie.c
@@ -58,6 +58,8 @@ G_DEFINE_ABSTRACT_TYPE (SwfdecMovie, swfdec_movie, SWFDEC_TYPE_AS_OBJECT)
static void
swfdec_movie_init (SwfdecMovie * movie)
{
+ movie->blend_mode = 1;
+
movie->xscale = 100;
movie->yscale = 100;
cairo_matrix_init_identity (&movie->original_transform);
diff --git a/libswfdec/swfdec_sprite_movie_as.c b/libswfdec/swfdec_sprite_movie_as.c
index c8ace8d..3ef8842 100644
--- a/libswfdec/swfdec_sprite_movie_as.c
+++ b/libswfdec/swfdec_sprite_movie_as.c
@@ -154,7 +154,57 @@ void
swfdec_sprite_movie_get_blendMode (SwfdecAsContext *cx, SwfdecAsObject *o...
2008 Jan 21
0
70 commits - configure.ac libswfdec-gtk/Makefile.am libswfdec-gtk/swfdec-gtk.h libswfdec-gtk/swfdec_gtk_loader.c libswfdec-gtk/swfdec_gtk_player.c libswfdec-gtk/swfdec_gtk_socket.c libswfdec-gtk/swfdec_gtk_socket.h libswfdec-gtk/swfdec_playback_alsa.c
...nt, *copy;
+ SwfdecSandbox *sandbox;
g_return_val_if_fail (SWFDEC_IS_MOVIE (movie), NULL);
g_return_val_if_fail (name != NULL, NULL);
@@ -1714,12 +1712,15 @@ swfdec_movie_duplicate (SwfdecMovie *movie, const char *name, int depth)
swfdec_movie_set_static_properties (copy, &movie->original_transform,
&movie->original_ctrans, movie->original_ratio, movie->clip_depth,
movie->blend_mode, movie->events);
+ sandbox = SWFDEC_SANDBOX (SWFDEC_AS_OBJECT (movie)->context->global);
+ swfdec_sandbox_unuse (sandbox);
if (SWFDEC_IS_SPRITE_MOVIE (copy)) {
swf...