date:20070911

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2007-09-11 Thread changelog

changelog   Wed Sep 12 01:31:18 2007 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1167r2=1.1168diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1167 ZendEngine2/ChangeLog:1.1168
--- ZendEngine2/ChangeLog:1.1167Mon Sep 10 01:31:22 2007
+++ ZendEngine2/ChangeLog   Wed Sep 12 01:31:18 2007
@@ -1,3 +1,23 @@
+2007-09-11  Dmitry Stogov  [EMAIL PROTECTED]
+
+* zend_builtin_functions.c:
+  typo
+
+* zend_builtin_functions.c:
+  forgotten part
+
+* zend_constants.c
+  zend_execute.h
+  zend_execute_API.c
+  zend_vm_def.h
+  zend_vm_execute.h:
+  - in case of ambiguity class name in namespace call  __autoload() only
+  after
+checking for both (class from current namespace and internal class)
+  - improved class fetching performance
+  - fixed wrong (lowercase) name passed to __autoload() from
+  call_user_func()
+
 2007-09-09  Antony Dovgal  [EMAIL PROTECTED]
 
 * zend_language_scanner.l:
@@ -18923,7 +18943,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1167 2007/09/10 01:31:22 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1168 2007/09/12 01:31:18 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -20647,7 +20667,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1167 2007/09/10 01:31:22 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1168 2007/09/12 01:31:18 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings addslashes_variation3.phpt stripslashes_variation5.phpt

2007-09-11 Thread Jani Taskinen

janiTue Sep 11 10:23:05 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings addslashes_variation3.phpt 
stripslashes_variation5.phpt 
  Log:
  - Fix tests (we are not interested what the old value was for the ini option)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addslashes_variation3.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/strings/addslashes_variation3.phpt
diff -u php-src/ext/standard/tests/strings/addslashes_variation3.phpt:1.1.2.1 
php-src/ext/standard/tests/strings/addslashes_variation3.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/addslashes_variation3.phpt:1.1.2.1   
Thu Sep  6 04:01:25 2007
+++ php-src/ext/standard/tests/strings/addslashes_variation3.phpt   Tue Sep 
11 10:23:04 2007
@@ -15,7 +15,7 @@
 echo *** Testing addslashes() : with php directive magic_quotes_sybase set ON 
***\n;
 
 // setting ON the php directive magic_quotes_sybase
-var_dump( ini_set(magic_quotes_sybase, 1) );
+ini_set(magic_quotes_sybase, 1);
 
 // initialising a heredoc string
 $heredoc_string = EOT
@@ -91,7 +91,6 @@
 ?
 --EXPECTF--
 *** Testing addslashes() : with php directive magic_quotes_sybase set ON ***
-string(1) 0
 
 -- Iteration 1 --
 string(11) Hello world
@@ -195,4 +194,4 @@
 
 -- Iteration 34 --
 string(0) 
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation5.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/strings/stripslashes_variation5.phpt
diff -u php-src/ext/standard/tests/strings/stripslashes_variation5.phpt:1.1.2.1 
php-src/ext/standard/tests/strings/stripslashes_variation5.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/stripslashes_variation5.phpt:1.1.2.1 
Fri Sep  7 13:51:26 2007
+++ php-src/ext/standard/tests/strings/stripslashes_variation5.phpt Tue Sep 
11 10:23:04 2007
@@ -14,7 +14,7 @@
 echo *** Testing stripslashes() : with php directive magic_quotes_sybase set 
ON ***\n;
 
 // setting ON the php directive magic_quotes_sybase
-var_dump( ini_set(magic_quotes_sybase, 1) );
+ini_set(magic_quotes_sybase, 1);
 
 // initialising a heredoc string
 $heredoc_string = EOT
@@ -93,7 +93,6 @@
 ?
 --EXPECTF--
 *** Testing stripslashes() : with php directive magic_quotes_sybase set ON ***
-string(1) 0
 
 -- Iteration 1 --
 string(31) The string after addslashes is:
