Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/epeg
Dir : e17/libs/epeg/src/lib
Modified Files:
epeg_main.c
Log Message:
bug. fix.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/epeg/src/lib/epeg_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- epeg_main.c 26 Aug 2005 01:04:47 -0000 1.12
+++ epeg_main.c 27 Aug 2005 04:36:00 -0000 1.13
@@ -702,16 +702,23 @@
* epeg_file_output_set() or epeg_memory_output_set(). The image will be
* encoded at the deoded pixel size, using the quality, comment and thumbnail
* comment settings set on the image.
+ *
+ * retval 1 - error scale
+ * 2 - error encode
+ * 3 - error decode
+ * 4 - error decode ( setjmp )
*/
int
epeg_encode(Epeg_Image *im)
{
- if (_epeg_decode(im) != 0)
- return 1;
+ int ret;
+ if ((ret = _epeg_decode(im)) != 0) {
+ return (ret == 2 ? 4 : 3);
+ }
if (_epeg_scale(im) != 0)
return 1;
if (_epeg_encode(im) != 0)
- return 1;
+ return 2;
return 0;
}
@@ -859,6 +866,10 @@
return im;
}
+/**
+ retval 1 - malloc or other
+ 2 - setjmp error
+*/
static int
_epeg_decode(Epeg_Image *im)
{
@@ -913,10 +924,7 @@
im->jerr.pub.error_exit = _epeg_fatal_error_handler;
if (setjmp(im->jerr.setjmp_buffer))
- {
- epeg_close(im);
- return 1;
- }
+ return 2;
jpeg_calc_output_dimensions(&(im->in.jinfo));
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
