diff options
| author | Uwe Steinmann <steinm@php.net> | 2000-02-21 16:23:09 +0000 |
|---|---|---|
| committer | Uwe Steinmann <steinm@php.net> | 2000-02-21 16:23:09 +0000 |
| commit | 5dd0055c771e2b1cf32875fd4095714bb7624579 (patch) | |
| tree | 47b0b167453ef8593ed10bc134e9ae6a5c5e7ec1 | |
| parent | 9ff0159bf4f21968ca2a150d865b588d649b823a (diff) | |
| download | php-git-5dd0055c771e2b1cf32875fd4095714bb7624579.tar.gz | |
- pdf_set_text_matrix() disappeared in pdflib 2.30. Put in another ifdef
- small fix in testdom to suppress error msg.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/pdf/pdf.c | 4 | ||||
| -rw-r--r-- | ext/pdf/php_pdf.h | 2 | ||||
| -rw-r--r-- | main/php_version.h | 2 | ||||
| -rw-r--r-- | tests/testdom | 2 |
5 files changed, 9 insertions, 2 deletions
@@ -2,6 +2,7 @@ PHP 4.0 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???, Version 4.0 Beta 5 +- Support for pdflib 2.30 (Uwe) 20 February 2000, Version 4.0 Beta 4 - Introduced $HTTP_POST_FILES[], that contains information about files uploaded diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c index 33a709f658..1933000e0c 100644 --- a/ext/pdf/pdf.c +++ b/ext/pdf/pdf.c @@ -98,7 +98,9 @@ function_entry pdf_functions[] = { PHP_FE(pdf_set_text_rendering, NULL) PHP_FE(pdf_set_horiz_scaling, NULL) PHP_FE(pdf_set_text_rise, NULL) +#if PDFLIB_MAJORVERSION < 3 & PDFLIB_MINORVERSION < 30 PHP_FE(pdf_set_text_matrix, NULL) +#endif PHP_FE(pdf_set_text_pos, NULL) PHP_FE(pdf_set_char_spacing, NULL) PHP_FE(pdf_set_word_spacing, NULL) @@ -875,6 +877,7 @@ PHP_FUNCTION(pdf_set_text_rise) { } /* }}} */ +#if PDFLIB_MAJORVERSION < 3 & PDFLIB_MINORVERSION < 30 /* {{{ proto void pdf_set_text_matrix(int pdfdoc, arry matrix) Sets the text matrix */ PHP_FUNCTION(pdf_set_text_matrix) { @@ -926,6 +929,7 @@ PHP_FUNCTION(pdf_set_text_matrix) { RETURN_TRUE; } /* }}} */ +#endif /* {{{ proto void pdf_set_text_pos(int pdfdoc, double x, double y) Set the position of text for the next pdf_show call */ diff --git a/ext/pdf/php_pdf.h b/ext/pdf/php_pdf.h index fb4f51dd07..e707507eb8 100644 --- a/ext/pdf/php_pdf.h +++ b/ext/pdf/php_pdf.h @@ -66,7 +66,9 @@ PHP_FUNCTION(pdf_set_leading); PHP_FUNCTION(pdf_set_text_rendering); PHP_FUNCTION(pdf_set_horiz_scaling); PHP_FUNCTION(pdf_set_text_rise); +#if PDFLIB_MAJORVERSION < 3 & PDFLIB_MINORVERSION < 30 PHP_FUNCTION(pdf_set_text_matrix); +#endif PHP_FUNCTION(pdf_set_text_pos); PHP_FUNCTION(pdf_set_char_spacing); PHP_FUNCTION(pdf_set_word_spacing); diff --git a/main/php_version.h b/main/php_version.h index 374bb14f25..abcfe084c4 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -1,3 +1,3 @@ /* automatically generated by configure */ /* edit configure.in.in to change version number */ -#define PHP_VERSION "4.0b4" +#define PHP_VERSION "4.0b4-dev" diff --git a/tests/testdom b/tests/testdom index 4b5415d521..4593fe05da 100644 --- a/tests/testdom +++ b/tests/testdom @@ -38,7 +38,7 @@ $xmlstr = "<?xml version='1.0'?> <!DOCTYPE chapter SYSTEM '/share/sgml/Norman_Walsh/db3xml10/db3xml10.dtd'> <chapter language='en'><title language='en'>Title</title> <para language='ge'> -<informaltable language='&sp;'> +<informaltable language='sp'> <tgroup cols='3'> <tbody> <row><entry>a1</entry><entry morerows='1'>b1</entry><entry>c1</entry></row> |