Displaying 14 results from an estimated 14 matches for "jpegtabl".
Did you mean:
jpegtables
2007 Mar 21
0
5 commits - README libswfdec/jpeg libswfdec/swfdec_image.c
...len);
diff --git a/libswfdec/swfdec_image.c b/libswfdec/swfdec_image.c
index dc96fb6..79e353a 100644
--- a/libswfdec/swfdec_image.c
+++ b/libswfdec/swfdec_image.c
@@ -137,8 +137,22 @@ swfdec_image_jpeg_load (SwfdecImage *ima
dec = jpeg_decoder_new ();
- jpeg_decoder_addbits (dec, image->jpegtables->data,
- image->jpegtables->length);
+ if (image->jpegtables) {
+ if (image->jpegtables->data[0] != 0xff || image->jpegtables->data[1] != 0xd8) {
+ SWFDEC_ERROR("not jpeg %02x %02x",
+ image->jpegtables->data[0], image->jpegtables-...
2007 Apr 17
0
15 commits - libswfdec/jpeg libswfdec/swfdec_bits.c libswfdec/swfdec_edittext.c libswfdec/swfdec_font.c libswfdec/swfdec_image.c libswfdec/swfdec_root_sprite.c libswfdec/swfdec_script.c libswfdec/swfdec_shape.c libswfdec/swfdec_sprite.c
...0200
Fix various failures to sanely read buffers
diff --git a/libswfdec/swfdec_image.c b/libswfdec/swfdec_image.c
index 612b52b..6d15e27 100644
--- a/libswfdec/swfdec_image.c
+++ b/libswfdec/swfdec_image.c
@@ -122,9 +122,7 @@ tag_func_define_bits_jpeg (SwfdecSwfDeco
} else {
image->jpegtables = swfdec_buffer_ref (s->jpegtables);
}
- image->raw_data = swfdec_buffer_ref (bits->buffer);
-
- bits->ptr += bits->buffer->length - 2;
+ image->raw_data = swfdec_bits_get_buffer (bits, -1);
return SWFDEC_STATUS_OK;
}
@@ -146,14 +144,14 @@ swfdec_image_jpeg_load (...
2007 Apr 17
0
Branch 'as' - 17 commits - libswfdec/jpeg libswfdec/swfdec_bits.c libswfdec/swfdec_font.c libswfdec/swfdec_image.c libswfdec/swfdec_root_sprite.c libswfdec/swfdec_script.c libswfdec/swfdec_shape.c libswfdec/swfdec_sound.c libswfdec/swfdec_sprite.c
...0200
Fix various failures to sanely read buffers
diff --git a/libswfdec/swfdec_image.c b/libswfdec/swfdec_image.c
index 612b52b..6d15e27 100644
--- a/libswfdec/swfdec_image.c
+++ b/libswfdec/swfdec_image.c
@@ -122,9 +122,7 @@ tag_func_define_bits_jpeg (SwfdecSwfDeco
} else {
image->jpegtables = swfdec_buffer_ref (s->jpegtables);
}
- image->raw_data = swfdec_buffer_ref (bits->buffer);
-
- bits->ptr += bits->buffer->length - 2;
+ image->raw_data = swfdec_bits_get_buffer (bits, -1);
return SWFDEC_STATUS_OK;
}
@@ -146,14 +144,14 @@ swfdec_image_jpeg_load (...
2007 Nov 10
1
3 commits - libswfdec/swfdec_image.c libswfdec/swfdec_image.h
...y (image->surface);
image->surface = NULL;
- } else if (image->data) {
- g_free (image->data);
}
- image->data = NULL;
}
static void
@@ -171,25 +169,28 @@ static void
swfdec_image_jpeg_load (SwfdecImage *image)
{
gboolean ret;
+ guint8 *data;
if (image->jpegtables) {
ret = swfdec_jpeg_decode_argb (
image->jpegtables->data, image->jpegtables->length,
image->raw_data->data, image->raw_data->length,
- (void *)&image->data, &image->width, &image->height);
+ (void *) &data, &a...
2007 Jun 15
0
Branch 'as' - 5 commits - libswfdec/swfdec_as_native_function.c libswfdec/swfdec_edittext.c libswfdec/swfdec_edittext.h libswfdec/swfdec_font.c libswfdec/swfdec_font.h libswfdec/swfdec_image.c libswfdec/swfdec_image.h libswfdec/swfdec_morphshape.h
...fDecoder * s,
+ guint tag);
G_END_DECLS
#endif
diff --git a/libswfdec/swfdec_image.c b/libswfdec/swfdec_image.c
index 5a60681..075f771 100644
--- a/libswfdec/swfdec_image.c
+++ b/libswfdec/swfdec_image.c
@@ -90,19 +90,23 @@ swfdec_image_init (SwfdecImage * image)
}
int
-swfdec_image_jpegtables (SwfdecSwfDecoder * s)
+swfdec_image_jpegtables (SwfdecSwfDecoder * s, guint tag)
{
SwfdecBits *bits = &s->b;
SWFDEC_DEBUG ("swfdec_image_jpegtables");
+ if (s->jpegtables) {
+ SWFDEC_FIXME ("duplicate DefineJPEGTables tag. Deleting first one");
+ s...
2007 Jan 16
0
9 commits - libswfdec/js libswfdec/Makefile.am libswfdec/swfdec_audio_stream.c libswfdec/swfdec_audio_stream.h libswfdec/swfdec_cache.c libswfdec/swfdec_cached.c libswfdec/swfdec_cached.h libswfdec/swfdec_edittext_movie.c libswfdec/swfdec_image.c
...+ SwfdecImage *image = SWFDEC_IMAGE (cached);
if (image->surface) {
cairo_surface_destroy (image->surface);
@@ -58,7 +58,6 @@ swfdec_image_dispose (GObject *object)
{
SwfdecImage * image = SWFDEC_IMAGE (object);
- swfdec_image_unload (&image->handle);
if (image->jpegtables) {
swfdec_buffer_unref (image->jpegtables);
image->jpegtables = NULL;
@@ -75,14 +74,16 @@ static void
swfdec_image_class_init (SwfdecImageClass * g_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (g_class);
+ SwfdecCachedClass *cached_class = SWFDEC_CACHED_CLASS (g_clas...
2007 Mar 29
0
Branch 'as' - 9 commits - configure.ac doc/swfdec-sections.txt libswfdec/Makefile.am libswfdec/swfdec_as_context.c libswfdec/swfdec_as_context.h libswfdec/swfdec_as_frame.c libswfdec/swfdec_as_frame.h libswfdec/swfdec_as_stack.c
...bswfdec/swfdec_swf_decoder.c
@@ -60,7 +60,7 @@ swfdec_decoder_dispose (GObject *object)
swfdec_buffer_unref (s->uncompressed_buffer);
s->uncompressed_buffer = NULL;
}
- swfdec_buffer_queue_free (s->input_queue);
+ swfdec_buffer_queue_unref (s->input_queue);
if (s->jpegtables) {
swfdec_buffer_unref (s->jpegtables);
diff --git a/test/sound/sound.c b/test/sound/sound.c
index f42149f..6cbb5cc 100644
--- a/test/sound/sound.c
+++ b/test/sound/sound.c
@@ -119,7 +119,7 @@ finish_stream (TestStream *stream)
gboolean ret = TRUE;
buffer = swfdec_buffer_queue_pul...
2007 Feb 13
0
libswfdec/jpeg libswfdec/swfdec_image.c
...fdec_debug.h"
@@ -133,24 +133,24 @@ tag_func_define_bits_jpeg (SwfdecSwfDeco
static void
swfdec_image_jpeg_load (SwfdecImage *image)
{
- JpegRGBDecoder *dec;
+ JpegDecoder *dec;
- dec = jpeg_rgb_decoder_new ();
+ dec = jpeg_decoder_new ();
- jpeg_rgb_decoder_addbits (dec, image->jpegtables->data,
+ jpeg_decoder_addbits (dec, image->jpegtables->data,
image->jpegtables->length);
- jpeg_rgb_decoder_addbits (dec, image->raw_data->data + 2,
+ jpeg_decoder_addbits (dec, image->raw_data->data + 2,
image->raw_data->length - 2);
- jpeg_rgb_...
2007 Oct 23
0
6 commits - libswfdec/swfdec_as_frame.c libswfdec/swfdec_as_internal.h libswfdec/swfdec_as_interpret.c libswfdec/swfdec_as_interpret.h libswfdec/swfdec_as_object.c libswfdec/swfdec_as_script_function.c libswfdec/swfdec_flash_security.c
...swfdec/swfdec_tag.c b/libswfdec/swfdec_tag.c
index bad0be3..61827e7 100644
--- a/libswfdec/swfdec_tag.c
+++ b/libswfdec/swfdec_tag.c
@@ -655,7 +655,7 @@ static struct tag_func_struct tag_funcs[] = {
[SWFDEC_TAG_DEFINEBUTTON] = {"DefineButton", tag_func_define_button, 0},
[SWFDEC_TAG_JPEGTABLES] = {"JPEGTables", swfdec_image_jpegtables, 0},
[SWFDEC_TAG_SETBACKGROUNDCOLOR] =
- {"SetBackgroundColor", tag_func_set_background_color, 0},
+ {"SetBackgroundColor", tag_func_set_background_color, SWFDEC_TAG_DEFINE_SPRITE },
[SWFDEC_TAG_DEFINEFONT] =...
2007 Mar 07
0
13 commits - libswfdec/Makefile.am libswfdec/swfdec_js_global.c libswfdec/swfdec_js_movie.c libswfdec/swfdec_root_movie.c libswfdec/swfdec_root_movie.h libswfdec/swfdec_script.c libswfdec/swfdec_sprite.h libswfdec/swfdec_sprite_movie.c
...(s->exports, name);
- return result;
}
gpointer
diff --git a/libswfdec/swfdec_swf_decoder.h b/libswfdec/swfdec_swf_decoder.h
index 48541eb..6000e24 100644
--- a/libswfdec/swfdec_swf_decoder.h
+++ b/libswfdec/swfdec_swf_decoder.h
@@ -68,8 +68,6 @@ struct _SwfdecSwfDecoder
SwfdecBuffer *jpegtables;
char *url;
-
- GHashTable * exports; /* string->character mapping of exported characters */
};
struct _SwfdecSwfDecoderClass {
@@ -83,8 +81,6 @@ gpointer swfdec_swf_decoder_get_characte
gpointer swfdec_swf_decoder_create_character (SwfdecSwfDecoder * s,
unsigned int...
2007 Jun 18
0
Branch 'as' - 8 commits - libswfdec/swfdec_movie.c libswfdec/swfdec_sprite.c libswfdec/swfdec_sprite.h libswfdec/swfdec_sprite_movie.c libswfdec/swfdec_sprite_movie.h libswfdec/swfdec_swf_decoder.c libswfdec/swfdec_swf_decoder.h
...ove_object, SPRITE},
+ [SWFDEC_TAG_REMOVEOBJECT] = {"RemoveObject", tag_func_enqueue, SPRITE},
[SWFDEC_TAG_DEFINEBITSJPEG] = {"DefineBitsJPEG", tag_func_define_bits_jpeg, 0},
[SWFDEC_TAG_DEFINEBUTTON] = {"DefineButton", tag_func_define_button, 0},
[SWFDEC_TAG_JPEGTABLES] = {"JPEGTables", swfdec_image_jpegtables, 0},
@@ -608,8 +641,8 @@ static struct tag_func_struct tag_funcs[
[SWFDEC_TAG_DEFINESHAPE2] = {"DefineShape2", tag_define_shape, 0},
[SWFDEC_TAG_DEFINEBUTTONCXFORM] = {"DefineButtonCXForm", NULL, 0},
[SWFDEC_TAG_PROT...
2007 Feb 06
0
21 commits - configure.ac libswfdec/swfdec_audio_event.c libswfdec/swfdec_bits.c libswfdec/swfdec_button_movie.c libswfdec/swfdec_color.c libswfdec/swfdec_color.h libswfdec/swfdec_compiler.c libswfdec/swfdec_edittext.c libswfdec/swfdec_image.c
...and loaded */
+ guint8 * data; /* image data in CAIRO_FORMAT_ARGB32 but NOT premultiplied */
int width;
int height;
int rowstride;
+ cairo_surface_t * surface; /* surface that owns the data pointer or NULL (doesn't always work) */
SwfdecImageType type;
SwfdecBuffer * jpegtables;
@@ -66,9 +67,9 @@ struct _SwfdecImageClass {
GType swfdec_image_get_type (void);
cairo_surface_t * swfdec_image_get_surface (SwfdecImage * image);
-cairo_surface_t * swfdec_image_get_surface_for_target
+cairo_surface_t * swfdec_image_get_surface_transformed
(SwfdecImage * imag...
2007 Feb 06
0
Branch 'interpreter' - 8 commits - libswfdec/swfdec_bits.c libswfdec/swfdec_color.c libswfdec/swfdec_color.h libswfdec/swfdec_edittext.c libswfdec/swfdec_image.c libswfdec/swfdec_image.h libswfdec/swfdec_pattern.c libswfdec/swfdec_sprite.c test/dump.c
...and loaded */
+ guint8 * data; /* image data in CAIRO_FORMAT_ARGB32 but NOT premultiplied */
int width;
int height;
int rowstride;
+ cairo_surface_t * surface; /* surface that owns the data pointer or NULL (doesn't always work) */
SwfdecImageType type;
SwfdecBuffer * jpegtables;
@@ -66,9 +67,9 @@ struct _SwfdecImageClass {
GType swfdec_image_get_type (void);
cairo_surface_t * swfdec_image_get_surface (SwfdecImage * image);
-cairo_surface_t * swfdec_image_get_surface_for_target
+cairo_surface_t * swfdec_image_get_surface_transformed
(SwfdecImage * imag...
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
...,
+ [SWFDEC_TAG_REMOVEOBJECT] = {"RemoveObject", tag_func_enqueue, SWFDEC_TAG_DEFINE_SPRITE },
[SWFDEC_TAG_DEFINEBITSJPEG] = {"DefineBitsJPEG", tag_func_define_bits_jpeg, 0},
[SWFDEC_TAG_DEFINEBUTTON] = {"DefineButton", tag_func_define_button, 0},
[SWFDEC_TAG_JPEGTABLES] = {"JPEGTables", swfdec_image_jpegtables, 0},
@@ -660,22 +658,22 @@ static struct tag_func_struct tag_funcs[] = {
{"SetBackgroundColor", tag_func_set_background_color, 0},
[SWFDEC_TAG_DEFINEFONT] = {"DefineFont", tag_func_define_font, 0},
[SWFDEC_TAG_DE...