Displaying 12 results from an estimated 12 matches for "jpegdecoder".
2007 Feb 13
0
libswfdec/jpeg libswfdec/swfdec_image.c
...+
+#define OIL_DEBUG(...) do {} while (0)
#include "jpeg_internal.h"
+#define MAX(a,b) ((a)>(b) ? (a) : (b))
+
#define JPEG_MARKER_STUFFED 0x00
#define JPEG_MARKER_TEM 0x01
@@ -58,7 +65,7 @@
struct jpeg_marker_struct
{
- int tag;
+ unsigned int tag;
int (*func) (JpegDecoder * dec, bits_t * bits);
char *name;
unsigned int flags;
@@ -90,13 +97,13 @@ static struct jpeg_marker_struct jpeg_ma
{0xc6, NULL, "differential progressive DCT"},
{0xc7, NULL, "differential lossless (sequential)"},
{0xc8, NULL, "reserved"},
- {0xc9, NULL...
2007 Apr 17
0
8 commits - configure.ac doc/Makefile.am libswfdec/jpeg libswfdec/swfdec_debug.h libswfdec/swfdec_image.c
...#define JPEG_MARKER_EXP 0xdf
-#define JPEG_MARKER_APP(x) (0xe0 + (x))
-#define JPEG_MARKER_JPG_(x) (0xf0 + (x))
-#define JPEG_MARKER_COM 0xfe
+extern uint8_t jpeg_standard_tables[];
+extern int jpeg_standard_tables_size;
-#define JPEG_MARKER_JFIF JPEG_MARKER_APP(0)
+void jpeg_decoder_error(JpegDecoder *dec, char *fmt, ...);
-struct jpeg_marker_struct
-{
- unsigned int tag;
- int (*func) (JpegDecoder * dec, bits_t * bits);
- char *name;
- unsigned int flags;
-};
-static struct jpeg_marker_struct jpeg_markers[] = {
- {0xc0, jpeg_decoder_sof_baseline_dct,
- "baseline DCT"},
-...
2007 Apr 18
0
6 commits - libswfdec-gtk/swfdec_gtk_widget.c libswfdec/jpeg libswfdec/swfdec_image.c
...te <otte@gnome.org>
Date: Wed Apr 18 14:22:08 2007 +0200
add code to ignore SOI and EOI markers
diff --git a/libswfdec/jpeg/jpeg.c b/libswfdec/jpeg/jpeg.c
index b0de148..58dd755 100644
--- a/libswfdec/jpeg/jpeg.c
+++ b/libswfdec/jpeg/jpeg.c
@@ -543,6 +543,7 @@ jpeg_decoder_get_marker (JpegDecoder *de
int a,b;
JpegBits *bits = &dec->bits;
+again:
if (jpeg_bits_available(bits) < 2) {
return FALSE;
}
@@ -557,6 +558,12 @@ jpeg_decoder_get_marker (JpegDecoder *de
b = jpeg_bits_get_u8 (bits);
} while (b == 0xff && jpeg_bits_error(bits));
+ /* Flash...
2007 Apr 18
2
libswfdec/jpeg
...ed Apr 18 10:47:06 2007 +0200
remove leftover debugging statement
diff --git a/libswfdec/jpeg/jpeg_rgb_decoder.c b/libswfdec/jpeg/jpeg_rgb_decoder.c
index c3109de..2949751 100644
--- a/libswfdec/jpeg/jpeg_rgb_decoder.c
+++ b/libswfdec/jpeg/jpeg_rgb_decoder.c
@@ -202,7 +202,6 @@ get_argb_422v (JpegDecoder *dec)
int halfheight;
int j;
-OIL_ERROR("got here");
tmp = malloc (4 * dec->width * dec->height);
tmp_u = malloc (dec->width);
tmp_v = malloc (dec->width);
2007 Dec 10
0
5 commits - libswfdec/jpeg libswfdec/swfdec_as_interpret.c libswfdec/swfdec_bits.c libswfdec/swfdec_cached.c libswfdec/swfdec_codec_adpcm.c libswfdec/swfdec_codec_audio.c libswfdec/swfdec_flash_security.c libswfdec/swfdec_image.c
...rg>
Date: Mon Dec 10 21:26:54 2007 +0100
make all decoder functions use uint32_t
diff --git a/libswfdec/jpeg/jpeg.h b/libswfdec/jpeg/jpeg.h
index eff4c03..6c0ba41 100644
--- a/libswfdec/jpeg/jpeg.h
+++ b/libswfdec/jpeg/jpeg.h
@@ -155,7 +155,7 @@ int jpeg_decoder_get_component_subsampling(JpegDecoder *dec, int id,
int jpeg_decoder_get_component_ptr(JpegDecoder *dec, int id,
unsigned char **image, int *rowstride);
-unsigned char *jpeg_decoder_get_argb_image (JpegDecoder *dec);
+uint32_t *jpeg_decoder_get_argb_image (JpegDecoder *dec);
int jpeg_decode_argb (uint8_t *data, int length, uint32...
2007 Mar 19
0
7 commits - libswfdec/jpeg libswfdec/swfdec_button_movie.c libswfdec/swfdec_js_net_stream.c libswfdec/swfdec_movie.c libswfdec/swfdec_net_stream.c libswfdec/swfdec_video.c player/swfdec_debug_movies.c
...min Otte <otte@gnome.org>
Date: Mon Mar 19 16:29:27 2007 +0100
return a const component_ptr
diff --git a/libswfdec/jpeg/jpeg.c b/libswfdec/jpeg/jpeg.c
index 06c60c5..7c9086d 100644
--- a/libswfdec/jpeg/jpeg.c
+++ b/libswfdec/jpeg/jpeg.c
@@ -805,7 +805,7 @@ jpeg_decoder_get_image_size (JpegDecoder
int
jpeg_decoder_get_component_ptr (JpegDecoder * dec, int id,
- unsigned char **image, int *rowstride)
+ const unsigned char **image, int *rowstride)
{
int i;
diff --git a/libswfdec/jpeg/jpeg.h b/libswfdec/jpeg/jpeg.h
index fac03bc..f9fd194 100644
--- a/libswfdec/jpeg/jpeg.h
+++ b/...
2007 Jul 18
0
12 commits - configure.ac doc/swfdec-sections.txt libswfdec-gtk/swfdec_playback_alsa.c libswfdec/jpeg libswfdec/Makefile.am libswfdec/swfdec_amf.c libswfdec/swfdec_as_array.c libswfdec/swfdec_as_boolean.h libswfdec/swfdec_as_context.c
...x b7398d7..e9a98ef 100644
--- a/libswfdec/jpeg/jpeg.c
+++ b/libswfdec/jpeg/jpeg.c
@@ -27,8 +27,6 @@ void jpeg_decoder_start_of_scan (JpegDec
/* misc helper function declarations */
-static char *sprintbits (char *str, unsigned int bits, int n);
-
static void jpeg_load_standard_huffman_tables (JpegDecoder * dec);
static void jpeg_decoder_verify_header (JpegDecoder *dec);
@@ -36,7 +34,7 @@ static void jpeg_decoder_init_decoder (J
void
-jpeg_decoder_error(JpegDecoder *dec, char *fmt, ...)
+jpeg_decoder_error(JpegDecoder *dec, const char *fmt, ...)
{
va_list varargs;
@@ -195,8 +193,23 @@...
2007 Mar 21
0
5 commits - README libswfdec/jpeg libswfdec/swfdec_image.c
...5:42:59 2007 -0700
Quick hack to block out some bad JPEG images. Fixed JPEG decoder
will come later.
diff --git a/libswfdec/jpeg/jpeg.c b/libswfdec/jpeg/jpeg.c
index 7c9086d..216d8a5 100644
--- a/libswfdec/jpeg/jpeg.c
+++ b/libswfdec/jpeg/jpeg.c
@@ -780,6 +780,19 @@ jpeg_decoder_addbits (JpegDecoder * dec,
{
unsigned int offset;
+#if 0
+ {
+ static int index = 0;
+ FILE *file;
+ char s[100];
+
+ sprintf(s, "image-%d.jpg", index++);
+ file = fopen(s, "w");
+ fwrite (data, len, 1, file);
+ fclose(file);
+ }
+#endif
+
offset = dec->bits.ptr -...
2007 Jul 21
0
12 commits - configure.ac doc/Makefile.am doc/swfdec-sections.txt libswfdec/jpeg libswfdec/swfdec_as_array.c libswfdec/swfdec_as_object.c libswfdec/swfdec_as_strings.c libswfdec/swfdec_player.c libswfdec/swfdec_player.h libswfdec/swfdec_player_internal.h
...: "dc", th);
if (tc > 1 || th > 3) {
- jpeg_decoder_error(dec, "huffman table type or index out of range");
+ jpeg_decoder_error(dec, "huffman table type or idx out of range");
return;
}
@@ -911,7 +911,7 @@ jpeg_decoder_start_of_scan (JpegDecoder
int ac_table;
int x;
int y;
- int index;
+ int idx;
int h_subsample;
int v_subsample;
int quant_index;
@@ -920,22 +920,22 @@ jpeg_decoder_start_of_scan (JpegDecoder
tmp = jpeg_bits_get_u8 (bits);
dc_table = tmp >> 4;
ac_table = tmp & 0x...
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
...amin Otte <otte@gnome.org>
Date: Tue Apr 17 11:35:21 2007 +0200
handle 0 bytes of input gracefully
diff --git a/libswfdec/jpeg/jpeg.c b/libswfdec/jpeg/jpeg.c
index 216d8a5..228a4d8 100644
--- a/libswfdec/jpeg/jpeg.c
+++ b/libswfdec/jpeg/jpeg.c
@@ -780,6 +780,9 @@ jpeg_decoder_addbits (JpegDecoder * dec,
{
unsigned int offset;
+ if (len == 0)
+ return 0;
+
#if 0
{
static int index = 0;
diff-tree 0fecc667a7f73138a1e16b12a0c9c7f4081d369c (from 56fd58406827a35ff524eb9340d07602e819e6f2)
Author: Benjamin Otte <otte@gnome.org>
Date: Tue Apr 17 11:34:56 2007 +0200
cl...
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
...amin Otte <otte@gnome.org>
Date: Tue Apr 17 11:35:21 2007 +0200
handle 0 bytes of input gracefully
diff --git a/libswfdec/jpeg/jpeg.c b/libswfdec/jpeg/jpeg.c
index 216d8a5..228a4d8 100644
--- a/libswfdec/jpeg/jpeg.c
+++ b/libswfdec/jpeg/jpeg.c
@@ -780,6 +780,9 @@ jpeg_decoder_addbits (JpegDecoder * dec,
{
unsigned int offset;
+ if (len == 0)
+ return 0;
+
#if 0
{
static int index = 0;
diff-tree 0fecc667a7f73138a1e16b12a0c9c7f4081d369c (from 56fd58406827a35ff524eb9340d07602e819e6f2)
Author: Benjamin Otte <otte@gnome.org>
Date: Tue Apr 17 11:34:56 2007 +0200
cl...
2008 Jun 17
2
[Bug 16395] New: glib abort for "double free or corruption" in jpeg code
...j = 250
halfwidth = 1
#7 0xb1aeb485 in jpeg_decoder_get_argb_image (dec=0x0) at
jpeg_rgb_decoder.c:89
No locals.
#8 0xb1aeb4fe in jpeg_decode_argb (data=0xafb9a57 "????", length=515,
image=0xbfd7edc8, width=0xa8c85a0, height=0xa8c85a4) at jpeg_rgb_decoder.c:63
dec = (JpegDecoder *) 0xabb8d58
ret = <value optimized out>
#9 0xb1a95670 in swfdec_jpeg_decode_argb (renderer=0x974f520, data1=0xafb9a57
"????", length1=515, data2=0x0, length2=0, outdata=0xbfd7edc8,
width=0xa8c85a0, height=0xa8c85a4)
at swfdec_image.c:164
ret = 0
#10 0xb1a965fd...