- pdf_set_text_matrix() disappeared in pdflib 2.30. Put in another ifdef

- small fix in testdom to suppress error msg.

diff --git a/NEWS b/NEWS
index 4506940bfe1676dd0f1906ab966f8ab0c2055971..d13e4862256a45774938683e4c2803f22d7879e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 33a709f658bd747a1bc10722bba2de7af94175be..1933000e0cef1deced2624d878fd4eb6415064f6 100644 (file)
--- 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 fb4f51dd0770280a110e10cdcc6fbc17525ab0ad..e707507eb83e30c9ec66ca6b1f5170ca96fc0db9 100644 (file)
--- 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 374bb14f2596d38dfb19f349f7e15c2147d9f87e..abcfe084c47aeaf35d5c1b6b5f9fc21453e5e1ae 100644 (file)
--- 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 4b5415d521b2b9420dafc63d3b5f4fd36be5d3c4..4593fe05dab1555546839cf9b51726cfb1ce3b5c 100644 (file)
--- 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>