cvs: php4(php_4_0_4) / NEWS /ext/pdf pdf.c

zeev Tue Jan 9 13:00:05 2001 EDT Modified files: (Branch: php_4_0_4) /php4 NEWS /php4/ext/pdf pdf.c Log: Merge Daniel's PDF fixes PR: Submitted by: Reviewed by: Obtained from: Index: php4/NEWS diff -u php4/NEWS:1.532.2.7 php4/NEWS:1.532.2.8 --- php4/NEWS:1.532.2.7 Wed Jan 3 15:51:16 2001 +++ php4/NEWS Tue Jan 9 13:00:04 2001 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? 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 Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.61 php4/ext/pdf/pdf.c:1.61.2.1 --- php4/ext/pdf/pdf.c:1.61 Mon Nov 20 23:07:53 2000 +++ php4/ext/pdf/pdf.c Tue Jan 9 13:00:05 2001 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.61 2000/11/21 07:07:53 dbeu Exp $ */ +/* $Id: pdf.c,v 1.61.2.1 2001/01/09 21:00:05 zeev Exp $ */ /* pdflib 2.02 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -2339,7 +2339,11 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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);