[PHP-CVS] cvs: php-src /ext/standard file.c
iliaa Sun Mar 27 10:52:49 2005 EDT
Modified files:
/php-src/ext/standard file.c
Log:
revert copy patch.
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.404r2=1.405ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.404 php-src/ext/standard/file.c:1.405
--- php-src/ext/standard/file.c:1.404 Mon Mar 7 17:10:08 2005
+++ php-src/ext/standard/file.c Sun Mar 27 10:52:49 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.404 2005/03/07 22:10:08 helly Exp $ */
+/* $Id: file.c,v 1.405 2005/03/27 15:52:49 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1700,12 +1700,6 @@
{
php_stream *srcstream = NULL, *deststream = NULL;
int ret = FAILURE;
- struct stat src_s, dest_s;
-
- /* safety check to ensure that source destination files are not the
same file */
- if (stat(src, src_s) || (stat(dest, dest_s) == 0 src_s.st_ino ==
dest_s.st_ino)) {
- return ret;
- }
srcstream = php_stream_open_wrapper(src, rb,
STREAM_DISABLE_OPEN_BASEDIR | REPORT_ERRORS, NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard file.c
iliaa Sun Mar 27 10:53:30 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard file.c
Log:
MFH: revert copy patch.
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.382.2.7r2=1.382.2.8ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.382.2.7
php-src/ext/standard/file.c:1.382.2.8
--- php-src/ext/standard/file.c:1.382.2.7 Mon Mar 21 03:40:54 2005
+++ php-src/ext/standard/file.c Sun Mar 27 10:53:30 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.382.2.7 2005/03/21 08:40:54 hyanantha Exp $ */
+/* $Id: file.c,v 1.382.2.8 2005/03/27 15:53:30 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1619,12 +1619,6 @@
{
php_stream *srcstream = NULL, *deststream = NULL;
int ret = FAILURE;
- struct stat src_s, dest_s;
-
- /* safety check to ensure that source destination files are not the
same file */
- if (stat(src, src_s) || (stat(dest, dest_s) == 0 src_s.st_ino ==
dest_s.st_ino)) {
- return ret;
- }
srcstream = php_stream_open_wrapper(src, rb,
STREAM_DISABLE_OPEN_BASEDIR | REPORT_ERRORS, NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard file.c
iliaa Sun Mar 27 10:54:00 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard file.c
Log:
MFH: revert copy patch.
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.279.2.69r2=1.279.2.70ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.69
php-src/ext/standard/file.c:1.279.2.70
--- php-src/ext/standard/file.c:1.279.2.69 Wed Mar 2 22:31:59 2005
+++ php-src/ext/standard/file.c Sun Mar 27 10:53:59 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.279.2.69 2005/03/03 03:31:59 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.70 2005/03/27 15:53:59 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2141,12 +2141,6 @@
{
php_stream *srcstream = NULL, *deststream = NULL;
int ret = FAILURE;
- struct stat src_s, dest_s;
-
- /* safety check to ensure that source destination files are not the
same file */
- if (stat(src, src_s) || (stat(dest, dest_s) == 0 src_s.st_ino ==
dest_s.st_ino)) {
- return ret;
- }
srcstream = php_stream_open_wrapper(src, rb,
STREAM_DISABLE_OPEN_BASEDIR | REPORT_ERRORS,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c /ext/gd/libgd gd.c gd.h
pajoye Sun Mar 27 18:43:52 2005 EDT
Modified files:
/php-src/ext/gd gd.c
/php-src/ext/gd/libgd gd.c gd.h
Log:
- allow to keep or ignore the transparent color in imagerotate (thx
Ken Coar to report this bug)
- be sure to restore alphablending in imagefill
- use zend_parse_parameter in imagerotate
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.306r2=1.307ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.306 php-src/ext/gd/gd.c:1.307
--- php-src/ext/gd/gd.c:1.306 Mon Jan 17 12:07:28 2005
+++ php-src/ext/gd/gd.c Sun Mar 27 18:43:51 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.306 2005/01/17 17:07:28 sniper Exp $ */
+/* $Id: gd.c,v 1.307 2005/03/27 23:43:51 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1208,23 +1208,19 @@
Rotate an image using a custom angle */
PHP_FUNCTION(imagerotate)
{
- zval **SIM, **ANGLE, **BGDCOLOR;
+ zval *SIM;
gdImagePtr im_dst, im_src;
double degrees;
long color;
+ long ignoretransparent = 0;
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, SIM, ANGLE,
BGDCOLOR) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rdl|l, SIM,
degrees, color, ignoretransparent) == FAILURE) {
+ RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, Image, le_gd);
-
- convert_to_long_ex(BGDCOLOR);
- color = Z_LVAL_PP(BGDCOLOR);
+ ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, Image, le_gd);
- convert_to_double_ex(ANGLE);
- degrees = Z_DVAL_PP(ANGLE);
- im_dst = gdImageRotate(im_src, degrees, color);
+ im_dst = gdImageRotate(im_src, degrees, color, ignoretransparent);
if (im_dst != NULL) {
ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd);
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.c?r1=1.83r2=1.84ty=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.83 php-src/ext/gd/libgd/gd.c:1.84
--- php-src/ext/gd/libgd/gd.c:1.83 Wed Nov 17 15:19:35 2004
+++ php-src/ext/gd/libgd/gd.c Sun Mar 27 18:43:52 2005
@@ -1890,6 +1890,7 @@
if (nc==gdTiled){
_gdImageFillTiled(im,x,y,nc);
+ im-alphaBlendingFlag = alphablending_bak;
return;
}
@@ -2192,7 +2193,7 @@
int tox, toy;
int ncR, ncG, ncB;
toy = dstY;
-
+printf(srccpopy:%X, src-transparent);
for (y = srcY; y (srcY + h); y++) {
tox = dstX;
for (x = srcX; x (srcX + w); x++) {
@@ -2493,7 +2494,7 @@
#endif /* ROTATE_PI */
#define ROTATE_DEG2RAD 3.1415926535897932384626433832795/180
-void gdImageSkewX (gdImagePtr dst, gdImagePtr src, int uRow, int iOffset,
double dWeight, int clrBack)
+void gdImageSkewX (gdImagePtr dst, gdImagePtr src, int uRow, int iOffset,
double dWeight, int clrBack, int ignoretransparent)
{
typedef int (*FuncPtr)(gdImagePtr, int, int);
int i, r, g, b, a, clrBackR, clrBackG, clrBackB, clrBackA;
@@ -2558,10 +2559,14 @@
a = 127;
}
- pxlSrc = gdImageColorAllocateAlpha(dst, r, g, b, a);
+ if (ignoretransparent pxlSrc == dst-transparent) {
+ pxlSrc = dst-transparent;
+ } else {
+ pxlSrc = gdImageColorAllocateAlpha(dst, r, g, b, a);
- if (pxlSrc == -1) {
- pxlSrc = gdImageColorClosestAlpha(dst, r, g, b, a);
+ if (pxlSrc == -1) {
+ pxlSrc = gdImageColorClosestAlpha(dst, r, g, b,
a);
+ }
}
if ((i + iOffset = 0) (i + iOffset dst-sx)) {
@@ -2586,7 +2591,7 @@
}
}
-void gdImageSkewY (gdImagePtr dst, gdImagePtr src, int uCol, int iOffset,
double dWeight, int clrBack)
+void gdImageSkewY (gdImagePtr dst, gdImagePtr src, int uCol, int iOffset,
double dWeight, int clrBack, int ignoretransparent)
{
typedef int (*FuncPtr)(gdImagePtr, int, int);
int i, iYPos=0, r, g, b, a;
@@ -2645,10 +2650,14 @@
a = 127;
}
- pxlSrc = gdImageColorAllocateAlpha(dst, r, g, b, a);
+ if (ignoretransparent pxlSrc == dst-transparent) {
+ pxlSrc = dst-transparent;
+ } else {
+ pxlSrc = gdImageColorAllocateAlpha(dst, r, g, b, a);
- if (pxlSrc == -1) {
- pxlSrc = gdImageColorClosestAlpha(dst, r, g, b, a);
+ if (pxlSrc == -1) {
+ pxlSrc = gdImageColorClosestAlpha(dst, r, g, b,
a);
+ }
[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_element.c xmlrpc.c
edink Sun Mar 27 19:07:25 2005 EDT
Modified files:
/php-src/ext/xmlrpc/libxmlrpc xml_element.c xmlrpc.c
Log:
Reshufle includes to make it compile on windows
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.7
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.8
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.7 Fri Mar 25 22:13:58 2005
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c Sun Mar 27 19:07:24 2005
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = #(@) $Id: xml_element.c,v 1.7 2005/03/26 03:13:58
sniper Exp $;
+static const char rcsid[] = #(@) $Id: xml_element.c,v 1.8 2005/03/28 00:07:24
edink Exp $;
@@ -44,6 +44,9 @@
* 06/2000
* HISTORY
* $Log: xml_element.c,v $
+ * Revision 1.8 2005/03/28 00:07:24 edink
+ * Reshufle includes to make it compile on windows
+ *
* Revision 1.7 2005/03/26 03:13:58 sniper
* - Made it possible to build ext/xmlrpc with libxml2
*
@@ -104,6 +107,7 @@
* there must be some.
**/
+#include ext/xml/expat_compat.h
#ifdef _WIN32
#include xmlrpc_win32.h
#endif
@@ -113,7 +117,6 @@
#include xml_element.h
#include queue.h
-#include ext/xml/expat_compat.h
#include encodings.h
#define my_free(thing) if(thing) {free(thing); thing = 0;}
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.7
php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8
--- php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.7 Fri Mar 25 22:13:58 2005
+++ php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c Sun Mar 27 19:07:24 2005
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = #(@) $Id: xmlrpc.c,v 1.7 2005/03/26 03:13:58
sniper Exp $;
+static const char rcsid[] = #(@) $Id: xmlrpc.c,v 1.8 2005/03/28 00:07:24
edink Exp $;
/h* ABOUT/xmlrpc
@@ -43,6 +43,9 @@
* 9/1999 - 10/2000
* HISTORY
* $Log: xmlrpc.c,v $
+ * Revision 1.8 2005/03/28 00:07:24 edink
+ * Reshufle includes to make it compile on windows
+ *
* Revision 1.7 2005/03/26 03:13:58 sniper
* - Made it possible to build ext/xmlrpc with libxml2
*
@@ -122,7 +125,7 @@
* - comprehensive API for manipulation of values
***/
-
+#include ext/xml/expat_compat.h
#ifdef _WIN32
#include xmlrpc_win32.h
#endif
@@ -135,7 +138,6 @@
#include queue.h
#include xmlrpc.h
-#include ext/xml/expat_compat.h
#include base64.h
#include xml_to_xmlrpc.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
joeyMon Mar 28 02:26:06 2005 EDT Modified files: /php-srcphp.ini-dist php.ini-recommended Log: Adding comments to .ini files at [EMAIL PROTECTED]'s request. http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.225r2=1.226ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.225 php-src/php.ini-dist:1.226 --- php-src/php.ini-dist:1.225 Mon Feb 28 19:23:31 2005 +++ php-src/php.ini-distMon Mar 28 02:26:06 2005 @@ -550,9 +550,11 @@ ; extension_dir directive above. -;Windows Extensions -;Note that ODBC support is built in, so no dll is needed for it. -; +; Windows Extensions +; Note that ODBC support is built in, so no dll is needed for it. +; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +; extension folders as well as the separate PECL DLL download (PHP 5). +; Be sure to appropriately set the extensions_dir directive. ;extension=php_bz2.dll ;extension=php_cpdf.dll http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.170r2=1.171ty=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.170 php-src/php.ini-recommended:1.171 --- php-src/php.ini-recommended:1.170 Mon Feb 28 19:23:31 2005 +++ php-src/php.ini-recommended Mon Mar 28 02:26:06 2005 @@ -608,9 +608,11 @@ ; extension_dir directive above. -;Windows Extensions -;Note that ODBC support is built in, so no dll is needed for it. -; +; Windows Extensions +; Note that ODBC support is built in, so no dll is needed for it. +; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +; extension folders as well as the separate PECL DLL download (PHP 5). +; Be sure to appropriately set the extensions_dir directive. ;extension=php_bz2.dll ;extension=php_cpdf.dll -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
