cvs: php4 /ext/exif exif.c

helly Thu Mar 21 15:16:23 2002 EDT Modified files: /php4/ext/exif exif.c Log: -removed old streams test code Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.73 php4/ext/exif/exif.c:1.74 --- php4/ext/exif/exif.c:1.73 Thu Mar 21 14:59:08 2002 +++ php4/ext/exif/exif.c Thu Mar 21 15:16:22 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.73 2002/03/21 19:59:08 helly Exp $ */ +/* $Id: exif.c,v 1.74 2002/03/21 20:16:22 helly Exp $ */ /* ToDos * @@ -100,7 +100,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.3 $Id: exif.c,v 1.73 2002/03/21 19:59:08 helly Exp $" +#define EXIF_VERSION "1.3 $Id: exif.c,v 1.74 2002/03/21 20:16:22 helly Exp $" PHP_MINFO_FUNCTION(exif); @@ -2970,31 +2970,6 @@ php_error(E_NOTICE,"open stream is file: %d", ImageInfo->FileSize); } } else { - -/* * - php_stream *mem_stream; - mem_stream = php_stream_temp_create(TEMP_STREAM_DEFAULT, 20000000); - ImageInfo->FileSize = php_stream_copy_to_stream(ImageInfo->infile, mem_stream, PHP_STREAM_COPY_ALL); - php_stream_close(ImageInfo->infile); - ImageInfo->infile = mem_stream; -* -* Use one of these two versions if not using STREAM_MUST_SEEK in php_stream_open_wrapper -* - php_stream *mem_stream; - switch(php_stream_make_seekable( ImageInfo->infile, &mem_stream)) - { - default: - case PHP_STREAM_FAILED: - case PHP_STREAM_CRITICAL: - php_stream_close(ImageInfo->infile); - return FALSE; - case PHP_STREAM_UNCHANGED: - case PHP_STREAM_RELEASED: - ImageInfo->infile = mem_stream; - break; - } -*/ -/* end of second */ if ( !ImageInfo->FileSize) { php_stream_seek(ImageInfo->infile,0,SEEK_END); ImageInfo->FileSize = php_stream_tell(ImageInfo->infile);