cvs: php4 /ext/exif exif.c

helly Sat Mar 16 16:19:18 2002 EDT Modified files: /php4/ext/exif exif.c Log: -quick hack to bug in streams....but where? Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.64 php4/ext/exif/exif.c:1.65 --- php4/ext/exif/exif.c:1.64 Sat Mar 16 15:25:51 2002 +++ php4/ext/exif/exif.c Sat Mar 16 16:19:17 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.64 2002/03/16 20:25:51 helly Exp $ */ +/* $Id: exif.c,v 1.65 2002/03/16 21:19:17 helly Exp $ */ /* ToDos * @@ -92,7 +92,7 @@ #define auto_fseek(f,o,w) php_stream_seek(f,o,w) #define auto_fread(b,s,n,f) php_stream_read(f,b,(s)*(n)) #define auto_fgetc(f) php_stream_getc(f) -#define auto_fclose(f) php_stream_close(f) +#define auto_fclose(f) php_stream_free(f,0) #else #define auto_ftell(f) ftell(f) #define auto_fseek(f,o,w) fseek(f,o,w) @@ -113,7 +113,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.3 $Id: exif.c,v 1.64 2002/03/16 20:25:51 helly Exp $" +#define EXIF_VERSION "1.3 $Id: exif.c,v 1.65 2002/03/16 21:19:17 helly Exp $" PHP_MINFO_FUNCTION(exif); @@ -2988,10 +2988,11 @@ mem_stream = php_memory_stream_create(); org_stream = ImageInfo->infile; ImageInfo->FileSize = php_stream_copy_to_stream(org_stream, mem_stream, PHP_STREAM_COPY_ALL); - //auto_fclose(org_stream); + org_stream->wrapper->destroy = NULL; + auto_fclose(org_stream); ImageInfo->infile = mem_stream; #ifdef EXIF_DEBUG - php_error(E_NOTICE,"stream is not stdio: copy done"); + php_error(E_NOTICE,"stream is not stdio: copy %d done", ImageInfo->FileSize); #endif } #else