raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=11e38b5e86a057a85c3da49cab70d6f0d9ac115f
commit 11e38b5e86a057a85c3da49cab70d6f0d9ac115f
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Jul 16 11:13:29 2015 +0900
Revert "image_savers/jpeg: actually use normal jmp_buf/setjmp/longjmp"
This reverts commit 5beb47aa4d65d0be9d75550511dd184e9e69b4d8.
Revert "image_savers/jpeg: fix undefined behavior of using sigsetjmp on
jmp_buf"
This reverts commit 84c7751e195ea29efffbe55eaa732e739402a04a.
these end up with efl simply not compiling. efl tree does not build at
all now and this warrants a revert.
lib/evas/.libs/libevas.so: undefined reference to sigjmp'
collect2: error: ld returned 1 exit status
Makefile:19321: recipe for target 'bin/evas/evas_cserve2' failed
.. etc.
---
src/modules/evas/image_savers/jpeg/evas_image_save_jpeg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/evas/image_savers/jpeg/evas_image_save_jpeg.c
b/src/modules/evas/image_savers/jpeg/evas_image_save_jpeg.c
index e9034cb..3ef082e 100644
--- a/src/modules/evas/image_savers/jpeg/evas_image_save_jpeg.c
+++ b/src/modules/evas/image_savers/jpeg/evas_image_save_jpeg.c
@@ -14,8 +14,8 @@ static Evas_Image_Save_Func evas_image_save_jpeg_func =
struct _JPEG_error_mgr
{
- struct jpeg_error_mgr pub;
- jmp_buf setjmp_buffer;
+ struct jpeg_error_mgr pub;
+ jmp_buf setjmp_buffer;
};
typedef struct _JPEG_error_mgr *emptr;
@@ -73,7 +73,7 @@ save_image_jpeg(RGBA_Image *im, const char *file, int quality)
jerr.pub.error_exit = _JPEGFatalErrorHandler;
jerr.pub.emit_message = _JPEGErrorHandler2;
jerr.pub.output_message = _JPEGErrorHandler;
- if (sigjmp(jerr.setjmp_buffer))
+ if (sigsetjmp(jerr.setjmp_buffer, 1))
{
jpeg_destroy_compress(&cinfo);
fclose(f);
--
