summaryrefslogtreecommitdiff
path: root/src/modules/evas/image_savers
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-07-16 11:13:29 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-07-16 11:14:29 +0900
commit11e38b5e86a057a85c3da49cab70d6f0d9ac115f (patch)
treeb435f07942097d207872a9c77ceab71a2c636eb9 /src/modules/evas/image_savers
parent5beb47aa4d65d0be9d75550511dd184e9e69b4d8 (diff)
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.
Diffstat (limited to 'src/modules/evas/image_savers')
-rw-r--r--src/modules/evas/image_savers/jpeg/evas_image_save_jpeg.c6
1 files 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 e9034cbf7f..3ef082e6dc 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 =
14 14
15struct _JPEG_error_mgr 15struct _JPEG_error_mgr
16{ 16{
17 struct jpeg_error_mgr pub; 17 struct jpeg_error_mgr pub;
18 jmp_buf setjmp_buffer; 18 jmp_buf setjmp_buffer;
19}; 19};
20typedef struct _JPEG_error_mgr *emptr; 20typedef struct _JPEG_error_mgr *emptr;
21 21
@@ -73,7 +73,7 @@ save_image_jpeg(RGBA_Image *im, const char *file, int quality)
73 jerr.pub.error_exit = _JPEGFatalErrorHandler; 73 jerr.pub.error_exit = _JPEGFatalErrorHandler;
74 jerr.pub.emit_message = _JPEGErrorHandler2; 74 jerr.pub.emit_message = _JPEGErrorHandler2;
75 jerr.pub.output_message = _JPEGErrorHandler; 75 jerr.pub.output_message = _JPEGErrorHandler;
76 if (sigjmp(jerr.setjmp_buffer)) 76 if (sigsetjmp(jerr.setjmp_buffer, 1))
77 { 77 {
78 jpeg_destroy_compress(&cinfo); 78 jpeg_destroy_compress(&cinfo);
79 fclose(f); 79 fclose(f);