[Swfdec-commits] 2 commits - swfdec/jpeg swfdec/swfdec_as_context.c

[Benjamin Otte]

 swfdec/jpeg/jpeg.c         |    2 -
 swfdec/swfdec_as_context.c |   46 ---------------------------------------------
 2 files changed, 2 insertions(+), 46 deletions(-)

New commits:
commit e16f27210873369f4a9205a141f1f693f29bbb24
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Sep 7 19:20:13 2008 +0200

    remove leftover cruft from function call reorganization

diff --git a/swfdec/swfdec_as_context.c b/swfdec/swfdec_as_context.c
index df4766c..fd15d4b 100644
--- a/swfdec/swfdec_as_context.c
+++ b/swfdec/swfdec_as_context.c
@@ -801,6 +801,7 @@ swfdec_as_context_run (SwfdecAsContext *context)
 
   g_return_if_fail (SWFDEC_IS_AS_CONTEXT (context));
   g_return_if_fail (context->frame != NULL);
+  g_return_if_fail (context->frame->script != NULL);
   g_return_if_fail (context->global); /* check here because of swfdec_sandbox_(un)use() */
 
   /* setup data */
@@ -825,51 +826,6 @@ swfdec_as_context_run (SwfdecAsContext *context)
     step = NULL;
   }
 
-  if (SWFDEC_IS_AS_NATIVE_FUNCTION (frame->function)) {
-    SwfdecAsNativeFunction *native = SWFDEC_AS_NATIVE_FUNCTION (frame->function);
-    SwfdecAsValue rval = { 0, };
-    if (!frame->construct || native->construct_type == 0 ||
-	g_type_is_a (G_OBJECT_TYPE (frame->thisp), native->construct_type)) {
-      SwfdecAsValue *argv;
-      /* accumulate argv */
-      if (frame->argc == 0 || frame->argv != NULL) {
-	/* FIXME FIXME FIXME: no casting here please! */
-	argv = (SwfdecAsValue *) frame->argv;
-      } else {
-	SwfdecAsStack *stack;
-	SwfdecAsValue *cur;
-	guint i;
-	if (frame->argc > 128) {
-	  SWFDEC_FIXME ("allow calling native functions with more than 128 args (this one has %u)",
-	      frame->argc);
-	  frame->argc = 128;
-	}
-	argv = g_new (SwfdecAsValue, frame->argc);
-	stack = context->stack;
-	cur = context->cur;
-	for (i = 0; i < frame->argc; i++) {
-	  if (cur <= &stack->elements[0]) {
-	    stack = stack->next;
-	    cur = &stack->elements[stack->used_elements];
-	  }
-	  cur--;
-	  argv[i] = *cur;
-	}
-      }
-      native->native (context, frame->thisp, frame->argc, 
-	  argv, &rval);
-      if (argv != frame->argv)
-	g_free (argv);
-    } else {
-      if (frame->construct && native->construct_type != 0 &&
-	 !g_type_is_a (G_OBJECT_TYPE (frame->thisp), native->construct_type)) {
-	SWFDEC_FIXME ("Ignoring call to native constructor with invalid type");
-      }
-    }
-    swfdec_as_frame_return (frame, &rval);
-    goto out;
-  }
-  g_assert (frame->script);
   g_assert (frame->target);
   script = frame->script;
   context->version = script->version;
commit b600dd4647c41fa95892af93efeed0bebd5fedcc
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Sep 7 19:19:50 2008 +0200

    oops, I shifted the wrong value.

diff --git a/swfdec/jpeg/jpeg.c b/swfdec/jpeg/jpeg.c
index 76796c5..ef895e4 100644
--- a/swfdec/jpeg/jpeg.c
+++ b/swfdec/jpeg/jpeg.c
@@ -149,7 +149,7 @@ jpeg_decoder_verify_header (JpegDecoder *dec)
     }
   }
 
- if ((2 << 30) / dec->width / dec->height < dec->n_components) {
+ if ((1 << 30) / dec->width / dec->height < dec->n_components) {
    COG_ERROR ("image is too big (width %d, height %d, %d components)",
        dec->width, dec->height, dec->n_components);
    dec->error = TRUE;