com php-src: Fix compile error with EXIF_DEBUG: ext/exif/ exif.c
| From: | Kalle Sommer Nielsen | Date: | Thu, 13 Jul 2017 23:12:00 +0000 |
| Subject: | com php-src: Fix compile error with EXIF_DEBUG: ext/exif/ exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98548@lists.php.net to get a copy of this message | ||
Commit: 9cf586cdfb6385753e477dbe8b2db11501c3a960
Author: Kalle Sommer Nielsen <kalle@php.net> Fri, 14 Jul 2017 01:12:00 +0200
Parents: 89eb27a99cdf7e7b7876c12e42f7ff35760eb40a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9cf586cdfb6385753e477dbe8b2db11501c3a960
Log:
Fix compile error with EXIF_DEBUG
Changed paths:
M ext/exif/exif.c
Diff:
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 17c524f..63b23d2 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -4590,7 +4590,7 @@ PHP_FUNCTION(exif_read_data)
exif_discard_imageinfo(&ImageInfo);
#ifdef EXIF_DEBUG
- php_error_docref1(NULL, p_name, E_NOTICE, "done");
+ php_error_docref1(NULL, (Z_TYPE_P(stream) == IS_RESOURCE ? "<stream>" :
Z_STRVAL_P(stream)), E_NOTICE, "Done");
#endif
}
/* }}} */
@@ -4672,7 +4672,7 @@ PHP_FUNCTION(exif_thumbnail)
exif_discard_imageinfo(&ImageInfo);
#ifdef EXIF_DEBUG
- php_error_docref1(NULL, p_name, E_NOTICE, "Done");
+ php_error_docref1(NULL, (Z_TYPE_P(stream) == IS_RESOURCE ? "<stream>" :
Z_STRVAL_P(stream)), E_NOTICE, "Done");
#endif
}
/* }}} */