cvs: /php4/ext/standard image.c
| From: | Thies C. Arntzen | Date: | Tue, 14 Dec 1999 04:33:25 +0000 |
| Subject: | cvs: /php4/ext/standard image.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7898@lists.php.net to get a copy of this message | ||
thies Mon Dec 13 23:33:25 1999 EDT
Modified files:
/php4/ext/standard image.c
Log:
(getimagesize) grrr, fixed newly (30 min ago) introduced NPR
Index: php4/ext/standard/image.c
diff -u php4/ext/standard/image.c:1.7 php4/ext/standard/image.c:1.8
--- php4/ext/standard/image.c:1.7 Mon Dec 13 22:48:06 1999
+++ php4/ext/standard/image.c Mon Dec 13 23:32:54 1999
@@ -15,7 +15,7 @@
| Authors: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.7 1999/12/14 03:48:06 thies Exp $ */
+/* $Id: image.c,v 1.8 1999/12/14 04:32:54 thies Exp $ */
/*
* Based on Daniel Schmitt's imageinfo.c which carried the following
* Copyright notice.
@@ -347,7 +347,11 @@
result = php3_handle_gif (fp);
itype = 1;
} else if (!memcmp(filetype, php3_sig_jpg, 3)) {
- result = php3_handle_jpeg(fp,*info);
+ if (info) {
+ result = php3_handle_jpeg(fp,*info);
+ } else {
+ result = php3_handle_jpeg(fp,NULL);
+ }
itype = 2;
} else if (!memcmp(filetype, php3_sig_png, 3)) {
fseek(fp, 0L, SEEK_SET);