date:20030709

Re[2]: [PHP-CVS] cvs: spl / spl_foreach.c

2003-07-09 Thread Marcus Börger

Hello Jason,

Wednesday, July 9, 2003, 4:57:19 AM, you wrote:

JG Actually, I double checked C99, and // was added, however C89 does not.

JG -Jason


JG On Tue, 2003-07-08 at 21:48, Jason Greene wrote:
 jason Tue Jul  8 22:48:25 2003 EDT
 
   Modified files:  
 /spl  spl_foreach.c 
   Log:
   Convert C++ comments to C (violates C99, and breaks several compilers)
   
   
 Index: spl/spl_foreach.c
 diff -u spl/spl_foreach.c:1.15 spl/spl_foreach.c:1.16
 --- spl/spl_foreach.c:1.15Tue Jul  8 19:11:14 2003
 +++ spl/spl_foreach.c Tue Jul  8 22:48:25 2003
 @@ -151,10 +151,10 @@
   if (proxy-is_a  SPL_IS_A_SEQUENCE) {
   spl_begin_method_call_no_retval(obj, proxy-obj_ce, 
 proxy-funcs.rewind, rewind, sizeof(rewind)-1 TSRMLS_CC);
   }
 - // now this is an optimization trick:
 - // ZEND_SWITCH_FREE receives the array copy or the spl object 
 in op1 and has an unused op2
 - // We have to check for op1 being an object that implements 
 spl_forwar... Or we simply set 
 - // op2 and know we can safely free the object as needed, 
 which is waht we do.
 + /* now this is an optimization trick:
 +ZEND_SWITCH_FREE receives the array copy or the spl object 
 in op1 and has an unused op2
 +We have to check for op1 being an object that implements 
 spl_forwar... Or we simply set 
 +op2 and know we can safely free the object as needed, 
 which is waht we do. */
   op_array-opcodes[EX(opline)-op2.u.opline_num].op2 = *op1;
   }
  
 @@ -242,7 +242,7 @@
  /* {{{ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_SWITCH_FREE) */
  ZEND_EXECUTE_HOOK_FUNCTION(ZEND_SWITCH_FREE)
  {
 - // See not in ZEND_FE_FETCH on setting op2
 + /* See not in ZEND_FE_FETCH on setting op2 */
   znode *op2 = EX(opline)-op2;
   zval *tmp, **obj = spl_get_zval_ptr_ptr(op2, EX(Ts) TSRMLS_CC);
   spl_foreach_proxy *proxy;
JG --
JG Jason Greene [EMAIL PROTECTED]
JG  [EMAIL PROTECTED]

JG Children's talent to endure stems from their ignorance of alternatives.
JG -- Maya Angelou, I Know Why the Caged Bird Sings



Sure  thanks!

I forgot to change that

-- 
Best regards,
 Marcusmailto:[EMAIL PROTECTED]


-- 
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

2003-07-09 Thread Pierre-Alain Joye

pajoye  Wed Jul  9 06:15:13 2003 EDT

  Modified files:  
/php-src/ext/gd/libgd   gd.c 
  Log:
  - Fix #23792, imagerotate returns always truecolor images now 
(the destination image is a truecolor, no more limited palette problems)
  - Clean the cast in gdImageCopyMerge
  
  
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.57 php-src/ext/gd/libgd/gd.c:1.58
--- php-src/ext/gd/libgd/gd.c:1.57  Wed Jul  2 07:36:17 2003
+++ php-src/ext/gd/libgd/gd.c   Wed Jul  9 06:15:13 2003
@@ -2075,9 +2075,9 @@
} else {
dc = gdImageGetPixel(dst, tox, toy);
 
-   ncR = (int)gdImageRed (src, c) * (pct / 100.0) + 
gdImageRed (dst, dc) * ((100 - pct) / 100.0);
-   ncG = (int)gdImageGreen (src, c) * (pct / 100.0) + 
(int)gdImageGreen (dst, dc) * ((100 - pct) / 100.0);
-   ncB = (int)gdImageBlue (src, c) * (pct / 100.0) + 
gdImageBlue (dst, dc) * ((100 - pct) / 100.0);
+   ncR = (int)(gdImageRed (src, c) * (pct / 100.0) + 
gdImageRed (dst, dc) * ((100 - pct) / 100.0));
+   ncG = (int)(gdImageGreen (src, c) * (pct / 100.0) + 
gdImageGreen (dst, dc) * ((100 - pct) / 100.0));
+   ncB = (int)(gdImageBlue (src, c) * (pct / 100.0) + 
gdImageBlue (dst, dc) * ((100 - pct) / 100.0));
 
/* Find a reasonable color */
nc = gdImageColorResolve (dst, ncR, ncG, ncB);
@@ -2368,14 +2368,22 @@
 void gdImageSkewX (gdImagePtr dst, gdImagePtr src, int uRow, int iOffset, double 
dWeight, int clrBack)
 {
typedef int (*FuncPtr)(gdImagePtr, int, int);
-   int i, r, g, b, a;
+   int i, r, g, b, a, clrBackR, clrBackG, clrBackB, clrBackA;
FuncPtr f;
 
int pxlOldLeft, pxlLeft=0, pxlSrc;
 
+   /* Keep clrBack as color index if required */
if (src-trueColor) {
+   pxlOldLeft = clrBack;
f = gdImageGetTrueColorPixel;
} else {
+   pxlOldLeft = clrBack;
+   clrBackR = gdImageRed(src, clrBack); 
+   clrBackG = gdImageGreen(src, clrBack);
+   clrBackB = gdImageBlue(src, clrBack);
+   clrBackA = gdImageAlpha(src, clrBack);
+   clrBack =  gdTrueColorAlpha(clrBackR, clrBackG, clrBackB, clrBackA);
f = gdImageGetPixel;
}
 
@@ -2387,8 +2395,6 @@
gdImageSetPixel (dst, i, uRow, clrBack);
}
 
-   pxlOldLeft  = clrBack;
-
for (i = 0; i  src-sx; i++) {
pxlSrc = f (src,i,uRow);
 
@@ -2541,10 +2547,8 @@
FuncPtr f;
 
if (src-trueColor) {
-   dst = gdImageCreateTrueColor(src-sy, src-sx);
f = gdImageGetTrueColorPixel;
} else {
-   dst = gdImageCreate (src-sy, src-sx);
f = gdImageGetPixel;
}
 
@@ -2632,6 +2636,7 @@
double dRadAngle, dSinE, dTan, dShear;
double dOffset; /* Variable skew offset */
int u, iShear, newx, newy;
+   int clrBackR, clrBackG, clrBackB, clrBackA;
 
/* See GEMS I for the algorithm details */
dRadAngle = dAngle * ROTATE_DEG2RAD; /* Angle in radians */
@@ -2662,6 +2667,7 @@
}

gdImagePaletteCopy (dst1, src);
+
dRadAngle = dAngle * ROTATE_DEG2RAD; /* Angle in radians */
dSinE = sin (dRadAngle);
dTan = tan (dRadAngle / 2.0);
@@ -2678,6 +2684,15 @@
gdImageSkewX(dst1, src, u, iShear, (dShear - iShear), clrBack);
}
 
+   /*
+   The 1st shear may use the original clrBack as color index
+   Convert it once here
+   */
+   clrBackR = gdImageRed(src, clrBack); 
+   clrBackG = gdImageGreen(src, clrBack);
+   clrBackB = gdImageBlue(src, clrBack);
+   clrBackA = gdImageAlpha(src, clrBack);
+   clrBack =  gdTrueColorAlpha(clrBackR, clrBackG, clrBackB, clrBackA);
/* 2nd shear */
newx = dst1-sx;

@@ -2690,13 +2705,11 @@
newy = (int) ((double) src-sx * fabs( dSinE ) + (double) src-sy * cos 
(dRadAngle));
 