@@ -288,4 +287,4 @@
 string(0) 
 string(33) The string after stripslashes is:
 string(0) 
-Done
\ No newline at end of file
+Done

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

[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c

2007-09-11 Thread Dmitry Stogov

dmitry  Tue Sep 11 11:16:46 2007 UTC

  Modified files:  
/php-src/ext/reflection php_reflection.c 
  Log:
  Simplify (the prototype of zend_u_get_constant_ex() is going to be changed)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.282r2=1.283diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.282 
php-src/ext/reflection/php_reflection.c:1.283
--- php-src/ext/reflection/php_reflection.c:1.282   Mon Aug 20 17:01:59 2007
+++ php-src/ext/reflection/php_reflection.c Tue Sep 11 11:16:46 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.282 2007/08/20 17:01:59 sebastian Exp $ */
+/* $Id: php_reflection.c,v 1.283 2007/09/11 11:16:46 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2058,7 +2058,7 @@
   return;
}
pce= ce-parent;
-   } else if 
(zend_u_lookup_class_ex(UG(unicode)?IS_UNICODE:IS_STRING, 
param-arg_info-class_name, param-arg_info-class_name_len, 1, 1, pce 
TSRMLS_CC) == FAILURE) {
+   } else if 
(zend_u_lookup_class(UG(unicode)?IS_UNICODE:IS_STRING, 
param-arg_info-class_name, param-arg_info-class_name_len, pce TSRMLS_CC) 
== FAILURE) {
zend_throw_exception_ex(reflection_exception_ptr, 0 
TSRMLS_CC, 
Class %v does not exist, 
param-arg_info-class_name);
return;
@@ -5022,7 +5022,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.282 
2007/08/20 17:01:59 sebastian Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.283 
2007/09/11 11:16:46 dmitry Exp $);
 
php_info_print_table_end();
 } /* }}} */

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/bcmath/libbcmath/src bcmath.h

2007-09-11 Thread Rob Richards

rrichards   Tue Sep 11 11:25:20 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/bcmath/libbcmath/src   bcmath.h 
  Log:
  MFH: revert config header change
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/libbcmath/src/bcmath.h?r1=1.9.6.1r2=1.9.6.2diff_format=u
Index: php-src/ext/bcmath/libbcmath/src/bcmath.h
diff -u php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.1 
php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.2
--- php-src/ext/bcmath/libbcmath/src/bcmath.h:1.9.6.1   Sat Sep  8 09:57:22 2007
+++ php-src/ext/bcmath/libbcmath/src/bcmath.h   Tue Sep 11 11:25:20 2007
@@ -53,7 +53,7 @@
 } bc_struct;
 
 #ifdef HAVE_CONFIG_H
-#include config.h
+#include ../../config.h
 #endif
 
 #include php.h

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

[PHP-CVS] cvs: php-src /ext/bcmath/libbcmath/src bcmath.h

2007-09-11 Thread Rob Richards

rrichards   Tue Sep 11 11:24:39 2007 UTC

  Modified files:  
/php-src/ext/bcmath/libbcmath/src   bcmath.h 
  Log:
  revert config header change
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/libbcmath/src/bcmath.h?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/bcmath/libbcmath/src/bcmath.h
diff -u php-src/ext/bcmath/libbcmath/src/bcmath.h:1.10 
php-src/ext/bcmath/libbcmath/src/bcmath.h:1.11
--- php-src/ext/bcmath/libbcmath/src/bcmath.h:1.10  Sat Sep  8 09:56:52 2007
+++ php-src/ext/bcmath/libbcmath/src/bcmath.h   Tue Sep 11 11:24:39 2007
@@ -53,7 +53,7 @@
 } bc_struct;
 
 #ifdef HAVE_CONFIG_H
-#include config.h
+#include ../../config.h
 #endif
 
 #include php.h

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32 config0.m4 upgrade-pcre.php /ext/pcre/pcrelib dftables.c pcre_chartables.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c pcr

2007-09-11 Thread Nuno Lopes

nlopess Tue Sep 11 16:17:34 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pcre   config.w32 config0.m4 upgrade-pcre.php 
/php-src/ext/pcre/pcrelib   dftables.c pcre_chartables.c 
pcre_compile.c pcre_config.c pcre_exec.c 
pcre_fullinfo.c pcre_get.c pcre_globals.c 
pcre_info.c pcre_maketables.c 
pcre_newline.c pcre_ord2utf8.c 
pcre_refcount.c pcre_study.c 
pcre_tables.c pcre_try_flipped.c 
pcre_ucp_searchfuncs.c pcre_valid_utf8.c 
pcre_version.c pcre_xclass.c pcregrep.c 
pcreposix.c 
  Log:
  remove the -DHAVE_CONFIG_H switch again to fix things on windows
  this means that the upgrade script strips the #ifdef automatically
  http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.6r2=1.4.2.5.2.7diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.6 
php-src/ext/pcre/config.w32:1.4.2.5.2.7
--- php-src/ext/pcre/config.w32:1.4.2.5.2.6 Sat Sep  1 17:51:35 2007
+++ php-src/ext/pcre/config.w32 Tue Sep 11 16:17:33 2007
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5.2.6 2007/09/01 17:51:35 nlopess Exp $
+// $Id: config.w32,v 1.4.2.5.2.7 2007/09/11 16:17:33 nlopess Exp $
 // vim:ft=javascript
 
 ARG_WITH(pcre-regex, Perl Compatible Regular Expressions, yes);
 
 if (PHP_PCRE_REGEX == yes) {
EXTENSION(pcre, php_pcre.c, PHP_PCRE_REGEX_SHARED,
-   -DNO_RECURSE -DHAVE_CONFIG_H -Iext/pcre/pcrelib);
+   -DNO_RECURSE -Iext/pcre/pcrelib);
ADD_SOURCES(ext/pcre/pcrelib, pcre_chartables.c 
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c 
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_newline.c 
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c 
pcre_valid_utf8.c pcre_version.c pcre_xclass.c, pcre);
ADD_DEF_FILE(ext\\pcre\\php_pcre.def);
 
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.9r2=1.38.2.3.2.10diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.9 
php-src/ext/pcre/config0.m4:1.38.2.3.2.10
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.9Sat Sep  1 17:51:35 2007
+++ php-src/ext/pcre/config0.m4 Tue Sep 11 16:17:33 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.9 2007/09/01 17:51:35 nlopess Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.10 2007/09/11 16:17:33 nlopess Exp $
 dnl
 
 dnl By default we'll compile and link against the bundled PCRE library
@@ -11,7 +11,7 @@
 
 if test $PHP_PCRE_REGEX != no; then
   if test $PHP_PCRE_REGEX = yes; then
-PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c 
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c 
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c 
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c 
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c 
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c 
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c 
php_pcre.c, $ext_shared,,-DHAVE_CONFIG_H [EMAIL PROTECTED]@/pcrelib)
+PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c 
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c 
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c 
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c 
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c 
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c 
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c 
php_pcre.c, $ext_shared,,[EMAIL PROTECTED]@/pcrelib)
 PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
 PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
 AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/upgrade-pcre.php?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pcre/upgrade-pcre.php
diff -u php-src/ext/pcre/upgrade-pcre.php:1.1.2.2 
php-src/ext/pcre/upgrade-pcre.php:1.1.2.3
--- php-src/ext/pcre/upgrade-pcre.php:1.1.2.2   Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/upgrade-pcre.php   Tue Sep 11 16:17:33 2007
@@ -33,10 +33,13 @@
 {
global $newpcre, $dirlen;
 
-   foreach(scandir($path) as $file) {
+   foreach (scandir($path) as $file) {
 
-   if ($file[0] === '.' || $file === 'CVS') continue;
-   if (substr_compare($file, '.lo', -3, 3) == 0 || 
substr_compare($file, '.o', -2, 2) == 0) continue;
+   if ($file[0] === '.' ||
+   $file === 'CVS' ||
+   substr_compare($file, '.lo', -3, 3) == 0 ||
+   substr_compare($file, '.loT', -4, 4) == 0 ||
+

[PHP-CVS] cvs: php-src /ext/pcre config.w32 config0.m4 upgrade-pcre.php /ext/pcre/pcrelib dftables.c pcre_chartables.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c pcre_globals

2007-09-11 Thread Nuno Lopes

nlopess Tue Sep 11 16:19:14 2007 UTC

  Modified files:  
/php-src/ext/pcre   config.w32 config0.m4 upgrade-pcre.php 
/php-src/ext/pcre/pcrelib   dftables.c pcre_chartables.c 
pcre_compile.c pcre_config.c pcre_exec.c 
pcre_fullinfo.c pcre_get.c pcre_globals.c 
pcre_info.c pcre_maketables.c 
pcre_newline.c pcre_ord2utf8.c 
pcre_refcount.c pcre_study.c 
pcre_tables.c pcre_try_flipped.c 
pcre_ucp_searchfuncs.c pcre_valid_utf8.c 
pcre_version.c pcre_xclass.c pcregrep.c 
pcreposix.c 
  Log:
  MFB: remove HAVE_CONFIG_H
  http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.14 php-src/ext/pcre/config.w32:1.15
--- php-src/ext/pcre/config.w32:1.14Sat Sep  1 18:01:43 2007
+++ php-src/ext/pcre/config.w32 Tue Sep 11 16:19:14 2007
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.14 2007/09/01 18:01:43 nlopess Exp $
+// $Id: config.w32,v 1.15 2007/09/11 16:19:14 nlopess Exp $
 // vim:ft=javascript
 
 ARG_WITH(pcre-regex, Perl Compatible Regular Expressions, yes);
 
 if (PHP_PCRE_REGEX == yes) {
EXTENSION(pcre, php_pcre.c, PHP_PCRE_REGEX_SHARED,
-   -DNO_RECURSE -DHAVE_CONFIG_H -Iext/pcre/pcrelib);
+   -DNO_RECURSE -Iext/pcre/pcrelib);
ADD_SOURCES(ext/pcre/pcrelib, pcre_chartables.c 
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c 
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_newline.c 
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c 
pcre_valid_utf8.c pcre_version.c pcre_xclass.c, pcre);
ADD_DEF_FILE(ext\\pcre\\php_pcre.def);
 
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.49r2=1.50diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.49 php-src/ext/pcre/config0.m4:1.50
--- php-src/ext/pcre/config0.m4:1.49Sat Sep  1 18:01:43 2007
+++ php-src/ext/pcre/config0.m4 Tue Sep 11 16:19:14 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config0.m4,v 1.49 2007/09/01 18:01:43 nlopess Exp $
+dnl $Id: config0.m4,v 1.50 2007/09/11 16:19:14 nlopess Exp $
 dnl
 
 dnl By default we'll compile and link against the bundled PCRE library
@@ -11,7 +11,7 @@
 
 if test $PHP_PCRE_REGEX != no; then
   if test $PHP_PCRE_REGEX = yes; then
-PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c 
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c 
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c 
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c 
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c 
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c 
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c 
php_pcre.c, $ext_shared,,-DHAVE_CONFIG_H [EMAIL PROTECTED]@/pcrelib)
+PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c 
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c 
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c 
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c 
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c 
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c 
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c 
php_pcre.c, $ext_shared,,[EMAIL PROTECTED]@/pcrelib)
 PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
 PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
PHP_ADD_INCLUDE(pcrelib)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/upgrade-pcre.php?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pcre/upgrade-pcre.php
diff -u php-src/ext/pcre/upgrade-pcre.php:1.1 
php-src/ext/pcre/upgrade-pcre.php:1.2
--- php-src/ext/pcre/upgrade-pcre.php:1.1   Thu Jun 14 19:43:41 2007
+++ php-src/ext/pcre/upgrade-pcre.php   Tue Sep 11 16:19:14 2007
@@ -33,10 +33,13 @@
 {
global $newpcre, $dirlen;
 
-   foreach(scandir($path) as $file) {
+   foreach (scandir($path) as $file) {
 
-   if ($file[0] === '.' || $file === 'CVS') continue;
-   if (substr_compare($file, '.lo', -3, 3) == 0 || 
substr_compare($file, '.o', -2, 2) == 0) continue;
+   if ($file[0] === '.' ||
+   $file === 'CVS' ||
+   substr_compare($file, '.lo', -3, 3) == 0 ||
+   substr_compare($file, '.loT', -4, 4) == 0 ||
+   substr_compare($file, '.o', -2, 2) == 0) continue;
 
$file = $path/$file;
 
@@ -58,7 +61,19 @@
die($newfile is not available any more\n);
}
 
-   copy($newfile, $file);
+   //

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/gd gd.c /ext/gd/libgd gd.c

2007-09-11 Thread Pierre-Alain Joye

pajoye  Tue Sep 11 21:03:48 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/gd gd.c 
/php-src/ext/gd/libgd   gd.c 
  Log:
  - [DOC] add alpha support for imagefilter's IMG_FILTER_COLORIZE
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.940r2=1.2027.2.547.2.941diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.940 php-src/NEWS:1.2027.2.547.2.941
--- php-src/NEWS:1.2027.2.547.2.940 Mon Sep 10 23:42:54 2007
+++ php-src/NEWSTue Sep 11 21:03:47 2007
@@ -11,6 +11,7 @@
 
 - Upgraded PCRE to version 7.3 (Nuno)
 - Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
+- Added alpha support for imagefilter's IMG_FILTER_COLORIZE
 
 - Fixed Bug #42596 (session.save_path MODE option does not work). (Ilia)
 - Fixed bug #42590 (Make the engine recornize \v and \f escape sequences). 
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.31r2=1.312.2.20.2.32diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.31 php-src/ext/gd/gd.c:1.312.2.20.2.32
--- php-src/ext/gd/gd.c:1.312.2.20.2.31 Wed Aug 29 06:26:30 2007
+++ php-src/ext/gd/gd.c Tue Sep 11 21:03:48 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.312.2.20.2.31 2007/08/29 06:26:30 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32 2007/09/11 21:03:48 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -5178,8 +5178,9 @@
zval *SIM;
gdImagePtr im_src;
long r,g,b,tmp;
+   long a = 0;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, SIM, 
tmp, r, g, b) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l, SIM, 
tmp, r, g, b, a) == FAILURE) {
RETURN_FALSE;
}
 
@@ -5189,7 +5190,7 @@
RETURN_FALSE;
}
 
-   if (gdImageColor(im_src, (int) r, (int) g, (int) b) == 1) {
+   if (gdImageColor(im_src, (int) r, (int) g, (int) b, (int) a) == 1) {
RETURN_TRUE;
}
 
@@ -5298,7 +5299,7 @@
php_image_filter_smooth
};
 
-   if (ZEND_NUM_ARGS()  2 || ZEND_NUM_ARGS()  5) {
+   if (ZEND_NUM_ARGS()  2 || ZEND_NUM_ARGS()  6) {
WRONG_PARAM_COUNT;
} else if (zend_parse_parameters(2 TSRMLS_CC, rl, tmp, filtertype) 
== FAILURE) {
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.20r2=1.90.2.1.2.21diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.20 
php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21
--- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.20 Sun Sep  9 13:05:51 2007
+++ php-src/ext/gd/libgd/gd.c   Tue Sep 11 21:03:48 2007
@@ -3807,15 +3807,14 @@
 }
 
 
-int gdImageColor(gdImagePtr src, int red, int green, int blue)
+int gdImageColor(gdImagePtr src, const int red, const int green, const int 
blue, const int alpha)
 {
int x, y;
-   int r,g,b,a;
int new_pxl, pxl;
typedef int (*FuncPtr)(gdImagePtr, int, int);
FuncPtr f;
 
-   if (src==NULL || (red-255||red255) || (green-255||green255) || 
(blue-255||blue255)) {
+   if (src == NULL) {
return 0;
}
 
@@ -3823,6 +3822,8 @@
 
for (y=0; ysrc-sy; ++y) {
for (x=0; xsrc-sx; ++x) {
+   int r,g,b,a;
+
pxl = f(src, x, y);
r = gdImageRed(src, pxl);
g = gdImageGreen(src, pxl);
@@ -3832,14 +3833,16 @@
r = r + red;
g = g + green;
b = b + blue;
+   a = a + alpha;
 
-   r = (r  255)? 255 : ((r  0)? 0:r);
-   g = (g  255)? 255 : ((g  0)? 0:g);
-   b = (b  255)? 255 : ((b  0)? 0:b);
+   r = (r  255)? 255 : ((r  0)? 0 : r);
+   g = (g  255)? 255 : ((g  0)? 0 : g);
+   b = (b  255)? 255 : ((b  0)? 0 : b);
+   a = (a  127)? 127 : ((a  0)? 0 : a);
 
-   new_pxl = gdImageColorAllocateAlpha(src, (int)r, 
(int)g, (int)b, a);
+   new_pxl = gdImageColorAllocateAlpha(src, r, g, b, a);
if (new_pxl == -1) {
-   new_pxl = gdImageColorClosestAlpha(src, (int)r, 
(int)g, (int)b, a);
+   new_pxl = gdImageColorClosestAlpha(src, r, g, 
b, a);
}
gdImageSetPixel (src, x, y, new_pxl);
}

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

[PHP-CVS] cvs: php-src /ext/gd/libgd gd.c

2007-09-11 Thread Pierre-Alain Joye

pajoye  Tue Sep 11 21:07:04 2007 UTC

  Modified files:  
/php-src/ext/gd/libgd   gd.c 
  Log:
  - MFB: 
   - gdImageTileApply does not respect transparent color
   - gdImageArc regression
   - Alpha channel support for gdImageColor (IMG_FILTER_COLORIZE)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.112r2=1.113diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.112 php-src/ext/gd/libgd/gd.c:1.113
--- php-src/ext/gd/libgd/gd.c:1.112 Mon Sep  3 14:34:42 2007
+++ php-src/ext/gd/libgd/gd.c   Tue Sep 11 21:07:04 2007
@@ -869,7 +869,9 @@
srcy = y % gdImageSY(im-tile);
if (im-trueColor) {
p = gdImageGetTrueColorPixel(im-tile, srcx, srcy);
-   gdImageSetPixel(im, x, y, p);
+   if (p != gdImageGetTransparent (im-tile)) {
+   gdImageSetPixel(im, x, y, p);
+   }
} else {
p = gdImageGetPixel(im-tile, srcx, srcy);
/* Allow for transparency */
@@ -1668,10 +1670,9 @@
int fx = 0, fy = 0;
 
 
-   if (s == e) {
+if ((s % 360)  == (e % 360)) {
s = 0; e = 360; 
} else {
-
if (s  360) {
s = s % 360;
}
@@ -1848,14 +1849,14 @@
int lastBorder;
/* Seek left */
int leftLimit = -1, rightLimit;
-   int i, restoreAlphaBleding=0;
+   int i, restoreAlphaBlending = 0;
 
if (border  0) {
/* Refuse to fill to a non-solid border */
return;
}
 
-   restoreAlphaBleding = im-alphaBlendingFlag;
+   restoreAlphaBlending = im-alphaBlendingFlag;
im-alphaBlendingFlag = 0;
 
if (x = im-sx) {
@@ -1873,7 +1874,7 @@
leftLimit = i;
}
if (leftLimit == -1) {
-   im-alphaBlendingFlag = restoreAlphaBleding;
+   im-alphaBlendingFlag = restoreAlphaBlending;
return;
}
/* Seek right */
@@ -1918,7 +1919,7 @@
}
}
}
-   im-alphaBlendingFlag = restoreAlphaBleding;
+   im-alphaBlendingFlag = restoreAlphaBlending;
 }
 
 /*
@@ -1955,7 +1956,7 @@
 
/* stack of filled segments */
/* struct seg stack[FILL_MAX],*sp = stack;; */
-   struct seg *stack;
+   struct seg *stack = NULL;
struct seg *sp;
 
if (!im-trueColor  nc  (im-colorsTotal -1)) {
@@ -3461,7 +3462,7 @@
 }
 
 int
-gdAlphaBlend (int dst, int src)
+gdAlphaBlendOld (int dst, int src)
 {
/* 2.0.12: TBB: alpha in the destination should be a
 * component of the result. Thanks to Frank Warmerdam for
@@ -3483,6 +3484,51 @@
gdTrueColorGetBlue (dst)) / gdAlphaMax));
 }
 
+int gdAlphaBlend (int dst, int src) {
+int src_alpha = gdTrueColorGetAlpha(src);
+int dst_alpha, alpha, red, green, blue;
+int src_weight, dst_weight, tot_weight;
+
+/*  */
+/*  Simple cases we want to handle fast.*/
+/*  */
+if( src_alpha == gdAlphaOpaque )
+return src;
+
+dst_alpha = gdTrueColorGetAlpha(dst);
+if( src_alpha == gdAlphaTransparent )
+return dst;
+if( dst_alpha == gdAlphaTransparent )
+return src;
+
+/*  */
+/*  What will the source and destination alphas be?  Note that  */
+/*  the destination weighting is substantially reduced as the   */
+/*  overlay becomes quite opaque.   */
+/*  */
+src_weight = gdAlphaTransparent - src_alpha;
+dst_weight = (gdAlphaTransparent - dst_alpha) * src_alpha / gdAlphaMax;
+tot_weight = src_weight + dst_weight;
+
+/*  */
+/*  What red, green and blue result values will we use? */
+/*  */
+alpha = src_alpha * dst_alpha / gdAlphaMax;
+
+red = (gdTrueColorGetRed(src) * src_weight
+   + gdTrueColorGetRed(dst) * dst_weight) / tot_weight;
+green = (gdTrueColorGetGreen(src) * src_weight
+   + gdTrueColorGetGreen(dst) * dst_weight) / tot_weight;
+blue = (gdTrueColorGetBlue(src) * src_weight
+   + gdTrueColorGetBlue(dst) * dst_weight) / tot_weight;
+
+/*  */
+/*  Return merged result.   */
+/*  */
+return ((alpha  24) + (red  16) + (green  8) + blue);
+
+}
+
 void gdImageAlphaBlending (gdImagePtr im, int

[PHP-CVS] cvs: php-src /ext/gd gd.c

2007-09-11 Thread Pierre-Alain Joye

pajoye  Tue Sep 11 21:10:51 2007 UTC

  Modified files:  
/php-src/ext/gd gd.c 
  Log:
  - MFB: alpha support for colorize filter
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.379r2=1.380diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.379 php-src/ext/gd/gd.c:1.380
--- php-src/ext/gd/gd.c:1.379   Mon Jul 30 21:44:53 2007
+++ php-src/ext/gd/gd.c Tue Sep 11 21:10:51 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.379 2007/07/30 21:44:53 pajoye Exp $ */
+/* $Id: gd.c,v 1.380 2007/09/11 21:10:51 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -4601,8 +4601,9 @@
zval *SIM;
gdImagePtr im_src;
long r,g,b,tmp;
+   long a = 0;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, SIM, 
tmp, r, g, b) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l, SIM, 
tmp, r, g, b, a) == FAILURE) {
RETURN_FALSE;
}
 
@@ -4612,7 +4613,7 @@
RETURN_FALSE;
}
 
-   if (gdImageColor(im_src, (int) r, (int) g, (int) b) == 1) {
+   if (gdImageColor(im_src, (int) r, (int) g, (int) b, (int) a) == 1) {
RETURN_TRUE;
}
 
@@ -4721,7 +4722,7 @@
php_image_filter_smooth
};
 
-   if (ZEND_NUM_ARGS()  2 || ZEND_NUM_ARGS()  5) {
+   if (ZEND_NUM_ARGS()  2 || ZEND_NUM_ARGS()  6) {
WRONG_PARAM_COUNT;
} else if (zend_parse_parameters(2 TSRMLS_CC, rl, tmp, filtertype) 
== FAILURE) {
return;

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

[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h

2007-09-11 Thread Pierre-Alain Joye

pajoye  Tue Sep 11 21:31:14 2007 UTC

  Modified files:  
/php-src/ext/gd/libgd   gd.h 
  Log:
  - MFB
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/gd/libgd/gd.h
diff -u php-src/ext/gd/libgd/gd.h:1.33 php-src/ext/gd/libgd/gd.h:1.34
--- php-src/ext/gd/libgd/gd.h:1.33  Sun Jun  3 17:43:13 2007
+++ php-src/ext/gd/libgd/gd.h   Tue Sep 11 21:31:14 2007
@@ -639,7 +639,7 @@
 int gdImageContrast(gdImagePtr src, double contrast);
 
 /* Simply adds or substracts respectively red, green or blue to a pixel */
-int gdImageColor(gdImagePtr src, int red, int green, int blue);
+int gdImageColor(gdImagePtr src, const int red, const int green, const int 
blue, const int alpha);
 
 /* Image convolution by a 3x3 custom matrix */
 int gdImageConvolution(gdImagePtr src, float ft[3][3], float filter_div, float 
offset);

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd/libgd gd.h

2007-09-11 Thread Ilia Alshanetsky

iliaa   Tue Sep 11 23:34:25 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/gd/libgd   gd.h 
  Log:
  MFH: Fixed function definition
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.26.2.3.2.5r2=1.26.2.3.2.6diff_format=u
Index: php-src/ext/gd/libgd/gd.h
diff -u php-src/ext/gd/libgd/gd.h:1.26.2.3.2.5 
php-src/ext/gd/libgd/gd.h:1.26.2.3.2.6
--- php-src/ext/gd/libgd/gd.h:1.26.2.3.2.5  Sun Jun  3 17:46:18 2007
+++ php-src/ext/gd/libgd/gd.h   Tue Sep 11 23:34:25 2007
@@ -643,7 +643,7 @@
 int gdImageContrast(gdImagePtr src, double contrast);
 
 /* Simply adds or substracts respectively red, green or blue to a pixel */
-int gdImageColor(gdImagePtr src, int red, int green, int blue);
+int gdImageColor(gdImagePtr src, const int red, const int green, const int 
blue, const int alpha);
 
 /* Image convolution by a 3x3 custom matrix */
 int gdImageConvolution(gdImagePtr src, float ft[3][3], float filter_div, float 
offset);

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

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings addslashes_variation3.phpt stripslashes_variation5.phpt

[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/bcmath/libbcmath/src bcmath.h

[PHP-CVS] cvs: php-src /ext/bcmath/libbcmath/src bcmath.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre config.w32 config0.m4 upgrade-pcre.php /ext/pcre/pcrelib dftables.c pcre_chartables.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c pcr

[PHP-CVS] cvs: php-src /ext/pcre config.w32 config0.m4 upgrade-pcre.php /ext/pcre/pcrelib dftables.c pcre_chartables.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c pcre_globals

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/gd gd.c /ext/gd/libgd gd.c

[PHP-CVS] cvs: php-src /ext/gd/libgd gd.c

[PHP-CVS] cvs: php-src /ext/gd gd.c

[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd/libgd gd.h

12 matches

Site Navigation

Mail list logo

Footer information