diff options
| author | Zeev Suraski <zeev@php.net> | 2001-01-09 21:00:05 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-01-09 21:00:05 +0000 |
| commit | 0b043e92a7e03e1af8caba76dbbf14665e2912db (patch) | |
| tree | 1cb5e4e2b7b5072697426dba069ca987b5fce459 | |
| parent | 7ea53ff229b15c040139254d97352e782d786bcf (diff) | |
| download | php-git-0b043e92a7e03e1af8caba76dbbf14665e2912db.tar.gz | |
Merge Daniel's PDF fixes
PR:
Submitted by:
Reviewed by:
Obtained from:
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/pdf/pdf.c | 20 |
2 files changed, 21 insertions, 0 deletions
@@ -2,6 +2,7 @@ PHP 4.0 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Jan 2001, Version 4.0.4pl1 +- Fixed the various pdf_open_*() functions (Daniel) - Fixed a bug that could cause invalid INI entries to be used under certain circumstances (Zeev) - Fixed a bug in the Apache module that could cause invalid INI values to diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c index 7fa837b761..9b80193885 100644 --- a/ext/pdf/pdf.c +++ b/ext/pdf/pdf.c @@ -2339,7 +2339,11 @@ PHP_FUNCTION(pdf_open_gif) { RETURN_FALSE; } +#ifdef VIRTUAL_DIR virtual_filepath((*arg2)->value.str.val, &image); +#else + image = (*arg2)->value.str.val; +#endif pdf_image = PDF_open_image_file(pdf, "gif", image, "", 0); @@ -2376,7 +2380,11 @@ PHP_FUNCTION(pdf_open_jpeg) { RETURN_FALSE; } +#ifdef VIRTUAL_DIR virtual_filepath((*arg2)->value.str.val, &image); +#else + image = (*arg2)->value.str.val; +#endif pdf_image = PDF_open_image_file(pdf, "jpeg", image, "", 0); @@ -2413,7 +2421,11 @@ PHP_FUNCTION(pdf_open_png) { RETURN_FALSE; } +#ifdef VIRTUAL_DIR virtual_filepath((*arg2)->value.str.val, &image); +#else + image = (*arg2)->value.str.val; +#endif pdf_image = PDF_open_image_file(pdf, "png", image, "", 0); @@ -2450,7 +2462,11 @@ PHP_FUNCTION(pdf_open_tiff) { RETURN_FALSE; } +#ifdef VIRTUAL_DIR virtual_filepath((*arg2)->value.str.val, &image); +#else + image = (*arg2)->value.str.val; +#endif pdf_image = PDF_open_image_file(pdf, "tiff", image, "", 0); @@ -2488,7 +2504,11 @@ PHP_FUNCTION(pdf_open_image_file) { RETURN_FALSE; } +#ifdef VIRTUAL_DIR virtual_filepath((*arg3)->value.str.val, &image); +#else + image = (*arg3)->value.str.val; +#endif pdf_image = PDF_open_image_file(pdf, (*arg2)->value.str.val, image, "", 0); |