if (src-trueColor) {
-   dst2 = gdImageCreateTrueColor (newx, newy);
f = gdImageGetTrueColorPixel;
} else {
-   dst2 = gdImageCreate (newx, newy);
f = gdImageGetPixel;
}
-
+   dst2 = gdImageCreateTrueColor(newx, newy);
if (dst2 == NULL) {
gdImageDestroy(dst1);
return NULL;
@@ -2714,13 +2727,11 @@
newy = dst2-sy;
 
if (src-trueColor) {
-   dst3 = gdImageCreateTrueColor (newx, newy);
f = gdImageGetTrueColorPixel;
} else {
-   dst3 = gdImageCreate (newx, newy);
f = gdImageGetPixel;
}
-   
+   dst3 =

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

2003-07-09 Thread Pierre-Alain Joye

pajoye  Wed Jul  9 06:36:07 2003 EDT

  Modified files:  
/php-src/ext/gd/libgd   gd.c 
  Log:
  - Fix a possible crash when invalid color index are given as background 
in imagerotate, only when palette based image is used as src
  
  
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.58 php-src/ext/gd/libgd/gd.c:1.59
--- php-src/ext/gd/libgd/gd.c:1.58  Wed Jul  9 06:15:13 2003
+++ php-src/ext/gd/libgd/gd.c   Wed Jul  9 06:36:07 2003
@@ -2761,6 +2761,10 @@
return NULL;
}
 
+if (!gdImageTrueColor(src)  clrBack=gdImageColorsTotal(src)) {
+return NULL;
+}
+
clrBackR = gdImageRed(src, clrBack);
clrBackG = gdImageGreen(src, clrBack);
clrBackB = gdImageBlue(src, clrBack);



-- 
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/gd/libgd gd.c

2003-07-09 Thread Pierre-Alain Joye

