Commit f53d2850 authored by Manish Singh's avatar Manish Singh Committed by Manish Singh
Browse files

Uglier workaround for bug #138357, since the previous one did break error

2004-04-09  Manish Singh  <yosh@gimp.org>

        * plug-ins/common/jpeg.c: Uglier workaround for bug #138357, since
        the previous one did break error handling. Fixes bug #139571.
parent 1292f5d9
2004-04-09 Manish Singh <yosh@gimp.org>
* plug-ins/common/jpeg.c: Uglier workaround for bug #138357, since
the previous one did break error handling. Fixes bug #139571.
2004-04-09 Henrik Brix Andersen <brix@gimp.org>
* README.i18n: s/14/20/ plus whitespace clean-up.
......
......@@ -700,14 +700,17 @@ COM_handler (j_decompress_ptr cinfo)
typedef struct my_error_mgr
{
/* This field should be first to guarantee proper alignment of the
* setjmp_buffer on all platforms. Specifically, on linux ia64 this
* needs to be 16-byte aligned and some glibc/icc combinations don't
* guarantee this. See bug #138357 for details.
struct jpeg_error_mgr pub; /* "public" fields */
#ifdef __ia64__
/* Ugh, the jmp_buf field needs to be 16-byte aligned on ia64 and some
* glibc/icc combinations don't guarantee this. So we pad. See bug #138357
* for details.
*/
jmp_buf setjmp_buffer; /* for return to caller */
long double dummy;
#endif
struct jpeg_error_mgr pub; /* "public" fields */
jmp_buf setjmp_buffer; /* for return to caller */
} *my_error_ptr;
/*
......
......@@ -700,14 +700,17 @@ COM_handler (j_decompress_ptr cinfo)
typedef struct my_error_mgr
{
/* This field should be first to guarantee proper alignment of the
* setjmp_buffer on all platforms. Specifically, on linux ia64 this
* needs to be 16-byte aligned and some glibc/icc combinations don't
* guarantee this. See bug #138357 for details.
struct jpeg_error_mgr pub; /* "public" fields */
#ifdef __ia64__
/* Ugh, the jmp_buf field needs to be 16-byte aligned on ia64 and some
* glibc/icc combinations don't guarantee this. So we pad. See bug #138357
* for details.
*/
jmp_buf setjmp_buffer; /* for return to caller */
long double dummy;
#endif
struct jpeg_error_mgr pub; /* "public" fields */
jmp_buf setjmp_buffer; /* for return to caller */
} *my_error_ptr;
/*
......
......@@ -700,14 +700,17 @@ COM_handler (j_decompress_ptr cinfo)
typedef struct my_error_mgr
{
/* This field should be first to guarantee proper alignment of the
* setjmp_buffer on all platforms. Specifically, on linux ia64 this
* needs to be 16-byte aligned and some glibc/icc combinations don't
* guarantee this. See bug #138357 for details.
struct jpeg_error_mgr pub; /* "public" fields */
#ifdef __ia64__
/* Ugh, the jmp_buf field needs to be 16-byte aligned on ia64 and some
* glibc/icc combinations don't guarantee this. So we pad. See bug #138357
* for details.
*/
jmp_buf setjmp_buffer; /* for return to caller */
long double dummy;
#endif
struct jpeg_error_mgr pub; /* "public" fields */
jmp_buf setjmp_buffer; /* for return to caller */
} *my_error_ptr;
/*
......
......@@ -700,14 +700,17 @@ COM_handler (j_decompress_ptr cinfo)
typedef struct my_error_mgr
{
/* This field should be first to guarantee proper alignment of the
* setjmp_buffer on all platforms. Specifically, on linux ia64 this
* needs to be 16-byte aligned and some glibc/icc combinations don't
* guarantee this. See bug #138357 for details.
struct jpeg_error_mgr pub; /* "public" fields */
#ifdef __ia64__
/* Ugh, the jmp_buf field needs to be 16-byte aligned on ia64 and some
* glibc/icc combinations don't guarantee this. So we pad. See bug #138357
* for details.
*/
jmp_buf setjmp_buffer; /* for return to caller */
long double dummy;
#endif
struct jpeg_error_mgr pub; /* "public" fields */
jmp_buf setjmp_buffer; /* for return to caller */
} *my_error_ptr;
/*
......
......@@ -700,14 +700,17 @@ COM_handler (j_decompress_ptr cinfo)
typedef struct my_error_mgr
{
/* This field should be first to guarantee proper alignment of the
* setjmp_buffer on all platforms. Specifically, on linux ia64 this
* needs to be 16-byte aligned and some glibc/icc combinations don't
* guarantee this. See bug #138357 for details.
struct jpeg_error_mgr pub; /* "public" fields */
#ifdef __ia64__
/* Ugh, the jmp_buf field needs to be 16-byte aligned on ia64 and some
* glibc/icc combinations don't guarantee this. So we pad. See bug #138357
* for details.
*/
jmp_buf setjmp_buffer; /* for return to caller */
long double dummy;
#endif
struct jpeg_error_mgr pub; /* "public" fields */
jmp_buf setjmp_buffer; /* for return to caller */
} *my_error_ptr;
/*
......
......@@ -700,14 +700,17 @@ COM_handler (j_decompress_ptr cinfo)
typedef struct my_error_mgr
{
/* This field should be first to guarantee proper alignment of the
* setjmp_buffer on all platforms. Specifically, on linux ia64 this
* needs to be 16-byte aligned and some glibc/icc combinations don't
* guarantee this. See bug #138357 for details.
struct jpeg_error_mgr pub; /* "public" fields */
#ifdef __ia64__
/* Ugh, the jmp_buf field needs to be 16-byte aligned on ia64 and some
* glibc/icc combinations don't guarantee this. So we pad. See bug #138357
* for details.
*/
jmp_buf setjmp_buffer; /* for return to caller */
long double dummy;
#endif
struct jpeg_error_mgr pub; /* "public" fields */
jmp_buf setjmp_buffer; /* for return to caller */
} *my_error_ptr;
/*
......
......@@ -700,14 +700,17 @@ COM_handler (j_decompress_ptr cinfo)
typedef struct my_error_mgr
{
/* This field should be first to guarantee proper alignment of the
* setjmp_buffer on all platforms. Specifically, on linux ia64 this
* needs to be 16-byte aligned and some glibc/icc combinations don't
* guarantee this. See bug #138357 for details.
struct jpeg_error_mgr pub; /* "public" fields */
#ifdef __ia64__
/* Ugh, the jmp_buf field needs to be 16-byte aligned on ia64 and some
* glibc/icc combinations don't guarantee this. So we pad. See bug #138357
* for details.
*/
jmp_buf setjmp_buffer; /* for return to caller */
long double dummy;
#endif
struct jpeg_error_mgr pub; /* "public" fields */
jmp_buf setjmp_buffer; /* for return to caller */
} *my_error_ptr;
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment