Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/epeg
Dir : e17/libs/epeg/src/lib
Modified Files:
epeg_main.c
Log Message:
that was silly! kjpeg error handlign was wrong! :) fix fix
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epeg/src/lib/epeg_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- epeg_main.c 8 Dec 2003 21:33:59 -0000 1.7
+++ epeg_main.c 31 Mar 2004 02:35:59 -0000 1.8
@@ -554,19 +554,19 @@
{
struct jpeg_marker_struct *m;
+ im->in.jinfo.err = jpeg_std_error(&(im->jerr.pub));
+
im->jerr.pub.error_exit = _epeg_fatal_error_handler;
im->jerr.pub.emit_message = _epeg_error_handler2;
im->jerr.pub.output_message = _epeg_error_handler;
- im->in.jinfo.err = jpeg_std_error(&(im->jerr.pub));
-
if (setjmp(im->jerr.setjmp_buffer))
{
error:
epeg_close(im);
return NULL;
}
-
+
jpeg_create_decompress(&(im->in.jinfo));
jpeg_save_markers(&(im->in.jinfo), JPEG_APP0 + 7, 1024);
jpeg_save_markers(&(im->in.jinfo), JPEG_COM, 65535);
@@ -741,7 +741,19 @@
im->error = 1;
return;
}
+
im->out.jinfo.err = jpeg_std_error(&(im->jerr.pub));
+
+ im->jerr.pub.error_exit = _epeg_fatal_error_handler;
+ im->jerr.pub.emit_message = _epeg_error_handler2;
+ im->jerr.pub.output_message = _epeg_error_handler;
+
+ if (setjmp(im->jerr.setjmp_buffer))
+ {
+ error:
+ return;
+ }
+
jpeg_create_compress(&(im->out.jinfo));
jpeg_stdio_dest(&(im->out.jinfo), im->out.f);
im->out.jinfo.image_width = im->out.w;
@@ -812,6 +824,7 @@
emptr errmgr;
errmgr = (emptr)cinfo->err;
+ longjmp(errmgr->setjmp_buffer, 1);
return;
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