pajoye  Wed Jul  9 06:38:22 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/libgd   gd.c 
  Log:
  - MFH
  
  
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.24.2.16 php-src/ext/gd/libgd/gd.c:1.24.2.17
--- php-src/ext/gd/libgd/gd.c:1.24.2.16 Wed Jul  2 07:33:35 2003
+++ php-src/ext/gd/libgd/gd.c   Wed Jul  9 06:38:22 2003
@@ -2547,7 +2547,7 @@
dst = gdImageCreate (src-sy, src-sx);
f = gdImageGetPixel;
}
-
+   dst = gdImageCreateTrueColor(src-sy, src-sx);
if (dst != NULL) {
gdImagePaletteCopy (dst, src);

@@ -2572,13 +2572,11 @@
FuncPtr f;
 
if (src-trueColor) {
-   dst = gdImageCreateTrueColor ( src-sx,src-sy);
f = gdImageGetTrueColorPixel;
} else {
-   dst = gdImageCreate (src-sx, src-sy);
f = gdImageGetPixel;
}
-
+   dst = gdImageCreateTrueColor(src-sx, src-sy);
if (dst != NULL) {
gdImagePaletteCopy (dst, src);

@@ -2603,12 +2601,11 @@
FuncPtr f;
 
if (src-trueColor) {
-   dst = gdImageCreateTrueColor (src-sy, src-sx);
f = gdImageGetTrueColorPixel;
} else {
-   dst = gdImageCreate (src-sy, src-sx);
f = gdImageGetPixel;
}
+   dst = gdImageCreateTrueColor(src-sy, src-sx);
 
if (dst != NULL) {
gdImagePaletteCopy (dst, src);
@@ -2643,12 +2640,11 @@
 
/* 1st shear */
if (src-trueColor) {
-   dst1 = gdImageCreateTrueColor (newx, newy);
f = gdImageGetTrueColorPixel;
} else {
-   dst1 = gdImageCreate (newx, newy);
f = gdImageGetPixel;
}
+   dst1 = gdImageCreateTrueColor(newx, newy);
 
/*** Perform 1st shear (horizontal) **/
if (dst1 == NULL) {
@@ -2749,6 +2745,11 @@
if (src == NULL) {
return NULL;
}
+
+   if (!gdImageTrueColor(src)  clrBack=gdImageColorsTotal(src)) {
+   return NULL;
+   }
+
 
while (dAngle = 360.0) {
dAngle -= 360.0;



-- 
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/gd/libgd gd.c

2003-07-09 Thread Pierre-Alain Joye

pajoye  Wed Jul  9 06:43:01 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/libgd   gd.c 
  Log:
  - MFH
  
  
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.24.2.17 php-src/ext/gd/libgd/gd.c:1.24.2.18
--- php-src/ext/gd/libgd/gd.c:1.24.2.17 Wed Jul  9 06:38:22 2003
+++ php-src/ext/gd/libgd/gd.c   Wed Jul  9 06:43:01 2003
@@ -2075,9 +2075,9 @@
} else {
dc = gdImageGetPixel(dst, tox, toy);
 
-   ncR = (int)gdImageRed (src, c) * (pct / 100.0) + 
gdImageRed (dst, dc) * ((100 - pct) / 100.0);
-   ncG = (int)gdImageGreen (src, c) * (pct / 100.0) + 
(int)gdImageGreen (dst, dc) * ((100 - pct) / 100.0);
-   ncB = (int)gdImageBlue (src, c) * (pct / 100.0) + 
gdImageBlue (dst, dc) * ((100 - pct) / 100.0);
+   ncR = (int)(gdImageRed (src, c) * (pct / 100.0) + 
gdImageRed (dst, dc) * ((100 - pct) / 100.0));
+   ncG = (int)(gdImageGreen (src, c) * (pct / 100.0) + 
gdImageGreen (dst, dc) * ((100 - pct) / 100.0));
+   ncB = (int)(gdImageBlue (src, c) * (pct / 100.0) + 
gdImageBlue (dst, dc) * ((100 - pct) / 100.0));
 
/* Find a reasonable color */
nc = gdImageColorResolve (dst, ncR, ncG, ncB);
@@ -2368,14 +2368,22 @@
 void gdImageSkewX (gdImagePtr dst, gdImagePtr src, int uRow, int iOffset, double 
dWeight, int clrBack)
 {
typedef int (*FuncPtr)(gdImagePtr, int, int);
-   int i, r, g, b, a;
+   int i, r, g, b, a, clrBackR, clrBackG, clrBackB, clrBackA;
FuncPtr f;
 
int pxlOldLeft, pxlLeft=0, pxlSrc;
 
+   /* Keep clrBack as color index if required */
if (src-trueColor) {
+   pxlOldLeft = clrBack;
f = gdImageGetTrueColorPixel;
} else {
+   pxlOldLeft = clrBack;
+   clrBackR = gdImageRed(src, clrBack); 
+   clrBackG = gdImageGreen(src, clrBack);
+   clrBackB = gdImageBlue(src, clrBack);
+   clrBackA = gdImageAlpha(src, clrBack);
+   clrBack =  gdTrueColorAlpha(clrBackR, clrBackG, clrBackB, clrBackA);
f = gdImageGetPixel;
}
 
@@ -2387,8 +2395,6 @@
gdImageSetPixel (dst, i, uRow, clrBack);
}
 
-   pxlOldLeft  = clrBack;
-
for (i = 0; i  src-sx; i++) {
pxlSrc = f (src,i,uRow);
 
@@ -2541,10 +2547,8 @@
FuncPtr f;
 
if (src-trueColor) {
-   dst = gdImageCreateTrueColor(src-sy, src-sx);
f = gdImageGetTrueColorPixel;
} else {
-   dst = gdImageCreate (src-sy, src-sx);
f = gdImageGetPixel;
}
dst = gdImageCreateTrueColor(src-sy, src-sx);
@@ -2629,6 +2633,7 @@
double dRadAngle, dSinE, dTan, dShear;
double dOffset; /* Variable skew offset */
int u, iShear, newx, newy;
+   int clrBackR, clrBackG, clrBackB, clrBackA;
 
/* See GEMS I for the algorithm details */
dRadAngle = dAngle * ROTATE_DEG2RAD; /* Angle in radians */
@@ -2658,6 +2663,7 @@
}

gdImagePaletteCopy (dst1, src);
+
dRadAngle = dAngle * ROTATE_DEG2RAD; /* Angle in radians */
dSinE = sin (dRadAngle);
dTan = tan (dRadAngle / 2.0);
@@ -2674,6 +2680,15 @@
gdImageSkewX(dst1, src, u, iShear, (dShear - iShear), clrBack);
}
 
+   /*
+   The 1st shear may use the original clrBack as color index
+   Convert it once here
+   */
+   clrBackR = gdImageRed(src, clrBack); 
+   clrBackG = gdImageGreen(src, clrBack);
+   clrBackB = gdImageBlue(src, clrBack);
+   clrBackA = gdImageAlpha(src, clrBack);
+   clrBack =  gdTrueColorAlpha(clrBackR, clrBackG, clrBackB, clrBackA);
/* 2nd shear */
newx = dst1-sx;

@@ -2686,13 +2701,11 @@
newy = (int) ((double) src-sx * fabs( dSinE ) + (double) src-sy * cos 
(dRadAngle));
 
if (src-trueColor) {
-   dst2 = gdImageCreateTrueColor (newx, newy);
f = gdImageGetTrueColorPixel;
} else {
-   dst2 = gdImageCreate (newx, newy);
f = gdImageGetPixel;
}
-
+   dst2 = gdImageCreateTrueColor(newx, newy);
if (dst2 == NULL) {
gdImageDestroy(dst1);
return NULL;
@@ -2710,13 +2723,11 @@
newy = dst2-sy;
 
if (src-trueColor) {
-   dst3 = gdImageCreateTrueColor (newx, newy);
f = gdImageGetTrueColorPixel;
} else {
-   dst3 = gdImageCreate (newx, newy);
f = gdImageGetPixel;
}
-   
+   dst3 = gdImageCreateTrueColor(newx, newy);  
if (dst3 == NULL) {
gdImageDestroy(dst2);

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

2003-07-09 Thread Edin Kadribasic

edink   Wed Jul  9 07:07:27 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  For Pierre-Alain Joye.
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.276 php-src/NEWS:1.1247.2.277
--- php-src/NEWS:1.1247.2.276   Mon Jul  7 18:51:27 2003
+++ php-src/NEWSWed Jul  9 07:07:27 2003
@@ -7,6 +7,8 @@
 - Fixed FastCGI IIS document root problem. (Shane)
 - Fixed corruption of multibyte character including 0x5c as second
   byte in multipart/form-data. (Rui)
+- Fixed possible crash in imagerotate() when AN invalid color index
+  is used for background color. (Pierre-Alain Joye)
 - Fixed bug #24313 (file_exist() warning on non-existent files
   when open_basedir is used). (Ilia)
 - Fixed bug #24312 (base64_decode() does not skip 0xF0-0xFF characters).
@@ -16,6 +18,8 @@
 - Fixed bug #24028 (Reading raw post message by php://input failed). (Jani)
 - Fixed bug #24009 (FastCGI handling of file not found). (Shane)
 - Fixed bug #23808 (broken imagecopymerge()). (Pierre-Alain Joye)
+- Fixed bug #23792 (imagerotate() problems with limited platte, the function
+  will always return true color image from now on). (Pierre-Alain Joye)
 - Fixed bug #23664 (FastCGI socket listenting). (Shane)
 
 19 Jun 2003, Version 4.3.3RC1



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

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

2003-07-09 Thread Brad House

bradmsswWed Jul  9 09:45:19 2003 EDT

  Modified files:  
/php-src/ext/mcve   mcve.c 
  Log:
  fix typecasting errors, especially for new constants. Don't assume long and int are 
the same size, as on 64bit architectures, they are normally not
  
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.20 php-src/ext/mcve/mcve.c:1.21
--- php-src/ext/mcve/mcve.c:1.20Mon Jul  7 22:59:50 2003
+++ php-src/ext/mcve/mcve.c Wed Jul  9 09:45:19 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: mcve.c,v 1.20 2003/07/08 02:59:50 bradmssw Exp $ */
+/* $Id: mcve.c,v 1.21 2003/07/09 13:45:19 bradmssw Exp $ */
 
 /* standard php include(s) */
 #include php.h
@@ -588,7 +588,6 @@
 */
 PHP_FUNCTION(mcve_setssl_files)
 {
-   MCVE_CONN *conn;
int retval;
zval **arg1, **arg2;
 
@@ -841,29 +840,53 @@
convert_to_long_ex(arg2);
 
switch (key) {
-   case MC_TRANTYPE:
-   case MC_PTRANNUM:
+   /* Typecast to MCVE_int64 */
case MC_TTID:
+   convert_to_long_ex(arg4);
+   retval = MCVE_TransParam(conn, (long)Z_LVAL_PP(arg2), key, 
(MCVE_int64)Z_LVAL_PP(arg4));
+   break;
+
+   /* Typecast to long */
+
+   case MC_PTRANNUM:
+   case MC_TIMESTAMP:
+   case MC_MARKER:
+   convert_to_long_ex(arg4);
+   retval = MCVE_TransParam(conn, (long)Z_LVAL_PP(arg2), key, 
(long)Z_LVAL_PP(arg4));
+   break;
+
+   /* Typecast to int */
case MC_ADMIN:
+   case MC_SUB:
+   case MC_TRANTYPE:
case MC_AUDITTYPE:
+   case MC_EXCHARGES:
+   case MC_INQUIRY:
+   case MC_PRIORITY:
+   case MC_CARDTYPES:
+   case MC_ORIGTYPE:
+   case MC_VOIDORIGTYPE:
convert_to_long_ex(arg4);
-   retval = MCVE_TransParam(conn, Z_LVAL_PP(arg2), key, 
Z_LVAL_PP(arg4));
+   retval = MCVE_TransParam(conn, (long)Z_LVAL_PP(arg2), key, 
(int)Z_LVAL_PP(arg4));
break;
 
+   /* Typecast to double */
case MC_AMOUNT:
+   case MC_EXAMOUNT:
+   case MC_RATE:
convert_to_double_ex(arg4);
-   retval = MCVE_TransParam(conn, Z_LVAL_PP(arg2), key, 
Z_DVAL_PP(arg4));
+   retval = MCVE_TransParam(conn, (long)Z_LVAL_PP(arg2), key, 
(double)Z_DVAL_PP(arg4));
break;
 
case MC_CUSTOM:
convert_to_string_ex(arg4);
convert_to_string_ex(arg5);
-   retval = MCVE_TransParam(conn, Z_LVAL_PP(arg2), key, 
Z_STRVAL_PP(arg4), Z_STRVAL_PP(arg5));
+   retval = MCVE_TransParam(conn, (long)Z_LVAL_PP(arg2), key, 
Z_STRVAL_PP(arg4), Z_STRVAL_PP(arg5));
break;
 
default:
convert_to_string_ex(arg4);
-   retval = MCVE_TransParam(conn, Z_LVAL_PP(arg2), key, 
Z_STRVAL_PP(arg4));
+   retval = MCVE_TransParam(conn, (long)Z_LVAL_PP(arg2), key, 
Z_STRVAL_PP(arg4));
break;
}
 



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

[PHP-CVS] cvs: php-src / EXTENSIONS

2003-07-09 Thread Marcus Boerger

helly   Wed Jul  9 10:55:14 2003 EDT

  Modified files:  
/php-srcEXTENSIONS 
  Log:
  Update the info and collect XML extensions
  
Index: php-src/EXTENSIONS
diff -u php-src/EXTENSIONS:1.57 php-src/EXTENSIONS:1.58
--- php-src/EXTENSIONS:1.57 Tue Jul  8 05:13:05 2003
+++ php-src/EXTENSIONS  Wed Jul  9 10:55:14 2003
@@ -51,7 +51,7 @@
 STATUS:  Working
 ---
 EXTENSION:   cli
-MAINTENANCE: Unknown
+MAINTENANCE: Marcus Boerger [EMAIL PROTECTED], Edin Kadribasic [EMAIL 
PROTECTED]
 STATUS:  Working
 ---
 EXTENSION:   fhttpd
@@ -102,6 +102,7 @@
 PRIMARY MAINTAINER:  Marcus Börger [EMAIL PROTECTED]
 MAINTENANCE: Maintained
 STATUS:  Working
+COMMENT: DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 ---
 EXTENSION:   dbase
 PRIMARY MAINTAINER:  Jim Winstead [EMAIL PROTECTED]
@@ -161,12 +162,22 @@
 MAINTENANCE: Maintained
 STATUS:  Working
 ---
+EXTENSION:   mysqli
+PRIMARY MAINTAINER:  Georg Richter [EMAIL PROTECTED]
+MAINTENANCE: Maintained
+STATUS:  Experimental
+---
 EXTENSION:   pgsql
 PRIMARY MAINTAINER:  Marcus Boerger [EMAIL PROTECTED], Yasuo Ohgaki [EMAIL 
PROTECTED]
 MAINTENANCE: Maintained
 STATUS:  Working
 COMMENT: Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have 
fatal bug.
 ---
+EXTENSION:   sqlite
+PRIMARY MAINTAINER:  Marcus Boerger [EMAIL PROTECTED], Wez Furlong [EMAIL 
PROTECTED]
+MAINTENANCE: Maintained
+STATUS:  Working
+---
 EXTENSION:   sybase
 MAINTENANCE: Unknown
 STATUS:  Not Working
@@ -194,6 +205,41 @@
 ---
 
 
+== XML extensions ==
+
+---
+EXTENSION:   dom
+PRIMARY MAINTAINER:  Christian Stocker [EMAIL PROTECTED], Rob Richards [EMAIL 
PROTECTED], Marcus Boerger [EMAIL PROTECTED]
+MAINTENANCE: Maintained
+STATUS:  Experimental
+---
+EXTENSION:   simplexml
+PRIMARY MAINTAINER:  Sterling Hughes [EMAIL PROTECTED]
+MAINTENANCE: Maintained
+STATUS:  Experimental
+---
+EXTENSION:   wddx
+PRIMARY MAINTAINER:  Andrei Zmievski [EMAIL PROTECTED]
+MAINTENANCE: Maintained
+STATUS:  Working
+---
+EXTENSION:   xml
+PRIMARY MAINTAINER:  Thies C. Arntzen [EMAIL PROTECTED]
+MAINTENANCE: Maintained
+STATUS:  Working
+---
+EXTENSION:   xmlrpc
+PRIMARY MAINTAINER:  Dan Libby
+MAINTENANCE: UNKNOWN
+STATUS:  Experimental
+---
+EXTENSION:   xsl
+PRIMARY MAINTAINER:  Christian Stocker [EMAIL PROTECTED], Rob Richards [EMAIL 
PROTECTED]
+MAINTENANCE: Maintained
+STATUS:  Experimental
+---
+
+
 == Other extensions ==
 
 ---
@@ -260,11 +306,6 @@
 MAINTENANCE: Maintained
 STATUS:  Unknown
 ---
-EXTENSION:   domxml
-PRIMARY MAINTAINER:  Uwe Steinmann [EMAIL PROTECTED]
-MAINTENANCE: Maintained
-STATUS:  Experimental

 EXTENSION:   dotnet
 PRIMARY MAINTAINER:  Sam Ruby [EMAIL PROTECTED]
 MAINTENANCE: Maintained
@@ -463,21 +504,6 @@
 STATUS:  Experimental
 SINCE:   4.0.5
 ---
-EXTENSION:   wddx
-PRIMARY MAINTAINER:  Andrei Zmievski [EMAIL PROTECTED]
-MAINTENANCE: Maintained
-STATUS:  Working

-EXTENSION:   xml
-PRIMARY MAINTAINER:  Thies C. Arntzen

[PHP-CVS] cvs: php-src /ext/dbx config.m4 dbx.c dbx.dsp dbx_sqlite.c dbx_sqlite.h /ext/dbx/tests 002.phpt 003.phpt 004.phpt 006.phpt dbx_test.p

2003-07-09 Thread Marc Boeren

mboeren Wed Jul  9 12:31:40 2003 EDT

  Added files: 
/php-src/ext/dbxdbx_sqlite.c dbx_sqlite.h 

  Modified files:  
/php-src/ext/dbxconfig.m4 dbx.c dbx.dsp 
/php-src/ext/dbx/tests  002.phpt 003.phpt 004.phpt 006.phpt 
dbx_test.p 
  Log:
  Add SQLite support to DBX (Marc).
  @Add SQLite support to DBX (Marc).
  
  Index: php-src/ext/dbx/config.m4
diff -u php-src/ext/dbx/config.m4:1.3 php-src/ext/dbx/config.m4:1.4
--- php-src/ext/dbx/config.m4:1.3   Tue Mar 12 11:14:37 2002
+++ php-src/ext/dbx/config.m4   Wed Jul  9 12:31:40 2003
@@ -1,10 +1,10 @@
 dnl
-dnl $Id: config.m4,v 1.3 2002/03/12 16:14:37 sas Exp $
+dnl $Id: config.m4,v 1.4 2003/07/09 16:31:40 mboeren Exp $
 dnl
 
 PHP_ARG_ENABLE(dbx,whether to enable dbx support,
 [  --enable-dbxEnable dbx])
 
 if test $PHP_DBX != no; then
-  PHP_NEW_EXTENSION(dbx, dbx.c dbx_mysql.c dbx_odbc.c dbx_pgsql.c dbx_mssql.c 
dbx_fbsql.c dbx_oci8.c dbx_sybasect.c, $ext_shared)
+  PHP_NEW_EXTENSION(dbx, dbx.c dbx_mysql.c dbx_odbc.c dbx_pgsql.c dbx_mssql.c 
dbx_fbsql.c dbx_oci8.c dbx_sybasect.c dbx_sqlite.c, $ext_shared)
 fi
Index: php-src/ext/dbx/dbx.c
diff -u php-src/ext/dbx/dbx.c:1.50 php-src/ext/dbx/dbx.c:1.51
--- php-src/ext/dbx/dbx.c:1.50  Sun Jun 15 11:29:46 2003
+++ php-src/ext/dbx/dbx.c   Wed Jul  9 12:31:40 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: dbx.c,v 1.50 2003/06/15 15:29:46 andrey Exp $ */
+/* $Id: dbx.c,v 1.51 2003/07/09 16:31:40 mboeren Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -40,6 +40,7 @@
 #define DBX_FBSQL 5
 #define DBX_OCI8 6
 #define DBX_SYBASECT 7
+#define DBX_SQLITE 8
 /* includes for supported databases */
 #include dbx.h
 #include dbx_mysql.h
@@ -49,6 +50,7 @@
 #include dbx_fbsql.h
 #include dbx_oci8.h
 #include dbx_sybasect.h
+#include dbx_sqlite.h
 
 /* support routines */
 int module_exists(char *module_name)
@@ -69,6 +71,7 @@
case DBX_FBSQL: return module_exists(fbsql);
case DBX_OCI8: return module_exists(oci8);
case DBX_SYBASECT: return module_exists(sybase_ct);
+   case DBX_SQLITE: return module_exists(sqlite);
}
return 0;
 }
@@ -82,6 +85,7 @@
if (!strcmp(fbsql, module_name)) return DBX_FBSQL;
if (!strcmp(oci8, module_name)) return DBX_OCI8;
if (!strcmp(sybase_ct, module_name)) return DBX_SYBASECT;
+   if (!strcmp(sqlite, module_name)) return DBX_SQLITE;
return DBX_UNKNOWN;
 }
 
@@ -186,6 +190,7 @@
REGISTER_LONG_CONSTANT(DBX_FBSQL, DBX_FBSQL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(DBX_OCI8, DBX_OCI8, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(DBX_SYBASECT, DBX_SYBASECT, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(DBX_SQLITE, DBX_SQLITE, CONST_CS | CONST_PERSISTENT);
 
REGISTER_LONG_CONSTANT(DBX_PERSISTENT, DBX_PERSISTENT, CONST_CS | 
CONST_PERSISTENT);
 
@@ -226,8 +231,8 @@
 {
php_info_print_table_start();
php_info_print_table_row(2, dbx support, enabled);
-   php_info_print_table_row(2, dbx version, 1.0.0);
-   php_info_print_table_row(2, supported databases, 
MySQL\nODBC\nPostgreSQL\nMicrosoft SQL Server\nFrontBase\nOracle 8 
(oci8)\nSybase-CT);
+   php_info_print_table_row(2, dbx version, 1.0.1);
+   php_info_print_table_row(2, supported databases, 
MySQL\nODBC\nPostgreSQL\nMicrosoft SQL Server\nFrontBase\nOracle 8 
(oci8)\nSybase-CT\nSQLite);
php_info_print_table_end();
 DISPLAY_INI_ENTRIES();
 }
@@ -725,6 +730,7 @@
case DBX_FBSQL: return dbx_fbsql_connect(rv, host, db, username, 
password, INTERNAL_FUNCTION_PARAM_PASSTHRU);
case DBX_OCI8:  return dbx_oci8_connect(rv, host, db, username, 
password, INTERNAL_FUNCTION_PARAM_PASSTHRU);
case DBX_SYBASECT: return dbx_sybasect_connect(rv, host, db, username, 
password, INTERNAL_FUNCTION_PARAM_PASSTHRU);
+   case DBX_SQLITE: return dbx_sqlite_connect(rv, host, db, username, 
password, INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
php_error_docref(NULL TSRMLS_CC, E_WARNING, not supported in this module);
return 0;
@@ -741,6 +747,7 @@
case DBX_FBSQL: return dbx_fbsql_pconnect(rv, host, db, username, 
password, INTERNAL_FUNCTION_PARAM_PASSTHRU);
case DBX_OCI8:  return dbx_oci8_pconnect(rv, host, db, username, 
password, INTERNAL_FUNCTION_PARAM_PASSTHRU);
case DBX_SYBASECT: return dbx_sybasect_pconnect(rv, host, db, 
username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU);
+   case DBX_SQLITE: return dbx_sqlite_pconnect(rv, host, db, username, 
password, INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
php_error_docref(NULL TSRMLS_CC, E_WARNING, not supported in this module);
return 0;
@@ -757,6 +764,7 @@
case

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard browscap.c

2003-07-09 Thread Jay Smith

jay Wed Jul  9 14:51:19 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard   browscap.c 
  Log:
  MFH: - fixed bug #24548 (get_browser() does not return platform)
  
  Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.60.2.13 
php-src/ext/standard/browscap.c:1.60.2.14
--- php-src/ext/standard/browscap.c:1.60.2.13   Mon Jun 30 17:10:33 2003
+++ php-src/ext/standard/browscap.c Wed Jul  9 14:51:18 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: browscap.c,v 1.60.2.13 2003/06/30 21:10:33 shane Exp $ */
+/* $Id: browscap.c,v 1.60.2.14 2003/07/09 18:51:18 jay Exp $ */
 
 #include php.h
 #include php_regex.h
@@ -34,9 +34,9 @@
 
 static void browscap_entry_dtor(zval *pvalue)
 {
-   if (Z_TYPE_P(pvalue) == IS_OBJECT) {
-   zend_hash_destroy(Z_OBJPROP_P(pvalue));
-   free(Z_OBJPROP_P(pvalue));
+   if (Z_TYPE_P(pvalue) == IS_ARRAY) {
+   zend_hash_destroy(Z_ARRVAL_P(pvalue));
+   free(Z_ARRVAL_P(pvalue));
}
 }
 
@@ -47,19 +47,8 @@
register int i, j;
char *t;
 
-   for (i=0; iZ_STRLEN_P(pattern); i++) {
-   if (Z_STRVAL_P(pattern)[i]=='*' || Z_STRVAL_P(pattern)[i]=='?' || 
Z_STRVAL_P(pattern)[i]=='.') {
-   break;
-   }
-   }
-
-   if (i==Z_STRLEN_P(pattern)) { /* no wildcards */
-   Z_STRVAL_P(pattern) = zend_strndup(Z_STRVAL_P(pattern), 
Z_STRLEN_P(pattern));
-   return;
-   }
-
t = (char *) malloc(Z_STRLEN_P(pattern)*2 + 1);
-   
+
for (i=0, j=0; iZ_STRLEN_P(pattern); i++, j++) {
switch (Z_STRVAL_P(pattern)[i]) {
case '?':
@@ -78,11 +67,11 @@
break;
}
}
-   
+
if (j  (t[j-1] == '.')) {
t[j++] = '*';
}
-   
+
t[j]=0;
Z_STRVAL_P(pattern) = t;
Z_STRLEN_P(pattern) = j;
@@ -108,35 +97,42 @@
Z_STRVAL_P(new_property) = 
Z_STRLEN_P(arg2)?zend_strndup(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2)):;
Z_STRLEN_P(new_property) = Z_STRLEN_P(arg2);
Z_TYPE_P(new_property) = IS_STRING;
-   
+
new_key = zend_strndup(Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1));
zend_str_tolower(new_key, Z_STRLEN_P(arg1));
-   zend_hash_update(Z_OBJPROP_P(current_section), 
new_key, Z_STRLEN_P(arg1)+1, new_property, sizeof(zval *), NULL);
+   zend_hash_update(Z_ARRVAL_P(current_section), new_key, 
Z_STRLEN_P(arg1)+1, new_property, sizeof(zval *), NULL);
free(new_key);
}
break;
case ZEND_INI_PARSER_SECTION: {
zval *processed;
+   zval *unprocessed;
HashTable *section_properties;
-   TSRMLS_FETCH();
 
/*printf('%s' 
(%d)\n,$1.value.str.val,$1.value.str.len+1);*/
current_section = (zval *) malloc(sizeof(zval));
INIT_PZVAL(current_section);
processed = (zval *) malloc(sizeof(zval));
INIT_PZVAL(processed);
+   unprocessed = (zval *) malloc(sizeof(zval));
+   INIT_PZVAL(unprocessed);
 
section_properties = (HashTable *) 
malloc(sizeof(HashTable));
-   _object_and_properties_init(current_section, 
ZEND_STANDARD_CLASS_DEF_PTR, section_properties ZEND_FILE_LINE_CC TSRMLS_CC);
-  
 
zend_hash_init(section_properties, 0, NULL, 
(dtor_func_t) browscap_entry_dtor, 1);
-   zend_hash_update(browser_hash, Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1)+1, (void *) current_section, sizeof(zval *), NULL);  
+   current_section-value.ht = section_properties;
+   zend_hash_update(browser_hash, Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1)+1, (void *) current_section, sizeof(zval *), NULL);
 
Z_STRVAL_P(processed) = Z_STRVAL_P(arg1);
Z_STRLEN_P(processed) = Z_STRLEN_P(arg1);
Z_TYPE_P(processed) = IS_STRING;
+   Z_STRVAL_P(unprocessed) = Z_STRVAL_P(arg1);
+   Z_STRLEN_P(unprocessed) = Z_STRLEN_P(arg1);
+   Z_TYPE_P(unprocessed)

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

2003-07-09 Thread Frank M. Kromann

fmk Wed Jul  9 18:36:18 2003 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Adding missing MSSQL Server ini settings
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.195 php-src/php.ini-dist:1.196
--- php-src/php.ini-dist:1.195  Mon Jun 30 16:36:38 2003
+++ php-src/php.ini-distWed Jul  9 18:36:18 2003
@@ -961,6 +961,12 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
+; Connec timeout
+;mssql.connect_timeout = 5
+
+; Query timeout
+;mssql.timeout = 60
+
 ; Valid range 0 - 2147483647.  Default = 4096.
 ;mssql.textlimit = 4096
 
@@ -969,6 +975,11 @@
 
 ; Limits the number of records in each batch.  0 = all records in one batch.
 ;mssql.batchsize = 0
+
+; Specify how datetime and datetim4 columns are returned
+; On = Returns data converted to SQL server settings
+; Off = Returns values as -MM-DD hh:mm:ss
+;mssql.datetimeconvert = On
 
 ; Use NT authentication when connecting to the server
 mssql.secure_connection = Off
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.140 php-src/php.ini-recommended:1.141
--- php-src/php.ini-recommended:1.140   Mon Jun 30 16:36:38 2003
+++ php-src/php.ini-recommended Wed Jul  9 18:36:18 2003
@@ -970,6 +970,12 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
+; Connec timeout
+;mssql.connect_timeout = 5
+
+; Query timeout
+;mssql.timeout = 60
+
 ; Valid range 0 - 2147483647.  Default = 4096.
 ;mssql.textlimit = 4096
 
@@ -978,6 +984,11 @@
 
 ; Limits the number of records in each batch.  0 = all records in one batch.
 ;mssql.batchsize = 0
+
+; Specify how datetime and datetim4 columns are returned
+; On = Returns data converted to SQL server settings
+; Off = Returns values as -MM-DD hh:mm:ss
+;mssql.datetimeconvert = On
 
 ; Use NT authentication when connecting to the server
 mssql.secure_connection = Off



-- 
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) / php.ini-dist php.ini-recommended

2003-07-09 Thread Frank M. Kromann

fmk Wed Jul  9 18:36:28 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Adding missing MSSQL Server ini settings
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.171.2.15 php-src/php.ini-dist:1.171.2.16
--- php-src/php.ini-dist:1.171.2.15 Wed Jun 18 11:19:28 2003
+++ php-src/php.ini-distWed Jul  9 18:36:28 2003
@@ -931,6 +931,12 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
+; connec timeout
+;mssql.connect_timeout = 5
+
+; query timeout
+;mssql.timeout = 60
+
 ; Valid range 0 - 2147483647.  Default = 4096.
 ;mssql.textlimit = 4096
 
@@ -939,6 +945,11 @@
 
 ; Limits the number of records in each batch.  0 = all records in one batch.
 ;mssql.batchsize = 0
+
+; Specify how datetime and datetim4 columns are returned
+; On = Returns data converted to SQL server settings
+; Off = Returns values as -MM-DD hh:mm:ss
+;mssql.datetimeconvert = On
 
 ; Use NT authentication when connecting to the server
 mssql.secure_connection = Off
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.119.2.13 php-src/php.ini-recommended:1.119.2.14
--- php-src/php.ini-recommended:1.119.2.13  Wed Jun 18 11:19:28 2003
+++ php-src/php.ini-recommended Wed Jul  9 18:36:28 2003
@@ -929,6 +929,12 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
+; Connec timeout
+;mssql.connect_timeout = 5
+
+; Query timeout
+;mssql.timeout = 60
+
 ; Valid range 0 - 2147483647.  Default = 4096.
 ;mssql.textlimit = 4096
 
@@ -937,6 +943,11 @@
 
 ; Limits the number of records in each batch.  0 = all records in one batch.
 ;mssql.batchsize = 0
+
+; Specify how datetime and datetim4 columns are returned
+; On = Returns data converted to SQL server settings
+; Off = Returns values as -MM-DD hh:mm:ss
+;mssql.datetimeconvert = On
 
 ; Use NT authentication when connecting to the server
 mssql.secure_connection = Off



-- 
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

2003-07-09 Thread Frank M. Kromann

fmk Wed Jul  9 18:38:46 2003 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  oops. fix spelling
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.196 php-src/php.ini-dist:1.197
--- php-src/php.ini-dist:1.196  Wed Jul  9 18:36:18 2003
+++ php-src/php.ini-distWed Jul  9 18:38:46 2003
@@ -961,7 +961,7 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
-; Connec timeout
+; Connect timeout
 ;mssql.connect_timeout = 5
 
 ; Query timeout
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.141 php-src/php.ini-recommended:1.142
--- php-src/php.ini-recommended:1.141   Wed Jul  9 18:36:18 2003
+++ php-src/php.ini-recommended Wed Jul  9 18:38:46 2003
@@ -970,7 +970,7 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
-; Connec timeout
+; Connect timeout
 ;mssql.connect_timeout = 5
 
 ; Query timeout



-- 
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

2003-07-09 Thread Pierre-Alain Joye

pajoye  Wed Jul  9 20:09:24 2003 EDT

  Modified files:  
/php-src/ext/gd/libgd   gd.c 
  Log:
  - wrong patch applied for #23792, fixed
  
  
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.59 php-src/ext/gd/libgd/gd.c:1.60
--- php-src/ext/gd/libgd/gd.c:1.59  Wed Jul  9 06:36:07 2003
+++ php-src/ext/gd/libgd/gd.c   Wed Jul  9 20:09:23 2003
@@ -2541,7 +2541,7 @@
 gdImagePtr gdImageRotate90 (gdImagePtr src)
 {
int uY, uX;
-   int c;
+   int c,r,g,b,a;
gdImagePtr dst;
typedef int (*FuncPtr)(gdImagePtr, int, int);
FuncPtr f;
@@ -2551,6 +2551,7 @@
} else {
f = gdImageGetPixel;
}
+   dst = gdImageCreateTrueColor(src-sy, src-sx);
 
if (dst != NULL) {
gdImagePaletteCopy (dst, src);
@@ -2558,6 +2559,13 @@
for (uY = 0; uYsrc-sy; uY++) {
for (uX = 0; uXsrc-sx; uX++) {
c = f (src, uX, uY);
+   if (!src-trueColor) {
+   r = gdImageRed(src,c);
+   g = gdImageGreen(src,c);
+   b = gdImageBlue(src,c);
+   a = gdImageAlpha(src,c);
+   c = gdTrueColorAlpha(r, g, b, a);
+   }
gdImageSetPixel(dst, uY, (dst-sy - uX - 1), c);
}
}
@@ -2570,18 +2578,17 @@
 gdImagePtr gdImageRotate180 (gdImagePtr src)
 {
int uY, uX;
-   int c;
+   int c,r,g,b,a;
gdImagePtr dst;
typedef int (*FuncPtr)(gdImagePtr, int, int);
FuncPtr f;
 
if (src-trueColor) {
-   dst = gdImageCreateTrueColor ( src-sx,src-sy);
f = gdImageGetTrueColorPixel;
} else {
-   dst = gdImageCreate (src-sx, src-sy);
f = gdImageGetPixel;
}
+   dst = gdImageCreateTrueColor(src-sx, src-sy);
 
if (dst != NULL) {
gdImagePaletteCopy (dst, src);
@@ -2589,6 +2596,13 @@
for (uY = 0; uYsrc-sy; uY++) {
for (uX = 0; uXsrc-sx; uX++) {
c = f (src, uX, uY);
+   if (!src-trueColor) {
+   r = gdImageRed(src,c);
+   g = gdImageGreen(src,c);
+   b = gdImageBlue(src,c);
+   a = gdImageAlpha(src,c);
+   c = gdTrueColorAlpha(r, g, b, a);
+   }
gdImageSetPixel(dst, (dst-sx - uX - 1), (dst-sy - uY 
- 1), c);
}
}
@@ -2601,18 +2615,17 @@
 gdImagePtr gdImageRotate270 ( gdImagePtr src )
 {
int uY, uX;
-   int c;
+   int c,r,g,b,a;
gdImagePtr dst;
typedef int (*FuncPtr)(gdImagePtr, int, int);
FuncPtr f;
 
if (src-trueColor) {
-   dst = gdImageCreateTrueColor (src-sy, src-sx);
f = gdImageGetTrueColorPixel;
} else {
-   dst = gdImageCreate (src-sy, src-sx);
f = gdImageGetPixel;
}
+   dst = gdImageCreateTrueColor (src-sy, src-sx);
 
if (dst != NULL) {
gdImagePaletteCopy (dst, src);
@@ -2620,6 +2633,13 @@
for (uY = 0; uYsrc-sy; uY++) {
for (uX = 0; uXsrc-sx; uX++) {
c = f (src, uX, uY);
+   if (!src-trueColor) {
+   r = gdImageRed(src,c);
+   g = gdImageGreen(src,c);
+   b = gdImageBlue(src,c);
+   a = gdImageAlpha(src,c);
+   c = gdTrueColorAlpha(r, g, b, a);
+   }
gdImageSetPixel(dst, (dst-sx - uY - 1), uX, c);
}
}
@@ -2648,13 +2668,12 @@
 
/* 1st shear */
if (src-trueColor) {
-   dst1 = gdImageCreateTrueColor (newx, newy);
f = gdImageGetTrueColorPixel;
} else {
-   dst1 = gdImageCreate (newx, newy);
f = gdImageGetPixel;
}
 
+   dst1 = gdImageCreateTrueColor(newx, newy);
/*** Perform 1st shear (horizontal) **/
if (dst1 == NULL) {
return NULL;
@@ -2761,15 +2780,9 @@
return NULL;
}
 
-if (!gdImageTrueColor(src)  clrBack=gdImageColorsTotal(src)) {
-return NULL;
-}
-
-   clrBackR = gdImageRed(src, clrBack);
-   clrBackG = gdImageGreen(src, clrBack);
-

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

2003-07-09 Thread Pierre-Alain Joye

pajoye  Wed Jul  9 20:11:11 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/libgd   gd.c 
  Log:
  - MFH
  
  
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.24.2.18 php-src/ext/gd/libgd/gd.c:1.24.2.19
--- php-src/ext/gd/libgd/gd.c:1.24.2.18 Wed Jul  9 06:43:01 2003
+++ php-src/ext/gd/libgd/gd.c   Wed Jul  9 20:11:11 2003
@@ -2541,7 +2541,7 @@
 gdImagePtr gdImageRotate90 (gdImagePtr src)
 {
int uY, uX;
-   int c;
+   int c, r,g,b,a;
gdImagePtr dst;
typedef int (*FuncPtr)(gdImagePtr, int, int);
FuncPtr f;
@@ -2552,12 +2552,20 @@
f = gdImageGetPixel;
}
dst = gdImageCreateTrueColor(src-sy, src-sx);
+
if (dst != NULL) {
gdImagePaletteCopy (dst, src);

for (uY = 0; uYsrc-sy; uY++) {
for (uX = 0; uXsrc-sx; uX++) {
c = f (src, uX, uY);
+   if (!src-trueColor) {
+   r = gdImageRed(src,c);
+   g = gdImageGreen(src,c);
+   b = gdImageBlue(src,c);
+   a = gdImageAlpha(src,c);
+   c = gdTrueColorAlpha(r, g, b, a);
+   }
gdImageSetPixel(dst, uY, (dst-sy - uX - 1), c);
}
}
@@ -2570,7 +2578,7 @@
 gdImagePtr gdImageRotate180 (gdImagePtr src)
 {
int uY, uX;
-   int c;
+   int c,r,g,b,a;
gdImagePtr dst;
typedef int (*FuncPtr)(gdImagePtr, int, int);
FuncPtr f;
@@ -2581,12 +2589,20 @@
f = gdImageGetPixel;
}
dst = gdImageCreateTrueColor(src-sx, src-sy);
+
if (dst != NULL) {
gdImagePaletteCopy (dst, src);

for (uY = 0; uYsrc-sy; uY++) {
for (uX = 0; uXsrc-sx; uX++) {
c = f (src, uX, uY);
+   if (!src-trueColor) {
+   r = gdImageRed(src,c);
+   g = gdImageGreen(src,c);
+   b = gdImageBlue(src,c);
+   a = gdImageAlpha(src,c);
+   c = gdTrueColorAlpha(r, g, b, a);
+   }
gdImageSetPixel(dst, (dst-sx - uX - 1), (dst-sy - uY 
- 1), c);
}
}
@@ -2599,7 +2615,7 @@
 gdImagePtr gdImageRotate270 ( gdImagePtr src )
 {
int uY, uX;
-   int c;
+   int c,r,g,b,a;
gdImagePtr dst;
typedef int (*FuncPtr)(gdImagePtr, int, int);
FuncPtr f;
@@ -2617,6 +2633,13 @@
for (uY = 0; uYsrc-sy; uY++) {
for (uX = 0; uXsrc-sx; uX++) {
c = f (src, uX, uY);
+   if (!src-trueColor) {
+   r = gdImageRed(src,c);
+   g = gdImageGreen(src,c);
+   b = gdImageBlue(src,c);
+   a = gdImageAlpha(src,c);
+   c = gdTrueColorAlpha(r, g, b, a);
+   }
gdImageSetPixel(dst, (dst-sx - uY - 1), uX, c);
}
}



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

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

2003-07-09 Thread Jani Taskinen

sniper  Wed Jul  9 20:17:09 2003 EDT

  Modified files:  
/php-src/ext/interbase  interbase.c 
  Log:
  - Fixed bug #11924 (ibase_query() and ibase_execute() mangled passed 
parameter variables)
  
  
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.111 php-src/ext/interbase/interbase.c:1.112
--- php-src/ext/interbase/interbase.c:1.111 Mon Jun 16 06:41:42 2003
+++ php-src/ext/interbase/interbase.c   Wed Jul  9 20:17:09 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: interbase.c,v 1.111 2003/06/16 10:41:42 daniela Exp $ */
+/* $Id: interbase.c,v 1.112 2003/07/10 00:17:09 sniper Exp $ */
 
 
 /* TODO: Arrays, roles?
@@ -628,7 +628,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.111 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.112 $);
 #ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, Dynamic Module, yes);
 #endif
@@ -1432,6 +1432,10 @@
int rv = FAILURE;

IB_RESULT = NULL;
+
+   if (argc  0  args != NULL) {
+   SEPARATE_ZVAL(args);
+   }

/* allocate sqlda and output buffers */
if (ib_query-out_sqlda) { /* output variables in select, select for update */



-- 
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/interbase interbase.c

2003-07-09 Thread Jani Taskinen

sniper  Wed Jul  9 20:17:40 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/interbase  interbase.c 
  Log:
  MFH: Fixed bug #11924 (ibase_query() and ibase_execute() mangled passed parameters)
  
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.91.2.10 
php-src/ext/interbase/interbase.c:1.91.2.11
--- php-src/ext/interbase/interbase.c:1.91.2.10 Mon Jun 16 06:47:35 2003
+++ php-src/ext/interbase/interbase.c   Wed Jul  9 20:17:40 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: interbase.c,v 1.91.2.10 2003/06/16 10:47:35 daniela Exp $ */
+/* $Id: interbase.c,v 1.91.2.11 2003/07/10 00:17:40 sniper Exp $ */
   
 
 /* TODO: Arrays, roles?
@@ -628,7 +628,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.91.2.10 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.91.2.11 $);
 #ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, Dynamic Module, yes);
 #endif
@@ -1434,6 +1434,10 @@
TSRMLS_FETCH();

IB_RESULT = NULL;
+
+   if (argc  0  args != NULL) {
+   SEPARATE_ZVAL(args);
+   }

/* allocate sqlda and output buffers */
if (ib_query-out_sqlda) { /* output variables in select, select for update */



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

[PHP-CVS] cvs: php-src /ext/interbase php_interbase.h

2003-07-09 Thread Jani Taskinen

sniper  Wed Jul  9 21:17:34 2003 EDT

  Modified files:  
/php-src/ext/interbase  php_interbase.h 
  Log:
  Fix crashes in certain situations (whenever there is an error, basically..)
  
Index: php-src/ext/interbase/php_interbase.h
diff -u php-src/ext/interbase/php_interbase.h:1.32 
php-src/ext/interbase/php_interbase.h:1.33
--- php-src/ext/interbase/php_interbase.h:1.32  Sat Jun 14 12:38:10 2003
+++ php-src/ext/interbase/php_interbase.h   Wed Jul  9 21:17:34 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_interbase.h,v 1.32 2003/06/14 16:38:10 daniela Exp $ */
+/* $Id: php_interbase.h,v 1.33 2003/07/10 01:17:34 sniper Exp $ */
 
 #ifndef PHP_INTERBASE_H
 #define PHP_INTERBASE_H
@@ -90,7 +90,7 @@
 #define IBASE_BLOB_SEG 4096
 
 ZEND_BEGIN_MODULE_GLOBALS(ibase)
-   ISC_STATUS status[20];
+   ISC_STATUS *status;
long default_link;
long num_links, num_persistent;
long max_links, max_persistent;



-- 
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/interbase php_interbase.h

2003-07-09 Thread Jani Taskinen

sniper  Wed Jul  9 21:17:46 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/interbase  php_interbase.h 
  Log:
  MFH: Fix crash bug
  
Index: php-src/ext/interbase/php_interbase.h
diff -u php-src/ext/interbase/php_interbase.h:1.28.2.3 
php-src/ext/interbase/php_interbase.h:1.28.2.4
--- php-src/ext/interbase/php_interbase.h:1.28.2.3  Sat Jun 14 13:46:33 2003
+++ php-src/ext/interbase/php_interbase.h   Wed Jul  9 21:17:46 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_interbase.h,v 1.28.2.3 2003/06/14 17:46:33 daniela Exp $ */
+/* $Id: php_interbase.h,v 1.28.2.4 2003/07/10 01:17:46 sniper Exp $ */
 
 #ifndef PHP_INTERBASE_H
 #define PHP_INTERBASE_H
@@ -91,7 +91,7 @@
 #define IBASE_BLOB_SEG 4096
 
 ZEND_BEGIN_MODULE_GLOBALS(ibase)
-   ISC_STATUS status[20];
+   ISC_STATUS *status;
long default_link;
long num_links, num_persistent;
long max_links, max_persistent;



-- 
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/ming ming.c

2003-07-09 Thread Frank M. Kromann

fmk Thu Jul 10 01:07:45 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/ming   ming.c 
  Log:
  Adding missing compression paramters to output functions
  
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.42.2.3 php-src/ext/ming/ming.c:1.42.2.4
--- php-src/ext/ming/ming.c:1.42.2.3Tue Jul  1 22:04:21 2003
+++ php-src/ext/ming/ming.c Thu Jul 10 01:07:45 2003
@@ -900,7 +900,7 @@
 
convert_to_object_ex(zaction);
convert_to_long_ex(flags);
-   action = (SWFBlock)getAction(*zaction TSRMLS_CC);
+   action = getAction(*zaction TSRMLS_CC);
SWFDisplayItem_addAction(item, action, Z_LVAL_PP(flags));
 }
 /* }}} */
@@ -1087,7 +1087,7 @@
font = loadSWFFontFromFile(file);
php_stream_close(stream);
} else {
-   font = newSWFBrowserFont(Z_STRVAL_PP(zfile));
+   font = (SWFFont)newSWFBrowserFont(Z_STRVAL_PP(zfile));
}
 
ret = zend_list_insert(font, le_swffontp);
@@ -1434,9 +1434,24 @@
 
 PHP_FUNCTION(swfmovie_output)
 {
-  SWFMovie movie = getMovie(getThis() TSRMLS_CC);
+   zval **zlimit = NULL;
+   int limit = -1;
+   SWFMovie movie = getMovie(getThis() TSRMLS_CC);
+
+   switch (ZEND_NUM_ARGS()) {
+   case 1:
+   if (zend_get_parameters_ex(1, zlimit) == FAILURE)
+   WRONG_PARAM_COUNT;
+   convert_to_long_ex(zlimit);
+   limit = Z_LVAL_PP(zlimit);
+   if((limit0)||(limit9)) {
+   php_error(E_WARNING,compression level must be within 0..9);
+   RETURN_FALSE;
+   }
+   break;
+   }
 
-  RETURN_LONG(SWFMovie_output(movie, phpByteOutputMethod, NULL));
+   RETURN_LONG(SWFMovie_output(movie, phpByteOutputMethod, NULL, limit));
 }
 /* }}} */
 
@@ -1452,14 +1467,32 @@
 PHP_FUNCTION(swfmovie_saveToFile)
 {
zval **x;
+   zval **zlimit = NULL;
+   int limit = -1;
SWFMovie movie = getMovie(getThis() TSRMLS_CC);
php_stream *what;
 
-   if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, x) == FAILURE) {
+   switch (ZEND_NUM_ARGS()) {
+   case 1:
+   if (zend_get_parameters_ex(1, x) == FAILURE)
+   WRONG_PARAM_COUNT;
+   break;
+   case 2:
+   if (zend_get_parameters_ex(2, x, zlimit) == FAILURE)
+   WRONG_PARAM_COUNT;
+   convert_to_long_ex(zlimit);
+   limit = Z_LVAL_PP(zlimit);
+   if((limit0)||(limit9)) {
+   php_error(E_WARNING,compression level must be within 0..9);
+   RETURN_FALSE;
+   }
+   break;
+   default:
WRONG_PARAM_COUNT;
}
-   php_stream_from_zval(what, x);
-   RETURN_LONG(SWFMovie_output(movie, phpStreamOutputMethod, what));
+
+   ZEND_FETCH_RESOURCE(what, php_stream *, x, 
-1,File-Handle,php_file_le_stream());
+   RETURN_LONG(SWFMovie_output(movie, phpStreamOutputMethod, what, limit));
 }
 /* }}} */
 
@@ -1467,17 +1500,33 @@
 */
 PHP_FUNCTION(swfmovie_save)
 {
-   zval **x;
+   zval **x, **zlimit = NULL;
+   int limit = -1;
long retval;
php_stream *stream;
 
-   if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, x) == FAILURE) {
+   switch (ZEND_NUM_ARGS()) {
+   case 1:
+   if (zend_get_parameters_ex(1, x) == FAILURE)
+   WRONG_PARAM_COUNT;
+   break;
+   case 2:
+   if (zend_get_parameters_ex(2, x, zlimit) == FAILURE)
+   WRONG_PARAM_COUNT;
+   convert_to_long_ex(zlimit);
+   limit = Z_LVAL_PP(zlimit);
+   if((limit0)||(limit9)) {
+   php_error(E_WARNING,compression level must be within 0..9);
+   RETURN_FALSE;
+   }
+   break;
+   default:
WRONG_PARAM_COUNT;
}
-
+ 
if (Z_TYPE_PP(x) == IS_RESOURCE) {
-   php_stream_from_zval(stream, x);
-   RETURN_LONG(SWFMovie_output(getMovie(getThis() TSRMLS_CC), 
phpStreamOutputMethod, stream));
+   ZEND_FETCH_RESOURCE(stream, php_stream *, x, 
-1,File-Handle,php_file_le_stream());
+   RETURN_LONG(SWFMovie_output(getMovie(getThis() TSRMLS_CC), 
phpStreamOutputMethod, stream, limit));
}
 
convert_to_string_ex(x);
@@ -1487,7 +1536,7 @@
RETURN_FALSE;
}

-   retval = SWFMovie_output(getMovie(getThis() TSRMLS_CC), 
phpStreamOutputMethod, (void *)stream);
+   retval = SWFMovie_output(getMovie(getThis() TSRMLS_CC), 
phpStreamOutputMethod, (void *)stream, limit);
php_stream_close(stream);
RETURN_LONG(retval);
 }
@@ -1561,7 +1610,7 @@
 PHP_FUNCTION(swfmovie_streamMp3)
 {
zval **zfile;
-   SWFSound

Re[2]: [PHP-CVS] cvs: spl / spl_foreach.c

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

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

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

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

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

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

[PHP-CVS] cvs: php-src / EXTENSIONS

[PHP-CVS] cvs: php-src /ext/dbx config.m4 dbx.c dbx.dsp dbx_sqlite.c dbx_sqlite.h /ext/dbx/tests 002.phpt 003.phpt 004.phpt 006.phpt dbx_test.p

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard browscap.c

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[PHP-CVS] cvs: php-src(PHP_4_3) / php.ini-dist php.ini-recommended

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

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

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

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/interbase interbase.c

[PHP-CVS] cvs: php-src /ext/interbase php_interbase.h

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/interbase php_interbase.h

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/ming ming.c

20 matches

Site Navigation

Mail list logo

Footer information