Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_data.c eet_memfile.c
Log Message:
binary mode... and...
close file AFTER finish off of decompress! :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- eet_data.c 13 Jul 2004 18:23:16 -0000 1.17
+++ eet_data.c 28 Oct 2004 09:54:02 -0000 1.18
@@ -368,10 +368,10 @@
}
}
free(tdata);
- _eet_memfile_read_close(f);
/* end data decoding */
jpeg_finish_decompress(&cinfo);
jpeg_destroy_decompress(&cinfo);
+ _eet_memfile_read_close(f);
return d;
}
@@ -387,6 +387,15 @@
f = _eet_memfile_read_open(data, (size_t)size);
if (!f) return NULL;
+
+ if (0)
+ {
+ char buf[1];
+
+ while (fread(buf, 1, 1, f));
+ _eet_memfile_read_close(f);
+ return d;
+ }
cinfo.err = jpeg_std_error(&(jerr.pub));
jerr.pub.error_exit = _JPEGFatalErrorHandler;
jerr.pub.emit_message = _JPEGErrorHandler2;
@@ -445,7 +454,7 @@
for (l = 0; l < (*h); l += cinfo.rec_outbuf_height)
{
jpeg_read_scanlines(&cinfo, line, cinfo.rec_outbuf_height);
- scans = cinfo.rec_outbuf_height;
+ scans = cinfo.rec_outbuf_height;
if (((*h) - l) < scans) scans = (*h) - l;
ptr = tdata;
for (y = 0; y < scans; y++)
@@ -485,10 +494,10 @@
}
}
free(tdata);
- _eet_memfile_read_close(f);
/* end data decoding */
jpeg_finish_decompress(&cinfo);
jpeg_destroy_decompress(&cinfo);
+ _eet_memfile_read_close(f);
return d;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_memfile.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eet_memfile.c 17 Jan 2004 14:58:50 -0000 1.4
+++ eet_memfile.c 28 Oct 2004 09:54:02 -0000 1.5
@@ -5,7 +5,7 @@
_eet_memfile_read_open(void *data, size_t size)
{
#ifdef HAVE_FMEMOPEN
- return (FILE *)fmemopen(data, size, "r");
+ return (FILE *)fmemopen(data, size, "rb");
#else
FILE *f;
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
