[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] cvs: pecl /pdf package.xml pdf.c pdf4.c php_pdf.h php_pdf4.h
From:       "Rainer Schaaf" <rjs () php ! net>
Date:       2004-11-30 11:42:14
Message-ID: cvsrjs1101814934 () cvsserver
[Download RAW message or body]

rjs		Tue Nov 30 06:42:14 2004 EDT

  Modified files:              
    /pecl/pdf	package.xml pdf.c pdf4.c php_pdf.h php_pdf4.h 
  Log:
  fixed buildproblems when used link PDFLib statically into PHP.
  
  
http://cvs.php.net/diff.php/pecl/pdf/package.xml?r1=1.18&r2=1.19&ty=u
Index: pecl/pdf/package.xml
diff -u pecl/pdf/package.xml:1.18 pecl/pdf/package.xml:1.19
--- pecl/pdf/package.xml:1.18	Wed Nov 24 07:29:44 2004
+++ pecl/pdf/package.xml	Tue Nov 30 06:42:13 2004
@@ -24,15 +24,13 @@
     </maintainer>
   </maintainers>
   <release>
-    <version>2.0.3</version>
-    <date>2004-11-24</date>
+    <version>2.0.4</version>
+    <date>2004-11-30</date>
     <license>PHP</license>
     <state>stable</state>
     <notes>Bugfixes:
-- PDF_get_parameter crashed when called with only 2 parameters.
-Enhancements:
-- added pdf_utf8_to_utf16() and pdf_utf16_to_utf8() API's.
-- included support for PDFlib4 again </notes>
+- fixed buildproblems when used link PDFLib statically into PHP.
+    </notes>
     <deps>
       <dep type="php" rel="ge" version="4.1"/>
     </deps>
http://cvs.php.net/diff.php/pecl/pdf/pdf.c?r1=1.142&r2=1.143&ty=u
Index: pecl/pdf/pdf.c
diff -u pecl/pdf/pdf.c:1.142 pecl/pdf/pdf.c:1.143
--- pecl/pdf/pdf.c:1.142	Wed Nov 24 07:17:11 2004
+++ pecl/pdf/pdf.c	Tue Nov 30 06:42:13 2004
@@ -17,12 +17,12 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: pdf.c,v 1.142 2004/11/24 12:17:11 rjs Exp $ */
+/* $Id: pdf.c,v 1.143 2004/11/30 11:42:13 rjs Exp $ */
 
 /* {{{ Comments about the module */
 
 /* derived from:
-   $Id: pdf.c,v 1.142 2004/11/24 12:17:11 rjs Exp $
+   $Id: pdf.c,v 1.143 2004/11/30 11:42:13 rjs Exp $
    synced with pdflib.h 1.237 */
 
 /* PDFlib 2.02 ... 4.0.x is subject to the ALADDIN FREE PUBLIC LICENSE.
@@ -70,22 +70,15 @@
 
 /* {{{ includes
  */
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#if HAVE_PDFLIB
-
-#include "pdflib.h"
-
-#if PDFLIB_MAJORVERSION >= 5
-	/* This wrapper code will work only with PDFlib V5 or greater,
-	 * because the special handling for returning 0 instead of -1
-	 * for PHP is now done in the PDFlib kernel */
-
 #include "php.h"
 #include "php_ini.h"
 #include "php_globals.h"
+#include "php_streams.h"
 #include "zend_list.h"
 #include "ext/standard/head.h"
 #include "ext/standard/info.h"
@@ -113,6 +106,14 @@
 # include <fcntl.h>
 #endif /* PHP_WIN32 */
 
+#if HAVE_PDFLIB
+#include "pdflib.h"
+
+#if PDFLIB_MAJORVERSION >= 5
+	/* This wrapper code will work only with PDFlib V5 or greater,
+	 * because the special handling for returning 0 instead of -1
+	 * for PHP is now done in the PDFlib kernel */
+
 /* }}} */
 
 #include "php_pdf.h"
@@ -767,7 +768,7 @@
 	php_info_print_table_row(2, "PDF Support", "enabled" );
 	php_info_print_table_row(2, "PDFlib GmbH Version", PDFLIB_VERSIONSTRING );
 	php_info_print_table_row(2, "PECL Version", PDFLIB_PECL_VERSIONSTRING);
-	php_info_print_table_row(2, "Revision", "$Revision: 1.142 $" );
+	php_info_print_table_row(2, "Revision", "$Revision: 1.143 $" );
 	php_info_print_table_end();
 
 }
http://cvs.php.net/diff.php/pecl/pdf/pdf4.c?r1=1.1&r2=1.2&ty=u
Index: pecl/pdf/pdf4.c
diff -u pecl/pdf/pdf4.c:1.1 pecl/pdf/pdf4.c:1.2
--- pecl/pdf/pdf4.c:1.1	Wed Nov 24 07:17:11 2004
+++ pecl/pdf/pdf4.c	Tue Nov 30 06:42:13 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: pdf4.c,v 1.1 2004/11/24 12:17:11 rjs Exp $ */
+/* $Id: pdf4.c,v 1.2 2004/11/30 11:42:13 rjs Exp $ */
 
 /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
    Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -30,7 +30,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-*/
 
 #include "php.h"
 #include "php_ini.h"
@@ -58,6 +57,7 @@
 # include <io.h>
 # include <fcntl.h>
 #endif
+end alread included in pdf.c */
 /* }}} */
 
 #if HAVE_PDFLIB
@@ -334,7 +334,7 @@
 #else
 	php_info_print_table_row(2, "PDFlib GmbH Version", tmp );
 #endif
-	php_info_print_table_row(2, "Revision", "$Revision: 1.1 $" );
+	php_info_print_table_row(2, "Revision", "$Revision: 1.2 $" );
 	php_info_print_table_end();
 
 }
http://cvs.php.net/diff.php/pecl/pdf/php_pdf.h?r1=1.29&r2=1.30&ty=u
Index: pecl/pdf/php_pdf.h
diff -u pecl/pdf/php_pdf.h:1.29 pecl/pdf/php_pdf.h:1.30
--- pecl/pdf/php_pdf.h:1.29	Sun Nov 14 15:20:29 2004
+++ pecl/pdf/php_pdf.h	Tue Nov 30 06:42:13 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_pdf.h,v 1.29 2004/11/14 20:20:29 rjs Exp $ */
+/* $Id: php_pdf.h,v 1.30 2004/11/30 11:42:13 rjs Exp $ */
 /* Derived from:
     Id: php_pdf.h,v 1.22 2001/11/30 04:46:35 sniper Exp */
 
http://cvs.php.net/diff.php/pecl/pdf/php_pdf4.h?r1=1.1&r2=1.2&ty=u
Index: pecl/pdf/php_pdf4.h
diff -u pecl/pdf/php_pdf4.h:1.1 pecl/pdf/php_pdf4.h:1.2
--- pecl/pdf/php_pdf4.h:1.1	Sun Nov 14 15:20:29 2004
+++ pecl/pdf/php_pdf4.h	Tue Nov 30 06:42:13 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_pdf4.h,v 1.1 2004/11/14 20:20:29 rjs Exp $ */
+/* $Id: php_pdf4.h,v 1.2 2004/11/30 11:42:13 rjs Exp $ */
 
 #ifndef PHP_PDF_H
 #define PHP_PDF_H

-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]