Re: [PHP-CVS] cvs: php4 /ext/gd gd.c
On Fri, 11 Oct 2002 05:53:18 -0700 (PDT) Rasmus Lerdorf [EMAIL PROTECTED] wrote: I don't think we can do that. Like someone said, they have to use GIF in order to generate images for a mobile device. That means they either need to use GD-1.3 or a hacked up later version. Is only the compression system licenced ? Anyway, that is not too difficult to add GIF support to the bundled (maybe not in the upcoming release), regardless to the licence, which I did not take about it as far as I do not use gif anymore. pa -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/gd/libgd gd.c gd_gd2.c gdft.c
Hello, On Tue, 12 Nov 2002 13:12:59 - Marcus Boerger [EMAIL PROTECTED] wrote: helly Tue Nov 12 08:12:59 2002 EDT Modified files: /php4/ext/gd/libgdgd.c gd_gd2.c gdft.c Log: fix warnings Thx to fix warnings :-) While you are on, here are some warns I got on gd_png.c (-W -g3): php4/ext/gd/libgd/gd_png.c: In function `gdImageCreateFromPngCtx': php4/ext/gd/libgd/gd_png.c:126: warning: variable `image_data' might be clobbered by `longjmp' or `vfork' php4/ext/gd/libgd/gd_png.c:127: warning: variable `row_pointers' might be clobbered by `longjmp' or `vfork' php4/ext/gd/libgd/gd_png.c:129: warning: variable `open' might be clobbered by `longjmp' or `vfork' php4/ext/gd/libgd/gd_png.c: In function `gdImagePngCtx': php4/ext/gd/libgd/gd_png.c:447: warning: variable `bit_depth' might be clobbered by `longjmp' or `vfork' php4/ext/gd/libgd/gd_png.c:450: warning: variable `colors' might be clobbered by `longjmp' or `vfork' hth pa -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd gd.c
pajoye Tue Dec 3 21:37:21 2002 EDT Modified files: /php4/ext/gdgd.c Log: Fix imagegd crashes when used with truecolor image (from jpeg,png, or imagecreatetruecolor) may we add parameters to imagegd to let user specify the palette size and dither (set to 256 and true) ? Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.229 php4/ext/gd/gd.c:1.230 --- php4/ext/gd/gd.c:1.229 Thu Nov 28 17:48:20 2002 +++ php4/ext/gd/gd.cTue Dec 3 21:37:21 2002 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.229 2002/11/28 22:48:20 helly Exp $ */ +/* $Id: gd.c,v 1.230 2002/12/04 02:37:21 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1588,6 +1588,12 @@ if(gdImageRed(im, i) == 0) break; } (*func_p)(im, i, fp); + break; + case PHP_GDIMG_TYPE_GD: + if(im-trueColor){ + gdImageTrueColorToPalette(im,1,255); + } + (*func_p)(im, fp); break; default: (*func_p)(im, fp); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd gd.c
pajoye Tue Dec 3 21:48:23 2002 EDT Modified files: /php4/ext/gdgd.c Log: Fix imagegd stdoutput Typo 256 colors Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.230 php4/ext/gd/gd.c:1.231 --- php4/ext/gd/gd.c:1.230 Tue Dec 3 21:37:21 2002 +++ php4/ext/gd/gd.cTue Dec 3 21:48:23 2002 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.230 2002/12/04 02:37:21 pajoye Exp $ */ +/* $Id: gd.c,v 1.231 2002/12/04 02:48:23 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1591,7 +1591,7 @@ break; case PHP_GDIMG_TYPE_GD: if(im-trueColor){ - gdImageTrueColorToPalette(im,1,255); + gdImageTrueColorToPalette(im,1,256); } (*func_p)(im, fp); break; @@ -1626,6 +1626,12 @@ } (*func_p)(im, q, tmp); break; +case PHP_GDIMG_TYPE_GD: +if(im-trueColor){ + gdImageTrueColorToPalette(im,1,256); + } +(*func_p)(im, tmp); +break; default: (*func_p)(im, tmp); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd gd.c php_gd.h
pajoye Thu Dec 5 21:16:07 2002 EDT Modified files: /php4/ext/gdgd.c php_gd.h Log: Add imageistruecolor Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.234 php4/ext/gd/gd.c:1.235 --- php4/ext/gd/gd.c:1.234 Wed Dec 4 18:21:30 2002 +++ php4/ext/gd/gd.cThu Dec 5 21:16:06 2002 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.234 2002/12/04 23:21:30 rasmus Exp $ */ +/* $Id: gd.c,v 1.235 2002/12/06 02:16:06 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -156,12 +156,13 @@ PHP_FE(imageellipse,NULL) PHP_FE(imagechar, NULL) PHP_FE(imagecharup, NULL) + PHP_FE(imagecolorat,NULL) PHP_FE(imagecolorallocate, NULL) #if HAVE_LIBGD15 PHP_FE(imagepalettecopy,NULL) PHP_FE(imagecreatefromstring, NULL) #endif - PHP_FE(imagecolorat,NULL) + PHP_FE(imageistruecolor,NULL) PHP_FE(imagecolorclosest, NULL) #if HAVE_COLORCLOSESTHWB PHP_FE(imagecolorclosesthwb,NULL) @@ -1747,6 +1748,23 @@ zend_list_delete(Z_LVAL_PP(IM)); RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto int imagecolorallocate(int im, int red, int green, int blue) + Allocate a color for an image */ +PHP_FUNCTION(imageistruecolor) +{ + zval **IM; + gdImagePtr im; + + if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, IM) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); + + RETURN_BOOL(im-trueColor); } /* }}} */ Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.46 php4/ext/gd/php_gd.h:1.47 --- php4/ext/gd/php_gd.h:1.46 Sat Nov 23 17:11:59 2002 +++ php4/ext/gd/php_gd.hThu Dec 5 21:16:06 2002 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.46 2002/11/23 22:11:59 moriyoshi Exp $ */ +/* $Id: php_gd.h,v 1.47 2002/12/06 02:16:06 pajoye Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -64,6 +64,7 @@ PHP_FUNCTION(imagearc); PHP_FUNCTION(imagechar); PHP_FUNCTION(imagecharup); +PHP_FUNCTION(imageistruecolor); PHP_FUNCTION(imagecolorallocate); PHP_FUNCTION(imagepalettecopy); PHP_FUNCTION(imagecolorat); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd php_gd.h
pajoye Wed Dec 11 15:45:48 2002 EDT Modified files: /php4/ext/gdphp_gd.h Log: Remove double definition of imagesettile Add imageantiallias Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.47 php4/ext/gd/php_gd.h:1.48 --- php4/ext/gd/php_gd.h:1.47 Thu Dec 5 21:16:06 2002 +++ php4/ext/gd/php_gd.hWed Dec 11 15:45:47 2002 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.47 2002/12/06 02:16:06 pajoye Exp $ */ +/* $Id: php_gd.h,v 1.48 2002/12/11 20:45:47 pajoye Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -99,10 +99,10 @@ #ifdef HAVE_GD_BUNDLED PHP_FUNCTION(imagerotate); +PHP_FUNCTION(imageantialias); #endif PHP_FUNCTION(imagesetthickness); -PHP_FUNCTION(imagesettile); PHP_FUNCTION(imagecopymergegray); PHP_FUNCTION(imagesetbrush); PHP_FUNCTION(imagesettile); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c
pajoye Wed Dec 11 15:46:52 2002 EDT Modified files: /php4/ext/gd/libgd gd.c Log: Add gdImageAAline (antialiased line) Add AA support for gdImagePolygon Index: php4/ext/gd/libgd/gd.c diff -u php4/ext/gd/libgd/gd.c:1.32 php4/ext/gd/libgd/gd.c:1.33 --- php4/ext/gd/libgd/gd.c:1.32 Sun Dec 8 16:07:13 2002 +++ php4/ext/gd/libgd/gd.c Wed Dec 11 15:46:52 2002 @@ -1037,6 +1037,134 @@ } } } + + +#define BLEND_COLOR(a, nc, c, cc) \ +nc = (cc) + (c) - (cc)) * (a)) + c) - (cc)) * (a)) 8) + 0x80) 8); + +inline static void gdImageSetAAPixelColor(gdImagePtr im, int x, int y, int color, int +t) +{ + int dr,dg,db,p,r,g,b; + dr = gdTrueColorGetRed(color); + dg = gdTrueColorGetGreen(color); + db = gdTrueColorGetBlue(color); + + p = gdImageGetPixel(im,x,y); + r = gdTrueColorGetRed(p); + g = gdTrueColorGetGreen(p); + b = gdTrueColorGetBlue(p); + + BLEND_COLOR(t, dr, r, dr); + BLEND_COLOR(t, dg, g, dg); + BLEND_COLOR(t, db, b, db); + im-tpixels[y][x]=gdTrueColorAlpha(dr, dg, db, gdAlphaOpaque); +} + +void gdImageAALine (gdImagePtr im, int x1, int y1, int x2, int y2, int col) +{ +/* keep them as 32bits */ +long x, y, inc; + long dx, dy,tmp; + + if (y1 0 y2 0) { + return; + } + if (y1 0) { + x1 += (y1 * (x1 - x2)) / (y2 - y1); + y1 = 0; + } + if (y2 0) { + x2 += (y2 * (x1 - x2)) / (y2 - y1); + y2 = 0; + } + + /* bottom edge */ + if (y1 = im-sy y2 = im-sy) { + return; + } + if (y1 = im-sy) { + x1 -= ((im-sy - y1) * (x1 - x2)) / (y2 - y1); + y1 = im-sy - 1; + } + if (y2 = im-sy) { + x2 -= ((im-sy - y2) * (x1 - x2)) / (y2 - y1); + y2 = im-sy - 1; + } + + /* left edge */ + if (x1 0 x2 0) { + return; + } + if (x1 0) { + y1 += (x1 * (y1 - y2)) / (x2 - x1); + x1 = 0; + } + if (x2 0) { + y2 += (x2 * (y1 - y2)) / (x2 - x1); + x2 = 0; + } + /* right edge */ + if (x1 = im-sx x2 = im-sx) { + return; + } + if (x1 = im-sx) { + y1 -= ((im-sx - x1) * (y1 - y2)) / (x2 - x1); + x1 = im-sx - 1; + } + if (x2 = im-sx) { + y2 -= ((im-sx - x2) * (y1 - y2)) / (x2 - x1); + x2 = im-sx - 1; + } + + dx = x2 - x1; + dy = y2 - y1; + + if (dx == 0 dy == 0) { + return; + } + if (abs(dx) abs(dy)) { + if (dx 0) { + tmp = x1; + x1 = x2; + x2 = tmp; + tmp = y1; + y1 = y2; + y2 = tmp; + dx = x2 - x1; + dy = y2 - y1; + } + x = x1 16; + y = y1 16; + inc = (dy * 65536) / dx; + while ((x 16) x2) { + gdImageSetAAPixelColor(im, x 16, y 16, col, (y 8) +0xFF); + gdImageSetAAPixelColor(im, x 16, (y 16) + 1,col, (~y +8) 0xFF); + x += (1 16); + y += inc; + } + } else { + if (dy 0) { + tmp = x1; + x1 = x2; + x2 = tmp; + tmp = y1; + y1 = y2; + y2 = tmp; + dx = x2 - x1; + dy = y2 - y1; + } + x = x1 16; + y = y1 16; + inc = (dx * 65536) / dy; + while ((y16) y2) { + gdImageSetAAPixelColor(im, x 16, y 16, col, (x 8) +0xFF); + gdImageSetAAPixelColor(im, (x 16) + 1, (y 16),col, (~x + 8) 0xFF); + x += inc; + y += (116); + } + } +} + static void dashedSet (gdImagePtr im, int x, int y, int color, int *onP, int *dashStepP, int wid, int vert); @@ -2776,22 +2904,28 @@ void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c) { - int i; - int lx, ly; - if (!n) -{ - return; -} - lx = p-x; - ly = p-y; - gdImageLine (im, lx, ly, p[n - 1].x, p[n - 1].y, c); - for (i = 1; (i n); i++) -{ - p++; - gdImageLine (im, lx, ly, p-x, p-y, c); - lx = p-x; - ly = p-y; -} + int i; + int lx, ly; + typedef void (*image_line)(gdImagePtr im, int x1, int y1, int x2, int y2, int +color); + image_line draw_line; + + if (!n) { + return; + } + if ( im-antialias) { + draw_line =
[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c
pajoye Wed Dec 11 17:23:51 2002 EDT Modified files: /php4/ext/gd/libgd gd.c Log: Fix brightness filter (argument ingnored) Index: php4/ext/gd/libgd/gd.c diff -u php4/ext/gd/libgd/gd.c:1.35 php4/ext/gd/libgd/gd.c:1.36 --- php4/ext/gd/libgd/gd.c:1.35 Wed Dec 11 16:55:45 2002 +++ php4/ext/gd/libgd/gd.c Wed Dec 11 17:23:51 2002 @@ -3410,7 +3410,7 @@ return 0; } - contrast = (double)(100.0-80.0)/100.0; + contrast = (double)(100.0-contrast)/100.0; contrast = contrast*contrast; for (y=0; ysrc-sy; ++y) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c
pajoye Sat Dec 14 14:23:29 2002 EDT Modified files: /php4/ext/gd/libgd gd.c Log: Do not allow AA if not trueColor (imageantialias does nothing) Index: php4/ext/gd/libgd/gd.c diff -u php4/ext/gd/libgd/gd.c:1.36 php4/ext/gd/libgd/gd.c:1.37 --- php4/ext/gd/libgd/gd.c:1.36 Wed Dec 11 17:23:51 2002 +++ php4/ext/gd/libgd/gd.c Sat Dec 14 14:23:29 2002 @@ -3189,7 +3189,9 @@ void gdImageAntialias (gdImagePtr im, int antialias) { - im-antialias = antialias; + if (im-trueColor){ + im-antialias = antialias; + } } void -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd gd.c
pajoye Tue Jan 7 17:34:01 2003 EDT Modified files: /php4/ext/gdgd.c Log: Fix line drawed twice (L. Atkinson) Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.241 php4/ext/gd/gd.c:1.242 --- php4/ext/gd/gd.c:1.241 Tue Dec 31 11:06:39 2002 +++ php4/ext/gd/gd.cTue Jan 7 17:34:00 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.241 2002/12/31 16:06:39 sebastian Exp $ */ +/* $Id: gd.c,v 1.242 2003/01/07 22:34:00 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -2149,8 +2149,6 @@ else #endif gdImageLine(im, Z_LVAL_PP(x1), Z_LVAL_PP(y1), Z_LVAL_PP(x2), Z_LVAL_PP(y2), Z_LVAL_PP(col)); - - gdImageLine(im, Z_LVAL_PP(x1), Z_LVAL_PP(y1), Z_LVAL_PP(x2), Z_LVAL_PP(y2), Z_LVAL_PP(col)); RETURN_TRUE; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/gd gd.c /ext/gd/libgd gd.c gd.hgd_gd2.c gd_jpeg.c
On Fri, 17 Jan 2003 18:34:07 - Ilia Alshanetsky [EMAIL PROTECTED] wrote: iliaa Fri Jan 17 13:34:07 2003 EDT Modified files: /php4/ext/gd gd.c /php4/ext/gd/libgdgd.c gd.h gd_gd2.c gd_jpeg.c Log: Syncronize bundled GD library with latest GD (2.0.11). MFH'ing this commit should be a good thing. pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c
pajoye Mon Jan 20 20:49:34 2003 EDT Modified files: /php4/ext/gd/libgd gd.c Log: Add credits to my functions (thx for the advice WezIlia :) Index: php4/ext/gd/libgd/gd.c diff -u php4/ext/gd/libgd/gd.c:1.41 php4/ext/gd/libgd/gd.c:1.42 --- php4/ext/gd/libgd/gd.c:1.41 Fri Jan 17 13:34:07 2003 +++ php4/ext/gd/libgd/gd.c Mon Jan 20 20:49:34 2003 @@ -1077,6 +1077,11 @@ } } + +/* + * Added on 2003/12 by Pierre-Alain Joye ([EMAIL PROTECTED]) + * (c) 2003 Pierre-Alain Joye + * */ #define BLEND_COLOR(a, nc, c, cc) \ nc = (cc) + (c) - (cc)) * (a)) + c) - (cc)) * (a)) 8) + 0x80) 8); @@ -1098,6 +1103,10 @@ im-tpixels[y][x]=gdTrueColorAlpha(dr, dg, db, gdAlphaOpaque); } +/* + * Added on 2003/12 by Pierre-Alain Joye ([EMAIL PROTECTED]) + * (c) 2003 Pierre-Alain Joye + **/ void gdImageAALine (gdImagePtr im, int x1, int y1, int x2, int y2, int col) { /* keep them as 32bits */ @@ -2331,6 +2340,13 @@ } } + +/* + * Rotate function Added on 2003/12 + * by Pierre-Alain Joye ([EMAIL PROTECTED]) + * (c) 2003 Pierre-Alain Joye + **/ +/* Begin rotate function */ #ifdef ROTATE_PI #undef ROTATE_PI #endif /* ROTATE_PI */ @@ -2762,6 +2778,7 @@ return rotatedImg; } +/* End Rotate function */ gdImagePtr gdImageCreateFromXbm (FILE * fd) @@ -3293,6 +3310,12 @@ } } + +/* Filters function added on 2003/12 + * by Pierre-Alain Joye ([EMAIL PROTECTED]) + * (c) 2003 Pierre-Alain Joye + **/ +/* Begin filters function */ #ifndef HAVE_GET_TRUE_COLOR #define GET_PIXEL_FUNCTION(src)(src-trueColor?gdImageGetTrueColorPixel:gdImageGetPixel) #endif @@ -3745,3 +3768,4 @@ return gdImageConvolution(im, filter, weight+8, 0); } +/* End filters function */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c
pajoye Mon Jan 20 21:10:20 2003 EDT Modified files: /php4/ext/gd/libgd gd.c Log: Remove the (c), in the future, can we add PHP Licence terms for the new functions ? Index: php4/ext/gd/libgd/gd.c diff -u php4/ext/gd/libgd/gd.c:1.42 php4/ext/gd/libgd/gd.c:1.43 --- php4/ext/gd/libgd/gd.c:1.42 Mon Jan 20 20:49:34 2003 +++ php4/ext/gd/libgd/gd.c Mon Jan 20 21:10:19 2003 @@ -1080,7 +1080,6 @@ /* * Added on 2003/12 by Pierre-Alain Joye ([EMAIL PROTECTED]) - * (c) 2003 Pierre-Alain Joye * */ #define BLEND_COLOR(a, nc, c, cc) \ nc = (cc) + (c) - (cc)) * (a)) + c) - (cc)) * (a)) 8) + 0x80) 8); @@ -1105,7 +1104,6 @@ /* * Added on 2003/12 by Pierre-Alain Joye ([EMAIL PROTECTED]) - * (c) 2003 Pierre-Alain Joye **/ void gdImageAALine (gdImagePtr im, int x1, int y1, int x2, int y2, int col) { @@ -2344,7 +2342,6 @@ /* * Rotate function Added on 2003/12 * by Pierre-Alain Joye ([EMAIL PROTECTED]) - * (c) 2003 Pierre-Alain Joye **/ /* Begin rotate function */ #ifdef ROTATE_PI @@ -3313,7 +3310,6 @@ /* Filters function added on 2003/12 * by Pierre-Alain Joye ([EMAIL PROTECTED]) - * (c) 2003 Pierre-Alain Joye **/ /* Begin filters function */ #ifndef HAVE_GET_TRUE_COLOR -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c gd.h
pajoye Sat Feb 8 03:41:43 2003 EDT Modified files: /php4/ext/gd/libgd gd.c gd.h Log: Add gdImageEllipse Replace gdImageFilledEllipse by a new function (backported from the new phpgd) the new gdImageFilledEllipse fix bug bug #22103 (ellipse part) Index: php4/ext/gd/libgd/gd.c diff -u php4/ext/gd/libgd/gd.c:1.44 php4/ext/gd/libgd/gd.c:1.45 --- php4/ext/gd/libgd/gd.c:1.44 Sat Feb 1 20:34:54 2003 +++ php4/ext/gd/libgd/gd.c Sat Feb 8 03:41:42 2003 @@ -1534,7 +1534,11 @@ void gdImageArc (gdImagePtr im, int cx, int cy, int w, int h, int s, int e, int color) { - gdImageFilledArc (im, cx, cy, w, h, s, e, color, gdNoFill); + if( (s%360)==(e%360) ){ + gdImageEllipse(im, cx, cy, w, h, color); + } else { + gdImageFilledArc (im, cx, cy, w, h, s, e, color, gdNoFill); + } } void @@ -1620,10 +1624,103 @@ } } -void -gdImageFilledEllipse (gdImagePtr im, int cx, int cy, int w, int h, int color) + +/** + * Integer Ellipse functions (gdImageEllipse and gdImageFilledEllipse) + * Function added by Pierre-Alain Joye 02/08/2003 ([EMAIL PROTECTED]) + * See the ellipse function simplification for the equation + * as well as the midpoint algorithm. + */ + +void gdImageEllipse(gdImagePtr im, int mx, int my, int w, int h, int c) { - gdImageFilledArc (im, cx, cy, w, h, 0, 360, color, gdPie); + int x=0,mx1=0,mx2=0,my1=0,my2=0; + long aq,bq,dx,dy,r,rx,ry,a,b; + + a=w1; + b=h1; + gdImageSetPixel(im,mx+a, my, c); + gdImageSetPixel(im,mx-a, my, c); + mx1 = mx-a;my1 = my; + mx2 = mx+a;my2 = my; + + aq = a * a; + bq = b * b; + dx = aq 1; + dy = bq 1; + r = a * bq; + rx = r 1; + ry = 0; + x = a; + while (x 0){ + if (r 0) { + my1++;my2--; + ry +=dx; + r -=ry; + } + if (r = 0){ + x--; + mx1++;mx2--; + rx -=dy; + r +=rx; + } + gdImageSetPixel(im,mx1, my1, c); + gdImageSetPixel(im,mx1, my2, c); + gdImageSetPixel(im,mx2, my1, c); + gdImageSetPixel(im,mx2, my2, c); + } +} + +void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c) +{ + int x=0,mx1=0,mx2=0,my1=0,my2=0; + long aq,bq,dx,dy,r,rx,ry,a,b; + int i; + int old_y1,old_y2; + + a=w1; + b=h1; + + gdImageLine(im, mx-a, my, mx+a, my, c); + + mx1 = mx-a;my1 = my; + mx2 = mx+a;my2 = my; + + aq = a * a; + bq = b * b; + dx = aq 1; + dy = bq 1; + r = a * bq; + rx = r 1; + ry = 0; + x = a; + old_y2=-1; + old_y1=-1; + while (x 0){ + if (r 0) { + my1++;my2--; + ry +=dx; + r -=ry; + } + if (r = 0){ + x--; + mx1++;mx2--; + rx -=dy; + r +=rx; + } + if(old_y2!=my2){ + for(i=mx1;i=mx2;i++){ + gdImageSetPixel(im,i,my1,c); + } + } + if(old_y2!=my2){ + for(i=mx1;i=mx2;i++){ + gdImageSetPixel(im,i,my2,c); + } + } + old_y2 = my2; + old_y1 = my1; + } } void Index: php4/ext/gd/libgd/gd.h diff -u php4/ext/gd/libgd/gd.h:1.14 php4/ext/gd/libgd/gd.h:1.15 --- php4/ext/gd/libgd/gd.h:1.14 Fri Jan 17 13:34:07 2003 +++ php4/ext/gd/libgd/gd.h Sat Feb 8 03:41:43 2003 @@ -420,7 +420,7 @@ /* Best to free this memory with gdFree(), not free() */ void* gdImageGd2Ptr(gdImagePtr im, int cs, int fmt, int *size); -void gdImageEllipse(gdImagePtr im, int cx, int cy, int w, int h, int color); +void gdImageEllipse(gdImagePtr im, int cx, int cy, int w, int h, int c); /* Style is a bitwise OR ( | operator ) of these. gdArc and gdChord are mutually exclusive; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) /ext/gd/libgd gd.c gd.h
On Sat, 08 Feb 2003 08:54:13 - Pierre-Alain Joye [EMAIL PROTECTED] wrote: pajoyeSat Feb 8 03:54:13 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gd/libgdgd.c gd.h Log: MFH: Add gdImageEllipse Replace gdImageFilledEllipse by a new function (backported from the new phpgd) the new gdImageFilledEllipse fix bug bug #22103 (ellipse part) Someone can add it to the NEWS for both HEAD and PHP_4_3 ? thanks pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd php_gd.h
pajoye Wed Feb 26 18:21:45 2003 EDT Modified files: /php4/ext/gdphp_gd.h Log: add imagesavealpha wrapper (Jukka Holappa [EMAIL PROTECTED], Pierre-Alain Joye) Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.51 php4/ext/gd/php_gd.h:1.52 --- php4/ext/gd/php_gd.h:1.51 Sat Jan 25 20:15:02 2003 +++ php4/ext/gd/php_gd.hWed Feb 26 18:21:44 2003 @@ -1,4 +1,4 @@ -/* +/* +--+ | PHP Version 4| +--+ @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.51 2003/01/26 01:15:02 pollita Exp $ */ +/* $Id: php_gd.h,v 1.52 2003/02/26 23:21:44 pajoye Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -93,6 +93,7 @@ PHP_FUNCTION(imagefilledellipse); PHP_FUNCTION(imagefilledarc); PHP_FUNCTION(imagealphablending); +PHP_FUNCTION(imagesavealpha); PHP_FUNCTION(imagecolorallocatealpha); PHP_FUNCTION(imagecolorresolvealpha); PHP_FUNCTION(imagecolorclosestalpha); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd gd.c
pajoye Wed Feb 26 18:22:09 2003 EDT Modified files: /php4/ext/gdgd.c Log: add imagesavealpha wrapper (Jukka Holappa [EMAIL PROTECTED], 2 Pierre-Alain Joye) Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.250 php4/ext/gd/gd.c:1.251 --- php4/ext/gd/gd.c:1.250 Sat Feb 1 18:23:59 2003 +++ php4/ext/gd/gd.cWed Feb 26 18:22:09 2003 @@ -18,9 +18,9 @@ +--+ */ -/* $Id: gd.c,v 1.250 2003/02/01 23:23:59 helly Exp $ */ +/* $Id: gd.c,v 1.251 2003/02/26 23:22:09 pajoye Exp $ */ -/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, +/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ /* Note that there is no code from the gd package in this file */ @@ -188,6 +188,7 @@ PHP_FE(imagefilledarc, NULL) PHP_FE(imagefilledellipse, NULL) PHP_FE(imagealphablending, NULL) + PHP_FE(imagesavealpha, NULL) PHP_FE(imagecolorallocatealpha, NULL) PHP_FE(imagecolorresolvealpha, NULL) PHP_FE(imagecolorclosestalpha, NULL) @@ -292,7 +293,7 @@ PHP_FE(imagepsbbox, NULL) #endif PHP_FE(imagetypes, NULL) - + #if defined(HAVE_GD_JPG) defined(HAVE_GD_WBMP) PHP_FE(jpeg2wbmp, NULL) #endif @@ -301,7 +302,7 @@ #endif #ifdef HAVE_GD_WBMP PHP_FE(image2wbmp, NULL) -#endif +#endif #if HAVE_GD_BUNDLED PHP_FE(imagelayereffect,NULL) PHP_FE(imagecolormatch, NULL) @@ -634,7 +635,7 @@ /* {{{ proto int imageloadfont(string filename) Load a new font */ -PHP_FUNCTION(imageloadfont) +PHP_FUNCTION(imageloadfont) { zval **file; int hdr_size = sizeof(gdFont) - sizeof(char *); @@ -662,7 +663,7 @@ * byte 8-11: (int) pixel width of each character * byte 12-15: (int) pixel height of each character * bytes 16-: (char) array with character data, one byte per pixel -*in each character, for a total of +*in each character, for a total of *(nchars*width*height) bytes. */ font = (gdFontPtr)emalloc(sizeof(gdFont)); @@ -744,7 +745,7 @@ stylearr = emalloc(sizeof(int) * zend_hash_num_elements(HASH_OF(*styles))); zend_hash_internal_pointer_reset_ex(HASH_OF(*styles), pos); - + for (index=0;; zend_hash_move_forward_ex(HASH_OF(*styles), pos)) { zval ** item; @@ -794,7 +795,7 @@ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, IM) == FAILURE) { ZEND_WRONG_PARAM_COUNT(); } - + ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); RETURN_BOOL(im-trueColor); @@ -815,7 +816,7 @@ ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); convert_to_boolean_ex(dither); convert_to_long_ex(ncolors); - + gdImageTrueColorToPalette(im, Z_LVAL_PP(dither), Z_LVAL_PP(ncolors)); RETURN_TRUE; @@ -873,7 +874,7 @@ ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); convert_to_long_ex(thick); - + gdImageSetThickness(im, Z_LVAL_PP(thick)); RETURN_TRUE; @@ -890,7 +891,7 @@ if (ZEND_NUM_ARGS() != 6 || zend_get_parameters_ex(6, IM, cx, cy, w, h, color) == FAILURE) { ZEND_WRONG_PARAM_COUNT(); } - + ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); convert_to_long_ex(cx); @@ -937,7 +938,7 @@ gdImageFilledArc(im, Z_LVAL_PP(cx), Z_LVAL_PP(cy), Z_LVAL_PP(w), Z_LVAL_PP(h), st, e, Z_LVAL_PP(col), Z_LVAL_PP(style)); RETURN_TRUE; } -/* }}} */ +/* }}} */ /* {{{ proto void imagealphablending(resource im, bool on) Turn alpha blending mode on or off for the given image */ @@ -952,13 +953,34 @@ ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); convert_to_boolean_ex(blend); - + gdImageAlphaBlending(im, Z_LVAL_PP(blend)); RETURN_TRUE; } /* }}} */ +#if HAVE_LIBGD20 +/* {{{ proto void imagesavealpha(resource im, bool on) + Include alpha channel to a saved image */ +PHP_FUNCTION(imagesavealpha) +{ + zval **IM, **save
Re: [PHP-CVS] cvs: php4 /ext/gd gd.c
On Wed, 26 Feb 2003 23:22:09 - Pierre-Alain Joye [EMAIL PROTECTED] wrote: pajoyeWed Feb 26 18:22:09 2003 EDT Modified files: /php4/ext/gd gd.c Log: add imagesavealpha wrapper (Jukka Holappa [EMAIL PROTECTED], 2 Pierre-Alain Joye) :/ something has gone wrong with the editor. Sorry -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/gd php_gd.h
On Thu, 27 Feb 2003 17:42:06 +0200 (EET) Jani Taskinen [EMAIL PROTECTED] wrote: Don't forget to add this to NEWS file too.. I do not have write permission to this part of the tree. pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c
pajoye Fri Feb 28 20:15:33 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gdgd.c Log: MFH imageistruecolor, imagesavealpha Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.221.2.12 php4/ext/gd/gd.c:1.221.2.13 --- php4/ext/gd/gd.c:1.221.2.12 Fri Jan 24 14:24:01 2003 +++ php4/ext/gd/gd.cFri Feb 28 20:15:32 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.221.2.12 2003/01/24 19:24:01 iliaa Exp $ */ +/* $Id: gd.c,v 1.221.2.13 2003/03/01 01:15:32 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -148,11 +148,13 @@ PHP_FE(imagecreate, NULL) #if HAVE_LIBGD20 PHP_FE(imagecreatetruecolor,NULL) + PHP_FE(imageistruecolor,NULL) PHP_FE(imagetruecolortopalette, NULL) PHP_FE(imagesetthickness, NULL) PHP_FE(imagefilledarc, NULL) PHP_FE(imagefilledellipse, NULL) PHP_FE(imagealphablending, NULL) + PHP_FE(imagesavealpha, NULL) PHP_FE(imagecolorresolvealpha, NULL) PHP_FE(imagecolorclosestalpha, NULL) PHP_FE(imagecolorexactalpha,NULL) @@ -711,6 +713,23 @@ } /* }}} */ +/* {{{ proto int imageistruecolor(int im) + *return true if the image uses truecolor */ +PHP_FUNCTION(imageistruecolor) +{ + zval **IM; + gdImagePtr im; + + if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, IM) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); + + RETURN_BOOL(im-trueColor); +} +/* }}} */ + /* {{{ proto void imagetruecolortopalette(resource im, bool ditherFlag, int colorsWanted) Convert a true colour image to a palette based image with a number of colours, optionally using dithering. */ PHP_FUNCTION(imagetruecolortopalette) @@ -868,6 +887,27 @@ RETURN_TRUE; } /* }}} */ + +#if HAVE_LIBGD20 +/* {{{ proto void imagesavealpha(resource im, bool on) + *Include alpha channel to a saved image */ +PHP_FUNCTION(imagesavealpha) +{ + zval **IM, **save; + gdImagePtr im; + + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, IM, save) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); + convert_to_boolean_ex(save); + + gdImageSaveAlpha(im, Z_LVAL_PP(save)); + + RETURN_TRUE; +} +#endif #if HAVE_GD_BUNDLED /* {{{ proto void imagelayereffect(resource im, int effect) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd php_gd.h
pajoye Fri Feb 28 20:15:47 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gdphp_gd.h Log: MFH imageistruecolor, imagesavealpha Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.44.2.2 php4/ext/gd/php_gd.h:1.44.2.3 --- php4/ext/gd/php_gd.h:1.44.2.2 Tue Dec 31 11:34:37 2002 +++ php4/ext/gd/php_gd.hFri Feb 28 20:15:47 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_gd.h,v 1.44.2.2 2002/12/31 16:34:37 sebastian Exp $ */ +/* $Id: php_gd.h,v 1.44.2.3 2003/03/01 01:15:47 pajoye Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -84,12 +84,14 @@ PHP_FUNCTION(imagefttext); PHP_FUNCTION(imagecreatetruecolor); +PHP_FUNCTION(imageistruecolor); PHP_FUNCTION(imagetruecolortopalette); PHP_FUNCTION(imagesetthickness); PHP_FUNCTION(imageellipse); PHP_FUNCTION(imagefilledellipse); PHP_FUNCTION(imagefilledarc); PHP_FUNCTION(imagealphablending); +PHP_FUNCTION(imagesavealpha); PHP_FUNCTION(imagecolorresolvealpha); PHP_FUNCTION(imagecolorclosestalpha); PHP_FUNCTION(imagecolorexactalpha); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd CREDITS
pajoye Fri Feb 28 20:16:01 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gdCREDITS Log: Update credits Index: php4/ext/gd/CREDITS diff -u php4/ext/gd/CREDITS:1.1 php4/ext/gd/CREDITS:1.1.16.1 --- php4/ext/gd/CREDITS:1.1 Mon Nov 20 05:31:22 2000 +++ php4/ext/gd/CREDITS Fri Feb 28 20:16:00 2003 @@ -1,2 +1,2 @@ GD imaging -Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto +Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd CREDITS
pajoye Fri Feb 28 20:28:10 2003 EDT Modified files: /php4/ext/gdCREDITS Log: update credits (ilia,myself) Index: php4/ext/gd/CREDITS diff -u php4/ext/gd/CREDITS:1.1 php4/ext/gd/CREDITS:1.2 --- php4/ext/gd/CREDITS:1.1 Mon Nov 20 05:31:22 2000 +++ php4/ext/gd/CREDITS Fri Feb 28 20:28:10 2003 @@ -1,2 +1,2 @@ GD imaging -Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto +Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd CREDITS
pajoye Sun Jun 15 16:16:46 2003 EDT Modified files: /php4/ext/gdCREDITS Log: add Marcus, enough work done Index: php4/ext/gd/CREDITS diff -u php4/ext/gd/CREDITS:1.2 php4/ext/gd/CREDITS:1.3 --- php4/ext/gd/CREDITS:1.2 Fri Feb 28 20:28:10 2003 +++ php4/ext/gd/CREDITS Sun Jun 15 16:16:46 2003 @@ -1,2 +1,2 @@ GD imaging -Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye +Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye, Marcus Boerger -- 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
pajoye Wed Jul 2 07:23:56 2003 EDT Modified files: /php-src/ext/gd/libgd gd.c Log: - Fix #23808 Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.55 php-src/ext/gd/libgd/gd.c:1.56 --- php-src/ext/gd/libgd/gd.c:1.55 Thu Jun 12 15:31:44 2003 +++ php-src/ext/gd/libgd/gd.c Wed Jul 2 07:23:56 2003 @@ -2075,9 +2075,12 @@ } else { dc = gdImageGetPixel(dst, tox, toy); - ncR = (int)(gdImageRed (src, c) * (pct / 100.0f) + ((100 - pct) / 100.0f)); - ncG = (int)(gdImageGreen (src, c) * (pct / 100.0f) + ((100 - pct) / 100.0f)); - ncB = (int)(gdImageBlue (src, c) * (pct / 100.0f) + ((100 - pct) / 100.0f)); +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); /* Find a reasonable color */ nc = gdImageColorResolve (dst, ncR, ncG, ncB); -- 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
pajoye Wed Jul 2 07:24:52 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.14 php-src/ext/gd/libgd/gd.c:1.24.2.15 --- php-src/ext/gd/libgd/gd.c:1.24.2.14 Thu Jun 12 15:33:19 2003 +++ php-src/ext/gd/libgd/gd.c Wed Jul 2 07:24:52 2003 @@ -2075,9 +2075,12 @@ } else { dc = gdImageGetPixel(dst, tox, toy); - ncR = (int)(gdImageRed (src, c) * (pct / 100.0f) + ((100 - pct) / 100.0f)); - ncG = (int)(gdImageGreen (src, c) * (pct / 100.0f) + ((100 - pct) / 100.0f)); - ncB = (int)(gdImageBlue (src, c) * (pct / 100.0f) + ((100 - pct) / 100.0f)); +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); /* Find a reasonable color */ nc = gdImageColorResolve (dst, ncR, ncG, ncB); -- 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
pajoye Wed Jul 2 07:33:35 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/gd/libgd gd.c Log: - tabs... Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.24.2.15 php-src/ext/gd/libgd/gd.c:1.24.2.16 --- php-src/ext/gd/libgd/gd.c:1.24.2.15 Wed Jul 2 07:24:52 2003 +++ php-src/ext/gd/libgd/gd.c Wed Jul 2 07:33:35 2003 @@ -2075,12 +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) + (int)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); -- 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
pajoye Wed Jul 2 07:36:17 2003 EDT Modified files: /php-src/ext/gd/libgd gd.c Log: - tabs Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.56 php-src/ext/gd/libgd/gd.c:1.57 --- php-src/ext/gd/libgd/gd.c:1.56 Wed Jul 2 07:23:56 2003 +++ php-src/ext/gd/libgd/gd.c Wed Jul 2 07:36:17 2003 @@ -2075,12 +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) + (int)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); -- 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
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
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
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
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 /ext/gd/libgd gd.c
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
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/gd/tests bug24594.phpt
pajoye Tue Jul 22 20:17:30 2003 EDT Modified files: /php-src/ext/gd/tests bug24594.phpt Log: - Remove imagepng, not used in test Index: php-src/ext/gd/tests/bug24594.phpt diff -u php-src/ext/gd/tests/bug24594.phpt:1.1 php-src/ext/gd/tests/bug24594.phpt:1.2 --- php-src/ext/gd/tests/bug24594.phpt:1.1 Tue Jul 22 20:11:33 2003 +++ php-src/ext/gd/tests/bug24594.phpt Tue Jul 22 20:17:29 2003 @@ -51,7 +51,7 @@ $res .= imagecolorat($base,14,16)==$black?'1':'0'; $res .= imagecolorat($base,15,17)==$black?'1':'0'; echo $res\n; - imagepng($base,filled1.png); + imagefilledrectangle($base,0,0,149,149,$white); imagerectangle($base, 9,9,139,139,$black); imageline($base, 9,9,139,139,$black); @@ -79,7 +79,6 @@ $res .= imagecolorat($base,0,0)==$black?'1':'0'; echo $res\n; - imagepng($base,filled.png); ? --EXPECT-- 0011101010 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/tests bug24594.phpt
pajoye Tue Jul 22 20:11:33 2003 EDT Added files: /php-src/ext/gd/tests bug24594.phpt Log: - imagefill tests Index: php-src/ext/gd/tests/bug24594.phpt +++ php-src/ext/gd/tests/bug24594.phpt --TEST-- Bug #24594 (Filling an area using tiles). --SKIPIF-- ?php if (!extension_loaded('gd')) { die(skip gd extension not available\n); } if (!GD_BUNDLED) { die('skip external GD libraries may fail'); } ? --FILE-- ?php $tile = imagecreate(36,36); $base = imagecreate(150,150); $white = imagecolorallocate($tile,255,255,255); $black = imagecolorallocate($tile,0,0,0); $white = imagecolorallocate($base,255,255,255); $black = imagecolorallocate($base,0,0,0); /* create the dots pattern */ for ($x=0;$x36;$x+=2) { for ($y=0;$y36;$y+=2) { imagesetpixel($tile,$x,$y,$black); } } imagesettile($base,$tile); imagerectangle($base, 9,9,139,139,$black); imageline($base, 9,9,139,139,$black); imagefill($base,11,12,IMG_COLOR_TILED); $res = imagecolorat($base,0,10)==$black?'1':'0'; $res .= imagecolorat($base,0,20)==$black?'1':'0'; $res .= imagecolorat($base,0,30)==$black?'1':'0'; $res .= imagecolorat($base,0,40)==$black?'1':'0'; $res .= imagecolorat($base,0,50)==$black?'1':'0'; $res .= imagecolorat($base,0,60)==$black?'1':'0'; $res .= imagecolorat($base,11,12)==$white?'1':'0'; $res .= imagecolorat($base,12,13)==$white?'1':'0'; $res .= imagecolorat($base,13,14)==$white?'1':'0'; $res .= imagecolorat($base,14,15)==$white?'1':'0'; $res .= imagecolorat($base,15,16)==$white?'1':'0'; $res .= imagecolorat($base,16,17)==$white?'1':'0'; $res .= imagecolorat($base,10,12)==$black?'1':'0'; $res .= imagecolorat($base,11,13)==$black?'1':'0'; $res .= imagecolorat($base,12,14)==$black?'1':'0'; $res .= imagecolorat($base,13,15)==$black?'1':'0'; $res .= imagecolorat($base,14,16)==$black?'1':'0'; $res .= imagecolorat($base,15,17)==$black?'1':'0'; echo $res\n; imagepng($base,filled1.png); imagefilledrectangle($base,0,0,149,149,$white); imagerectangle($base, 9,9,139,139,$black); imageline($base, 9,9,139,139,$black); imagefill($base,0,0,IMG_COLOR_TILED); $res = imagecolorat($base,0,10)==$black?'1':'0'; $res .= imagecolorat($base,0,20)==$black?'1':'0'; $res .= imagecolorat($base,0,30)==$black?'1':'0'; $res .= imagecolorat($base,0,40)==$black?'1':'0'; $res .= imagecolorat($base,0,50)==$black?'1':'0'; $res .= imagecolorat($base,0,60)==$black?'1':'0'; $res .= imagecolorat($base,11,12)==$white?'1':'0'; $res .= imagecolorat($base,12,13)==$white?'1':'0'; $res .= imagecolorat($base,13,14)==$white?'1':'0'; $res .= imagecolorat($base,14,15)==$white?'1':'0'; $res .= imagecolorat($base,15,16)==$white?'1':'0'; $res .= imagecolorat($base,16,17)==$white?'1':'0'; $res .= imagecolorat($base,0,16)==$black?'1':'0'; $res .= imagecolorat($base,2,42)==$black?'1':'0'; $res .= imagecolorat($base,4,44)==$black?'1':'0'; $res .= imagecolorat($base,146,146)==$black?'1':'0'; $res .= imagecolorat($base,148,146)==$black?'1':'0'; $res .= imagecolorat($base,0,0)==$black?'1':'0'; echo $res\n; imagepng($base,filled.png); ? --EXPECT-- 0011101010 11 -- 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
pajoye Tue Jul 22 20:23:21 2003 EDT Modified files: /php-src/ext/gd/libgd gd.c Log: - Fix leak when no fill is done (ilia) Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.61 php-src/ext/gd/libgd/gd.c:1.62 --- php-src/ext/gd/libgd/gd.c:1.61 Tue Jul 22 20:08:57 2003 +++ php-src/ext/gd/libgd/gd.c Tue Jul 22 20:23:21 2003 @@ -1869,12 +1869,13 @@ return; } - stack = (struct seg *)emalloc(sizeof(struct seg) * ((int)(im-sy*im-sx)/4)+1); - sp = stack; - wx2=im-sx;wy2=im-sy; oc = gdImageGetPixel(im, x, y); if (oc==nc || x0 || xwx2 || y0 || ywy2) return; + + stack = (struct seg *)emalloc(sizeof(struct seg) * ((int)(im-sy*im-sx)/4)+1); + sp = stack; + /* required! */ FILL_PUSH(y,x,x,1); /* seed segment (popped 1st) */ -- 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
pajoye Tue Jul 22 20:08:57 2003 EDT Modified files: /php-src/ext/gd/libgd gd.c Log: - Fix #bug24594 Rewrite the imagefill function (non recursive, uses of connected points algorithm) Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.60 php-src/ext/gd/libgd/gd.c:1.61 --- php-src/ext/gd/libgd/gd.c:1.60 Wed Jul 9 20:09:23 2003 +++ php-src/ext/gd/libgd/gd.c Tue Jul 22 20:08:57 2003 @@ -868,6 +868,36 @@ } } + +static int gdImageTileGet (gdImagePtr im, int x, int y) +{ + int srcx, srcy; + int tileColor,p; + if (!im-tile) { + return -1; + } + srcx = x % gdImageSX(im-tile); + srcy = y % gdImageSY(im-tile); + p = gdImageGetPixel(im-tile, srcx, srcy); + + if (im-trueColor) { + if (im-tile-trueColor) { + tileColor = p; + } else { + tileColor = gdTrueColorAlpha( gdImageRed(im-tile,p), gdImageGreen(im-tile,p), gdImageBlue (im-tile,p), gdImageAlpha (im-tile,p)); + } + } else { + if (im-tile-trueColor) { + tileColor = gdImageColorResolveAlpha(im, gdTrueColorGetRed (p), gdTrueColorGetGreen (p), gdTrueColorGetBlue (p), gdTrueColorGetAlpha (p)); + } else { + tileColor = p; + tileColor = gdImageColorResolveAlpha(im, gdImageRed (im-tile,p), gdImageGreen (im-tile,p), gdImageBlue (im-tile,p), gdImageAlpha (im-tile,p)); + } + } + return tileColor; +} + + static void gdImageAntiAliasedApply (gdImagePtr im, int px, int py) { float p_dist, p_alpha; @@ -1799,106 +1829,171 @@ } } -void gdImageFill (gdImagePtr im, int x, int y, int color) -{ - int lastBorder; - int old; - int leftLimit, rightLimit; - int i; - - if (x = im-sx) { - x = im-sx - 1; - } - - if (y = im-sy) { - y = im-sy - 1; + +/* + * set the pixel at (x,y) and its 4-connected neighbors + * with the same pixel value to the new pixel value nc (new color). + * A 4-connected neighbor: pixel above, below, left, or right of a pixel. + * ideas from comp.graphics discussions. + * For tiled fill, the use of a flag buffer is mandatory. As the tile image can + * contain the same color as the color to fill. To do not bloat normal filling + * code I added a 2nd private function. + */ + +/* horizontal segment of scan line y */ +struct seg {int y, xl, xr, dy;}; + +/* max depth of stack */ +#define FILL_MAX 120 +#define FILL_PUSH(Y, XL, XR, DY) \ +if (spstack+FILL_MAX*10 Y+(DY)=0 Y+(DY)wy2) \ +{sp-y = Y; sp-xl = XL; sp-xr = XR; sp-dy = DY; sp++;} + +#define FILL_POP(Y, XL, XR, DY) \ +{sp--; Y = sp-y+(DY = sp-dy); XL = sp-xl; XR = sp-xr;} + +void _gdImageFillTiled(gdImagePtr im, int x, int y, int nc); + +void gdImageFill(gdImagePtr im, int x, int y, int nc) +{ + int l, x1, x2, dy; + int oc; /* old pixel value */ + int wx2,wy2; + /* stack of filled segments */ + //struct seg stack[FILL_MAX],*sp = stack;; + struct seg *stack; + struct seg *sp; + + if (nc==gdTiled){ + _gdImageFillTiled(im,x,y,nc); + return; } - - old = gdImageGetPixel(im, x, y); - if (color == gdTiled) { - /* Tile fill -- got to watch out! */ - int p, tileColor; - int srcx, srcy; - if (!im-tile) { - return; - } - /* Refuse to flood-fill with a transparent pattern I can't do it without allocating another image */ - if (gdImageGetTransparent(im-tile) != (-1)) { - return; - } - srcx = x % gdImageSX(im-tile); - srcy = y % gdImageSY(im-tile); - p = gdImageGetPixel(im-tile, srcx, srcy); - if (im-trueColor) { - tileColor = p; - } else { - if (im-tile-trueColor) { - tileColor = gdImageColorResolveAlpha(im, gdTrueColorGetRed (p), gdTrueColorGetGreen (p), gdTrueColorGetBlue (p), gdTrueColorGetAlpha (p)); - } else { - tileColor = im-tileColorMap[p]; - } - } - if (old == tileColor) { - /* Nothing to be done */ - return; + + stack = (struct seg *)emalloc(sizeof(struct seg) * ((int)(im-sy*im-sx)/4)+1); + sp = stack; + + wx2=im-sx;wy2=im-sy; + oc = gdImageGetPixel(im, x, y); + if (oc==nc || x0 || xwx2 || y0 || ywy2) return; + /* required! */ + FILL_PUSH(y,x,x,1); + /* seed segment (popped 1st) */ + FILL_PUSH(y+1, x, x, -1); + while (spstack) { +
[PHP-CVS] cvs: CVSROOT / avail
pajoye Thu Jul 12 15:32:04 2007 UTC Modified files: /CVSROOTavail Log: - msaraujo pecl/lua karma http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1285r2=1.1286diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1285 CVSROOT/avail:1.1286 --- CVSROOT/avail:1.1285Fri Jul 6 03:36:52 2007 +++ CVSROOT/avail Thu Jul 12 15:32:03 2007 @@ -279,6 +279,7 @@ avail|janisto|pear/Validate,peardoc avail|tias|pear/PEAR_Frontend_Web,peardoc avail|va|pecl/yami +avail|msaraujo|pecl/lua # php windows installer avail|jmertic|php-src/win32/installer -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue Jul 17 09:32:39 2007 UTC Modified files: /CVSROOTavail Log: - peclweb karma for johannes http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1287r2=1.1288diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1287 CVSROOT/avail:1.1288 --- CVSROOT/avail:1.1287Fri Jul 13 11:23:46 2007 +++ CVSROOT/avail Tue Jul 17 09:32:39 2007 @@ -83,7 +83,7 @@ avail|noihex,mfalgas,ereza,ebi,ait,jabro,eduardcapell,oriolm,yagooar,jeprubio,marctm|phpdoc-ca # access to the pecl website etc -avail|dufuz,pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon,cellog,philip,jani|peclweb,pecl +avail|dufuz,pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon,cellog,philip,jani,johannes|peclweb,pecl # access to the newly cut pecl4win website avail|edink,derick|pecl4win -- 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
pajoye Mon Jul 30 21:44:53 2007 UTC Modified files: /php-src/ext/gd gd.c Log: - MFB: - fix gd bug #102, 0 means that no load are loaded, return false - add error code in the warning http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.378r2=1.379diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.378 php-src/ext/gd/gd.c:1.379 --- php-src/ext/gd/gd.c:1.378 Wed Jun 6 09:43:39 2007 +++ php-src/ext/gd/gd.c Mon Jul 30 21:44:53 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.378 2007/06/06 09:43:39 tony2001 Exp $ */ +/* $Id: gd.c,v 1.379 2007/07/30 21:44:53 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -3825,7 +3825,8 @@ f_ind = T1_AddFont(filename); if (f_ind 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, T1Lib Error: %s, T1_StrError(f_ind)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, T1Lib Error (%i): %s, f_ind, T1_StrError(f_ind)); + RETURN_FALSE; } if (T1_LoadFont(f_ind)) { -- 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 gd.c
pajoye Mon Jul 30 21:42:36 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd gd.c Log: - fix gd bug #102, 0 means that no load are loaded, return false - add error code in the warning http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.29r2=1.312.2.20.2.30diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.29 php-src/ext/gd/gd.c:1.312.2.20.2.30 --- php-src/ext/gd/gd.c:1.312.2.20.2.29 Wed Jun 6 09:45:43 2007 +++ php-src/ext/gd/gd.c Mon Jul 30 21:42:36 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.29 2007/06/06 09:45:43 tony2001 Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.30 2007/07/30 21:42:36 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -4363,7 +4363,8 @@ f_ind = T1_AddFont(Z_STRVAL_PP(file)); if (f_ind 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, T1Lib Error: %s, T1_StrError(f_ind)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, T1Lib Error (%i): %s, f_ind, T1_StrError(f_ind)); + RETURN_FALSE; } if (T1_LoadFont(f_ind)) { -- 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/tokenizer config.w32
pajoye Wed Aug 1 15:13:40 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/tokenizer config.w32 Log: - fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/config.w32?r1=1.1r2=1.1.6.1diff_format=u Index: php-src/ext/tokenizer/config.w32 diff -u php-src/ext/tokenizer/config.w32:1.1 php-src/ext/tokenizer/config.w32:1.1.6.1 --- php-src/ext/tokenizer/config.w32:1.1Tue Dec 2 23:16:59 2003 +++ php-src/ext/tokenizer/config.w32Wed Aug 1 15:13:40 2007 @@ -1,10 +1,10 @@ -// $Id: config.w32,v 1.1 2003/12/02 23:16:59 wez Exp $ +// $Id: config.w32,v 1.1.6.1 2007/08/01 15:13:40 pajoye Exp $ // vim:ft=javascript ARG_ENABLE(tokenizer, tokenizer support, yes); if (PHP_TOKENIZER == yes) { - EXTENSION(tokenizer, tokenizer.c); + EXTENSION(tokenizer, tokenizer.c tokenizer_data.c); AC_DEFINE(HAVE_TOKENIZER, 1, Tokenizer support); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Fri Aug 3 16:50:25 2007 UTC Modified files: /CVSROOTavail Log: - guenter karma for gd, maintain netware port http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1294r2=1.1295diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1294 CVSROOT/avail:1.1295 --- CVSROOT/avail:1.1294Thu Aug 2 14:17:54 2007 +++ CVSROOT/avail Fri Aug 3 16:50:25 2007 @@ -307,6 +307,6 @@ # Please ask [EMAIL PROTECTED] before adding some unknown guys :) # gd/libgd is the library itself, other directories are for # the various tools (website, bugs,...) -avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac|gd +avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter|gd # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Mon Aug 6 07:21:13 2007 UTC Modified files: /CVSROOTavail Log: - gd access for Mattias http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1295r2=1.1296diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1295 CVSROOT/avail:1.1296 --- CVSROOT/avail:1.1295Fri Aug 3 16:50:25 2007 +++ CVSROOT/avail Mon Aug 6 07:21:13 2007 @@ -307,6 +307,6 @@ # Please ask [EMAIL PROTECTED] before adding some unknown guys :) # gd/libgd is the library itself, other directories are for # the various tools (website, bugs,...) -avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter|gd +avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias|gd # vim:set ft=conf sw=2 ts=2 et: -- 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/openssl openssl.c
pajoye Mon Aug 6 19:11:20 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/opensslopenssl.c Log: - #4, truncate the _default to the buffer size (was 200 since day #1, we don't need dynamic alloc here) http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.38r2=1.98.2.5.2.39diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.38 php-src/ext/openssl/openssl.c:1.98.2.5.2.39 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.38 Wed Jul 11 12:18:14 2007 +++ php-src/ext/openssl/openssl.c Mon Aug 6 19:11:20 2007 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: openssl.c,v 1.98.2.5.2.38 2007/07/11 12:18:14 dmitry Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.39 2007/08/06 19:11:20 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1739,7 +1739,9 @@ if (strcmp(_default, type + len) != 0) { continue; } - + if (len 200) { + len = 200; + } memcpy(buffer, type, len); buffer[len] = '\0'; type = buffer; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
pajoye Mon Aug 6 19:13:05 2007 UTC Modified files: /php-src/ext/opensslopenssl.c Log: - MFB: #4, truncate the _default to the buffer size (was 200 since day #1, we don't need dynamic alloc here) http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.146r2=1.147diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.146 php-src/ext/openssl/openssl.c:1.147 --- php-src/ext/openssl/openssl.c:1.146 Mon Aug 6 08:43:43 2007 +++ php-src/ext/openssl/openssl.c Mon Aug 6 19:13:05 2007 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: openssl.c,v 1.146 2007/08/06 08:43:43 dmitry Exp $ */ +/* $Id: openssl.c,v 1.147 2007/08/06 19:13:05 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1814,7 +1814,9 @@ if (strcmp(_default, type + len) != 0) { continue; } - + if (len 200) { + len = 200; + } memcpy(buffer, type, len); buffer[len] = '\0'; type = buffer; -- 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) / NEWS
pajoye Mon Aug 6 19:16:40 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - #4 entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.880r2=1.2027.2.547.2.881diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.880 php-src/NEWS:1.2027.2.547.2.881 --- php-src/NEWS:1.2027.2.547.2.880 Mon Aug 6 16:23:08 2007 +++ php-src/NEWSMon Aug 6 19:16:40 2007 @@ -79,6 +79,7 @@ - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory already exists). (Pierre) +- Fixed bug #4 (possible buffer overflow in php_openssl_make_REQ) (Pierre) - Fixed bug #42173 (oci8 INTERVAL and TIMESTAMP type fixes). (Chris) - Fixed bug #42151 (__destruct functions not called after catching a SoapFault exception). (Dmitry) -- 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/openssl openssl.c
pajoye Mon Aug 6 19:49:45 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/opensslopenssl.c Log: - #4, forgot this one (thanks mattias) http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.39r2=1.98.2.5.2.40diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.39 php-src/ext/openssl/openssl.c:1.98.2.5.2.40 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.39 Mon Aug 6 19:11:20 2007 +++ php-src/ext/openssl/openssl.c Mon Aug 6 19:49:45 2007 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: openssl.c,v 1.98.2.5.2.39 2007/08/06 19:11:20 pajoye Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.40 2007/08/06 19:49:45 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1743,7 +1743,7 @@ len = 200; } memcpy(buffer, type, len); - buffer[len] = '\0'; + buffer[len - 1] = '\0'; type = buffer; /* Skip past any leading X. X: X, etc to allow for multiple -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
pajoye Mon Aug 6 19:50:16 2007 UTC Modified files: /php-src/ext/opensslopenssl.c Log: - MFB: #4, forgot this one (thanks mattias) http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.147r2=1.148diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.147 php-src/ext/openssl/openssl.c:1.148 --- php-src/ext/openssl/openssl.c:1.147 Mon Aug 6 19:13:05 2007 +++ php-src/ext/openssl/openssl.c Mon Aug 6 19:50:16 2007 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: openssl.c,v 1.147 2007/08/06 19:13:05 pajoye Exp $ */ +/* $Id: openssl.c,v 1.148 2007/08/06 19:50:16 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1818,9 +1818,10 @@ len = 200; } memcpy(buffer, type, len); - buffer[len] = '\0'; + buffer[len - 1] = '\0'; + type = buffer; - + /* Skip past any leading X. X: X, etc to allow for multiple * instances */ for (str = type; *str; str++) { -- 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/openssl openssl.c
pajoye Wed Aug 8 06:29:47 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/opensslopenssl.c Log: - fix regression introduced with #4 (thx to tony and mattias for the head up) http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.40r2=1.98.2.5.2.41diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.40 php-src/ext/openssl/openssl.c:1.98.2.5.2.41 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.40 Mon Aug 6 19:49:45 2007 +++ php-src/ext/openssl/openssl.c Wed Aug 8 06:29:46 2007 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: openssl.c,v 1.98.2.5.2.40 2007/08/06 19:49:45 pajoye Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.41 2007/08/08 06:29:46 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1726,7 +1726,7 @@ /* Finally apply defaults from config file */ for(i = 0; i sk_CONF_VALUE_num(dn_sk); i++) { int len; - char buffer[200]; + char buffer[200 + 1]; /*200 + \0 !*/ v = sk_CONF_VALUE_value(dn_sk, i); type = v-name; @@ -1743,7 +1743,7 @@ len = 200; } memcpy(buffer, type, len); - buffer[len - 1] = '\0'; + buffer[len] = '\0'; type = buffer; /* Skip past any leading X. X: X, etc to allow for multiple -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
pajoye Wed Aug 8 06:30:56 2007 UTC Modified files: /php-src/ext/opensslopenssl.c Log: - MFB: fix regressio introduced by #4 http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.148r2=1.149diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.148 php-src/ext/openssl/openssl.c:1.149 --- php-src/ext/openssl/openssl.c:1.148 Mon Aug 6 19:50:16 2007 +++ php-src/ext/openssl/openssl.c Wed Aug 8 06:30:56 2007 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: openssl.c,v 1.148 2007/08/06 19:50:16 pajoye Exp $ */ +/* $Id: openssl.c,v 1.149 2007/08/08 06:30:56 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1801,7 +1801,7 @@ /* Finally apply defaults from config file */ for(i = 0; i sk_CONF_VALUE_num(dn_sk); i++) { int len; - char buffer[200]; + char buffer[200 + 1]; /* 200 + \n !*/ v = sk_CONF_VALUE_value(dn_sk, i); type = v-name; @@ -1818,7 +1818,7 @@ len = 200; } memcpy(buffer, type, len); - buffer[len - 1] = '\0'; + buffer[len] = '\0'; type = buffer; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Thu Aug 9 07:37:19 2007 UTC Modified files: /CVSROOTavail Log: - give mattias ext/gd karma http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1297r2=1.1298diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1297 CVSROOT/avail:1.1298 --- CVSROOT/avail:1.1297Wed Aug 8 12:42:46 2007 +++ CVSROOT/avail Thu Aug 9 07:37:19 2007 @@ -308,5 +308,6 @@ # gd/libgd is the library itself, other directories are for # the various tools (website, bugs,...) avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias|gd +avail|mattias|php-src/ext/gd # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Wed Aug 22 13:25:51 2007 UTC Modified files: /CVSROOTavail Log: - intl karma http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1299r2=1.1300diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1299 CVSROOT/avail:1.1300 --- CVSROOT/avail:1.1299Mon Aug 20 07:58:07 2007 +++ CVSROOT/avail Wed Aug 22 13:25:50 2007 @@ -282,6 +282,8 @@ avail|tias|pear/PEAR_Frontend_Web,peardoc avail|va|pecl/yami avail|msaraujo,mansion|pecl/lua +avail|merletenney,kirtig,harveyrd|pecl/intl + # php windows installer avail|jmertic|php-src/win32/installer -- 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 /ext/gd/tests libgd00106.phpt
pajoye Sun Aug 26 20:33:22 2007 UTC Added files: /php-src/ext/gd/tests libgd00106.phpt Modified files: /php-src/ext/gd/libgd gd.c Log: - gd #106, imagerectangle draws 1x1 rectangles as 1x3 rectangles http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.110r2=1.111diff_format=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.110 php-src/ext/gd/libgd/gd.c:1.111 --- php-src/ext/gd/libgd/gd.c:1.110 Sun Jun 17 17:14:02 2007 +++ php-src/ext/gd/libgd/gd.c Sun Aug 26 20:33:21 2007 @@ -2120,6 +2120,11 @@ int half1 = 1; int t; + if (x1 == x2 y1 == y2 thick == 1) { + gdImageSetPixel(im, x1, y1, color); + return; + } + if (y2 y1) { t=y1; y1 = y2; http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00106.phpt?view=markuprev=1.1 Index: php-src/ext/gd/tests/libgd00106.phpt +++ php-src/ext/gd/tests/libgd00106.phpt --TEST-- libgd #106 (imagerectangle 1x1 draws 1x3) --SKIPIF-- ?php if (!extension_loaded('gd')) die(skip gd extension not available\n); ? --FILE-- ?php $im = imagecreatetruecolor(10,10); imagerectangle($im, 1,1, 1,1, 0xFF); $c1 = imagecolorat($im, 1,1); $c2 = imagecolorat($im, 1,2); $c3 = imagecolorat($im, 2,1); $c4 = imagecolorat($im, 2,2); if ($c1 == 0xFF $c2 == 0 $c3 == 0 $c4 == 0) { echo Ok; } else { echo failed; } ? --EXPECT-- Ok -- 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) / NEWS /ext/gd/libgd gd.c /ext/gd/tests libgd00106.phpt
pajoye Sun Aug 26 20:35:11 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/gd/tests libgd00106.phpt Modified files: /php-src/ext/gd/libgd gd.c /php-srcNEWS Log: - MFB: gd #106, imagerectangle draws 1x1 rectangles as 1x3 rectangles http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.17r2=1.90.2.1.2.18diff_format=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.17 php-src/ext/gd/libgd/gd.c:1.90.2.1.2.18 --- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.17 Sun Jun 17 19:03:58 2007 +++ php-src/ext/gd/libgd/gd.c Sun Aug 26 20:35:10 2007 @@ -2124,6 +2124,12 @@ int half1 = 1; int t; + + if (x1 == x2 y1 == y2 thick == 1) { + gdImageSetPixel(im, x1, y1, color); + return; + } + if (y2 y1) { t=y1; y1 = y2; http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.910r2=1.2027.2.547.2.911diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.910 php-src/NEWS:1.2027.2.547.2.911 --- php-src/NEWS:1.2027.2.547.2.910 Thu Aug 23 22:39:01 2007 +++ php-src/NEWSSun Aug 26 20:35:11 2007 @@ -1,5 +1,6 @@ PHPNEWS ||| +- Fixed regression in imagerectangle for 1x1 rectangle (gd bug #106) (Pierre) 23 Aug 2007, PHP 5.2.4RC3 - Fixed version_compare() to support rc as well as RC for release candidate version numbers. http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00106.phpt?view=markuprev=1.1 Index: php-src/ext/gd/tests/libgd00106.phpt +++ php-src/ext/gd/tests/libgd00106.phpt --TEST-- libgd #106 (imagerectangle 1x1 draws 1x3) --SKIPIF-- ?php if (!extension_loaded('gd')) die(skip gd extension not available\n); ? --FILE-- ?php $im = imagecreatetruecolor(10,10); imagerectangle($im, 1,1, 1,1, 0xFF); $c1 = imagecolorat($im, 1,1); $c2 = imagecolorat($im, 1,2); $c3 = imagecolorat($im, 2,1); $c4 = imagecolorat($im, 2,2); if ($c1 == 0xFF $c2 == 0 $c3 == 0 $c4 == 0) { echo Ok; } else { echo failed; } ? --EXPECT-- Ok -- 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) / NEWS /ext/gd/libgd gd.c
pajoye Mon Aug 27 08:27:45 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/gd/libgd gd.c Log: - revert fix for #106 - add news entry for pslib fix NB: Please next time, inform us before a complete freeze is done for a given branch. And a week for a RC is defitively too short. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.911r2=1.2027.2.547.2.912diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.911 php-src/NEWS:1.2027.2.547.2.912 --- php-src/NEWS:1.2027.2.547.2.911 Sun Aug 26 20:35:11 2007 +++ php-src/NEWSMon Aug 27 08:27:44 2007 @@ -1,9 +1,10 @@ PHPNEWS ||| -- Fixed regression in imagerectangle for 1x1 rectangle (gd bug #106) (Pierre) 23 Aug 2007, PHP 5.2.4RC3 - Fixed version_compare() to support rc as well as RC for release candidate version numbers. +- Fixed possible crash in imagepsloadfont, work around a bug in the pslib on + windows (Pierre) - Fixed bug #42368 (Incorrect error message displayed by pg_escape_string). (Ilia) - Fixed bug #42365 (glob() crashes and/or accepts way too many flags). (Jani) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.18r2=1.90.2.1.2.19diff_format=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.18 php-src/ext/gd/libgd/gd.c:1.90.2.1.2.19 --- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.18 Sun Aug 26 20:35:10 2007 +++ php-src/ext/gd/libgd/gd.c Mon Aug 27 08:27:45 2007 @@ -2124,12 +2124,6 @@ int half1 = 1; int t; - - if (x1 == x2 y1 == y2 thick == 1) { - gdImageSetPixel(im, x1, y1, color); - return; - } - if (y2 y1) { t=y1; y1 = y2; -- 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 gd.c
pajoye Wed Aug 29 06:26:30 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd gd.c Log: - gd bug #102, alternative fix when an old library is used http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.30r2=1.312.2.20.2.31diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.30 php-src/ext/gd/gd.c:1.312.2.20.2.31 --- php-src/ext/gd/gd.c:1.312.2.20.2.30 Mon Jul 30 21:42:36 2007 +++ php-src/ext/gd/gd.c Wed Aug 29 06:26:30 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.30 2007/07/30 21:42:36 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.31 2007/08/29 06:26:30 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -4353,6 +4353,9 @@ { zval **file; int f_ind, *font; +#ifdef PHP_WIN32 + struct stat st; +#endif if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, file) == FAILURE) { ZEND_WRONG_PARAM_COUNT(); @@ -4360,6 +4363,13 @@ convert_to_string_ex(file); +#ifdef PHP_WIN32 + if (VCWD_STAT(Z_STRVAL_PP(file), st) 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Font file not found (%s), Z_STRVAL_PP(file)); + RETURN_FALSE; + } +#endif + f_ind = T1_AddFont(Z_STRVAL_PP(file)); if (f_ind 0) { -- 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/standard string.c
pajoye Fri Sep 7 18:23:58 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard string.c Log: - #42592, remove ending dot in warning msg http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.68r2=1.445.2.14.2.69diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.68 php-src/ext/standard/string.c:1.445.2.14.2.69 --- php-src/ext/standard/string.c:1.445.2.14.2.68 Fri Sep 7 02:28:42 2007 +++ php-src/ext/standard/string.c Fri Sep 7 18:23:58 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.445.2.14.2.68 2007/09/07 02:28:42 iliaa Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.69 2007/09/07 18:23:58 pajoye Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -659,7 +659,7 @@ } if (linelength == 0 docut) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, Can't force cut when width is zero.); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Can't force cut when width is zero); RETURN_FALSE; } -- 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.c
pajoye Sun Sep 9 13:05:52 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd/libgd gd.c Log: - re-add fix for libgd #106, imagerectangle draws 1x1 rectangles as 1x3 rectangles http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.19r2=1.90.2.1.2.20diff_format=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.19 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.19 Mon Aug 27 08:27:45 2007 +++ php-src/ext/gd/libgd/gd.c Sun Sep 9 13:05:51 2007 @@ -2124,6 +2124,11 @@ int half1 = 1; int t; + if (x1 == x2 y1 == y2 thick == 1) { + gdImageSetPixel(im, x1, y1, color); + return; + } + if (y2 y1) { t=y1; y1 = y2; -- 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) / NEWS
pajoye Sun Sep 9 13:07:00 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - #106 entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.935r2=1.2027.2.547.2.936diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.935 php-src/NEWS:1.2027.2.547.2.936 --- php-src/NEWS:1.2027.2.547.2.935 Fri Sep 7 09:39:11 2007 +++ php-src/NEWSSun Sep 9 13:07:00 2007 @@ -7,6 +7,7 @@ - Fixed possible triggering of buffer overflows inside glibc imlplementations of the fnmatch(), setlocale() and glob() functions reported by Laurent gaffie (Ilia) +- Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre) - Upgraded PCRE to version 7.3 (Nuno) - Added optional parameter $provide_object to debug_backtrace(). (Sebastian) -- 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) / NEWS /ext/gd gd.c /ext/gd/libgd gd.c
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
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
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
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: CVSROOT / avail
pajoye Sun Sep 30 15:37:08 2007 UTC Modified files: /CVSROOTavail Log: - Johannes karma for all bugs, qa co (RM) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1306r2=1.1307diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1306 CVSROOT/avail:1.1307 --- CVSROOT/avail:1.1306Fri Sep 14 16:25:35 2007 +++ CVSROOT/avail Sun Sep 30 15:37:08 2007 @@ -52,7 +52,7 @@ # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net, # and master.php.net. -avail|ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web +avail|johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -- 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) / README.UPDATE_5_2
pajoye Mon Oct 1 08:14:03 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcREADME.UPDATE_5_2 Log: - add notice about glob regression (Lukas) http://cvs.php.net/viewvc.cgi/php-src/README.UPDATE_5_2?r1=1.1.2.39r2=1.1.2.40diff_format=u Index: php-src/README.UPDATE_5_2 diff -u php-src/README.UPDATE_5_2:1.1.2.39 php-src/README.UPDATE_5_2:1.1.2.40 --- php-src/README.UPDATE_5_2:1.1.2.39 Sat Jan 6 18:05:02 2007 +++ php-src/README.UPDATE_5_2 Mon Oct 1 08:14:03 2007 @@ -172,6 +172,21 @@ from your error handler in order to populate $php_errormsg. This allows you to fine-grain the levels of the messages stored. +== +Regressions introduced/fixed +== + +- In version 5.2.4 a security fix caused a regression for patterns of + the form /foo/*/bar/*. Since version 5.2.5 instead of raising a warning the + glob() function will return false when openbase_dir restrictions are violated. + + #See http://bugs.php.net/bug.php?id=41655 + + The warning that used to be raised looked like something as follows: + Warning: glob() [function.glob]: Unable to access /foo/*/bar/* in /foo.php on line xxx + #See http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.169r2=1.170 + + The patch can safely be applied to PHP 5.2.4 as well. == Backwards incompatible changes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Wed Oct 3 09:24:16 2007 UTC Modified files: /CVSROOTavail Log: - php-src karma for dsp http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1307r2=1.1308diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1307 CVSROOT/avail:1.1308 --- CVSROOT/avail:1.1307Sun Sep 30 15:37:08 2007 +++ CVSROOT/avail Wed Oct 3 09:24:16 2007 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man|phpfi,php3! ,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no +avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp|phpfi,! php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no # fastcgi implementation for IIS avail|shane,wez,edink|fastcgi-isapi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/gd/libgd gd.c
pajoye Sat Oct 20 15:29:04 2007 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS /php-src/ext/gd/libgd gd.c Log: - #43010, Fixed regression in imagearc with two equivelent angles http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.243r2=1.1247.2.920.2.244diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.243 php-src/NEWS:1.1247.2.920.2.244 --- php-src/NEWS:1.1247.2.920.2.243 Tue Jul 10 20:26:50 2007 +++ php-src/NEWSSat Oct 20 15:29:03 2007 @@ -14,6 +14,8 @@ open_basedir or safe_mode is active (Stas) - Fixed session.save_path and error_log values to be checked against open_basedir and safe_mode (CVE-2007-3378) (Stas, Maksymilian Arciemowicz) +- Fixed bug #43010 (Fixed regression in imagearc with two equivelent angles) + (Pierre) - Fixed bug #41765 (Recode crashes/does not work on amd64) (nexus at smoula dot net, Stas) - Fixed bug #41630 (segfault when an invalid color index is present in http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.24.2.36.2.2r2=1.24.2.36.2.3diff_format=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.24.2.36.2.2 php-src/ext/gd/libgd/gd.c:1.24.2.36.2.3 --- php-src/ext/gd/libgd/gd.c:1.24.2.36.2.2 Sat Apr 14 17:38:38 2007 +++ php-src/ext/gd/libgd/gd.c Sat Oct 20 15:29:04 2007 @@ -1607,20 +1607,28 @@ int lx = 0, ly = 0; int fx = 0, fy = 0; - if (s 360) { - s = s % 360; - } + if ((s % 360) == (e % 360)) { + s = 0; e = 360; + } else { + if (s 360) { + s = s % 360; + } - if (e 360) { - e = e % 360; - } + if (e 360) { + e = e % 360; + } - while (s0) { - s += 360; - } + while (s 0) { + s += 360; + } - while (e s) { - e += 360; + while (e s) { + e += 360; + } + + if (s == e) { + s = 0; e = 360; + } } for (i = s; i = e; i++) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Mon Nov 26 15:14:41 2007 UTC Modified files: /CVSROOTavail Log: - Francois karma for pecl/phk - Kevin Shepherd for gd http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1330r2=1.1331diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1330 CVSROOT/avail:1.1331 --- CVSROOT/avail:1.1330Wed Nov 21 10:37:12 2007 +++ CVSROOT/avail Mon Nov 26 15:14:40 2007 @@ -288,6 +288,7 @@ avail|lwe|pecl/pdo_firebird,php-src/ext/pdo_firebird avail|mkoppanen|pecl/ssh2 avail|bdeshong|pecl/usblib +avail|francois|pecl/phk # Objective-C bridge avail|wez,jan|php-objc @@ -319,7 +320,7 @@ # Please ask [EMAIL PROTECTED] before adding some unknown guys :) # gd/libgd is the library itself, other directories are for # the various tools (website, bugs,...) -avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias|gd +avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias,kshepherd|gd avail|mattias|php-src/ext/gd # vim:set ft=conf sw=2 ts=2 et: -- 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 gdft.c
pajoye Wed Jan 9 01:50:59 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd/libgd gdft.c Log: - #43790, fix crash when no family name has been found http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.9r2=1.36.4.10diff_format=u Index: php-src/ext/gd/libgd/gdft.c diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.9 php-src/ext/gd/libgd/gdft.c:1.36.4.10 --- php-src/ext/gd/libgd/gdft.c:1.36.4.9Mon Apr 23 15:17:47 2007 +++ php-src/ext/gd/libgd/gdft.c Wed Jan 9 01:50:59 2008 @@ -947,7 +947,8 @@ /* EAM DEBUG */ #if (defined(FREETYPE_MAJOR) ((FREETYPE_MAJOR == 2 ((FREETYPE_MINOR == 1 FREETYPE_PATCH = 3) || FREETYPE_MINOR 1) || FREETYPE_MAJOR 2))) - if (font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL strcmp(font-face-family_name, Symbol) == 0) { + if (font-face-family_name font-face-charmap-encoding + font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL strcmp(font-face-family_name, Symbol) == 0) { /* I do not know the significance of the constant 0xf000. * It was determined by inspection of the character codes * stored in Microsoft font symbol. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd/libgd gdft.c
pajoye Wed Jan 9 01:51:17 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd/libgd gdft.c Log: - MFB: #43790, fix crash when no family name has been found http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.9r2=1.36.4.9.2.1diff_format=u Index: php-src/ext/gd/libgd/gdft.c diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.9 php-src/ext/gd/libgd/gdft.c:1.36.4.9.2.1 --- php-src/ext/gd/libgd/gdft.c:1.36.4.9Mon Apr 23 15:17:47 2007 +++ php-src/ext/gd/libgd/gdft.c Wed Jan 9 01:51:17 2008 @@ -947,7 +947,8 @@ /* EAM DEBUG */ #if (defined(FREETYPE_MAJOR) ((FREETYPE_MAJOR == 2 ((FREETYPE_MINOR == 1 FREETYPE_PATCH = 3) || FREETYPE_MINOR 1) || FREETYPE_MAJOR 2))) - if (font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL strcmp(font-face-family_name, Symbol) == 0) { + if (font-face-family_name font-face-charmap-encoding + font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL strcmp(font-face-family_name, Symbol) == 0) { /* I do not know the significance of the constant 0xf000. * It was determined by inspection of the character codes * stored in Microsoft font symbol. -- 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 gdft.c
pajoye Wed Jan 9 01:52:03 2008 UTC Modified files: /php-src/ext/gd/libgd gdft.c Log: - MFB: #43790, fix crash when no family name has been found http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.45r2=1.46diff_format=u Index: php-src/ext/gd/libgd/gdft.c diff -u php-src/ext/gd/libgd/gdft.c:1.45 php-src/ext/gd/libgd/gdft.c:1.46 --- php-src/ext/gd/libgd/gdft.c:1.45Mon Apr 23 15:06:13 2007 +++ php-src/ext/gd/libgd/gdft.c Wed Jan 9 01:52:03 2008 @@ -947,7 +947,8 @@ /* EAM DEBUG */ #if (defined(FREETYPE_MAJOR) ((FREETYPE_MAJOR == 2 ((FREETYPE_MINOR == 1 FREETYPE_PATCH = 3) || FREETYPE_MINOR 1) || FREETYPE_MAJOR 2))) - if (font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL strcmp(font-face-family_name, Symbol) == 0) { + if (font-face-family_name font-face-charmap-encoding + font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL strcmp(font-face-family_name, Symbol) == 0) { /* I do not know the significance of the constant 0xf000. * It was determined by inspection of the character codes * stored in Microsoft font symbol. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Thu Jan 10 10:04:09 2008 UTC Modified files: /CVSROOTavail Log: - Francois karma for pecl/automap http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1344r2=1.1345diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1344 CVSROOT/avail:1.1345 --- CVSROOT/avail:1.1344Tue Jan 8 19:23:38 2008 +++ CVSROOT/avail Thu Jan 10 10:04:09 2008 @@ -287,7 +287,7 @@ avail|lwe|pecl/pdo_firebird,php-src/ext/pdo_firebird avail|mkoppanen|pecl/ssh2 avail|bdeshong|pecl/usblib -avail|francois|pecl/phk +avail|francois|pecl/phk,pecl/automap # Objective-C bridge avail|wez,jan|php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip php_zip.c php_zip.h
pajoye Fri Jan 18 01:11:27 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/zipphp_zip.c php_zip.h Log: - MFB: reflect the correct version http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.7r2=1.1.2.38.2.8diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.1.2.38.2.7 php-src/ext/zip/php_zip.c:1.1.2.38.2.8 --- php-src/ext/zip/php_zip.c:1.1.2.38.2.7 Fri Jan 18 00:20:56 2008 +++ php-src/ext/zip/php_zip.c Fri Jan 18 01:11:26 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_zip.c,v 1.1.2.38.2.7 2008/01/18 00:20:56 cellog Exp $ */ +/* $Id: php_zip.c,v 1.1.2.38.2.8 2008/01/18 01:11:26 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2111,9 +2111,9 @@ php_info_print_table_start(); php_info_print_table_row(2, Zip, enabled); - php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.1.2.38.2.7 2008/01/18 00:20:56 cellog Exp $); - php_info_print_table_row(2, Zip version, 2.0.0); - php_info_print_table_row(2, Libzip version, 0.7.1); + php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.1.2.38.2.8 2008/01/18 01:11:26 pajoye Exp $); + php_info_print_table_row(2, Zip version, PHP_ZIP_VERSION_STRING); + php_info_print_table_row(2, Libzip version, 0.8.0); php_info_print_table_end(); } http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.h?r1=1.10.2.3.2.1r2=1.10.2.3.2.2diff_format=u Index: php-src/ext/zip/php_zip.h diff -u php-src/ext/zip/php_zip.h:1.10.2.3.2.1 php-src/ext/zip/php_zip.h:1.10.2.3.2.2 --- php-src/ext/zip/php_zip.h:1.10.2.3.2.1 Mon Dec 31 07:17:16 2007 +++ php-src/ext/zip/php_zip.h Fri Jan 18 01:11:26 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_zip.h,v 1.10.2.3.2.1 2007/12/31 07:17:16 sebastian Exp $ */ +/* $Id: php_zip.h,v 1.10.2.3.2.2 2008/01/18 01:11:26 pajoye Exp $ */ #ifndef PHP_ZIP_H #define PHP_ZIP_H @@ -30,6 +30,8 @@ #include lib/zip.h +#define PHP_ZIP_VERSION_STRING 1.8.11 + /* {{{ OPENBASEDIR_CHECKPATH(filename) */ #if (PHP_MAJOR_VERSION 6) #define OPENBASEDIR_CHECKPATH(filename) \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip php_zip.c php_zip.h
pajoye Fri Jan 18 01:24:29 2008 UTC Modified files: /php-src/ext/zipphp_zip.c php_zip.h Log: - MFB: reflect the correct version http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.56r2=1.57diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.56 php-src/ext/zip/php_zip.c:1.57 --- php-src/ext/zip/php_zip.c:1.56 Fri Jan 18 00:33:15 2008 +++ php-src/ext/zip/php_zip.c Fri Jan 18 01:24:29 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_zip.c,v 1.56 2008/01/18 00:33:15 cellog Exp $ */ +/* $Id: php_zip.c,v 1.57 2008/01/18 01:24:29 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2205,9 +2205,9 @@ php_info_print_table_start(); php_info_print_table_row(2, Zip, enabled); - php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.56 2008/01/18 00:33:15 cellog Exp $); - php_info_print_table_row(2, Zip version, 2.0.0); - php_info_print_table_row(2, Libzip version, 0.7.1); + php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.57 2008/01/18 01:24:29 pajoye Exp $); + php_info_print_table_row(2, Zip version, PHP_ZIP_VERSION_STRING); + php_info_print_table_row(2, Libzip version, 0.8.0); php_info_print_table_end(); } http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.h?r1=1.16r2=1.17diff_format=u Index: php-src/ext/zip/php_zip.h diff -u php-src/ext/zip/php_zip.h:1.16 php-src/ext/zip/php_zip.h:1.17 --- php-src/ext/zip/php_zip.h:1.16 Mon Dec 31 07:12:17 2007 +++ php-src/ext/zip/php_zip.h Fri Jan 18 01:24:29 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_zip.h,v 1.16 2007/12/31 07:12:17 sebastian Exp $ */ +/* $Id: php_zip.h,v 1.17 2008/01/18 01:24:29 pajoye Exp $ */ #ifndef PHP_ZIP_H #define PHP_ZIP_H @@ -30,6 +30,8 @@ #include lib/zip.h +#define PHP_ZIP_VERSION_STRING 1.8.11 + /* {{{ OPENBASEDIR_CHECKPATH(filename) */ #if (PHP_MAJOR_VERSION 6) #define OPENBASEDIR_CHECKPATH(filename) \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue Jan 29 17:17:58 2008 UTC Modified files: /CVSROOTavail Log: - seariver karma for wxwidgets binding in pecl - move custom pecl karma out of ibm's protected area http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1350r2=1.1351diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1350 CVSROOT/avail:1.1351 --- CVSROOT/avail:1.1350Fri Jan 25 13:28:52 2008 +++ CVSROOT/avail Tue Jan 29 17:17:58 2008 @@ -289,6 +289,8 @@ avail|bdeshong|pecl/usblib avail|francois|pecl/phk,pecl/automap avail|sfox|pecl/phar +avail|ramsey|pecl/uploadprogress,pecl/pdo_user +avail|seariver|pecl/wxwidgets # Objective-C bridge avail|wez,jan|php-objc @@ -310,9 +312,6 @@ avail|dbs,kraman,kfbombar|pecl/pdo_ids,pecl/pdo_informix,pecl/pdo_ibm avail|dsr|pecl/sam,phpdoc -avail|ramsey|pecl/uploadprogress -avail|ramsey|pecl/pdo_user - # PDO Specs. CLA required to commit unavail||pdo-specs avail|wez,andi,stas,iliaa|pdo-specs -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /main main.c
pajoye Fri Feb 15 14:51:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/main main.c Log: - [DOC] add PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.113r2=1.2027.2.547.2.965.2.114diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.113 php-src/NEWS:1.2027.2.547.2.965.2.114 --- php-src/NEWS:1.2027.2.547.2.965.2.113 Fri Feb 15 12:48:13 2008 +++ php-src/NEWSFri Feb 15 14:51:39 2008 @@ -11,6 +11,8 @@ (Etienne Kneuss) . Improved checks for callbacks. (Marcus) . Added __DIR__ constant. (Lars Strojny) + . Added PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, +PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants (Pierre) - Added new date/time functionality: (Derick) . date_parse_from_format(): Parse date/time strings according to a format. http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.8r2=1.640.2.23.2.57.2.9diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.8 php-src/main/main.c:1.640.2.23.2.57.2.9 --- php-src/main/main.c:1.640.2.23.2.57.2.8 Mon Feb 4 20:39:21 2008 +++ php-src/main/main.c Fri Feb 15 14:51:39 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.8 2008/02/04 20:39:21 jani Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.9 2008/02/15 14:51:39 pajoye Exp $ */ /* {{{ includes */ @@ -1743,6 +1743,17 @@ /* Register constants */ REGISTER_MAIN_STRINGL_CONSTANT(PHP_VERSION, PHP_VERSION, sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT(PHP_MAJOR_VERSION, PHP_MAJOR_VERSION, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT(PHP_MINOR_VERSION, PHP_MINOR_VERSION, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT(PHP_RELEASE_VERSION, PHP_RELEASE_VERSION, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT(PHP_EXTRA_VERSION, PHP_EXTRA_VERSION, sizeof(PHP_EXTRA_VERSION) - 1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT(PHP_VERSION_ID, PHP_VERSION_ID, CONST_PERSISTENT | CONST_CS); +#ifdef ZTS + REGISTER_MAIN_LONG_CONSTANT(PHP_ZTS, 1, CONST_PERSISTENT | CONST_CS); +#else + REGISTER_MAIN_LONG_CONSTANT(PHP_ZTS, 0, CONST_PERSISTENT | CONST_CS); +#endif + REGISTER_MAIN_LONG_CONSTANT(PHP_DEBUG, PHP_DEBUG, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT(PHP_OS, php_os, strlen(php_os), CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT(PHP_SAPI, sapi_module.name, strlen(sapi_module.name), CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT(DEFAULT_INCLUDE_PATH, PHP_INCLUDE_PATH, sizeof(PHP_INCLUDE_PATH)-1, CONST_PERSISTENT | CONST_CS); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
pajoye Fri Feb 15 15:09:57 2008 UTC Modified files: /php-src/main main.c Log: - [DOC] MFB: add PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.757r2=1.758diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.757 php-src/main/main.c:1.758 --- php-src/main/main.c:1.757 Mon Feb 4 20:38:42 2008 +++ php-src/main/main.c Fri Feb 15 15:09:56 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.757 2008/02/04 20:38:42 jani Exp $ */ +/* $Id: main.c,v 1.758 2008/02/15 15:09:56 pajoye Exp $ */ /* {{{ includes */ @@ -1743,6 +1743,17 @@ /* {{{ php_module_startup */ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint num_additional_modules) + REGISTER_MAIN_LONG_CONSTANT(PHP_MAJOR_VERSION, PHP_MAJOR_VERSION, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT(PHP_MINOR_VERSION, PHP_MINOR_VERSION, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT(PHP_RELEASE_VERSION, PHP_RELEASE_VERSION, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT(PHP_EXTRA_VERSION, PHP_EXTRA_VERSION, sizeof(PHP_EXTRA_VERSION) - 1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_LONG_CONSTANT(PHP_VERSION_ID, PHP_VERSION_ID, CONST_PERSISTENT | CONST_CS); +#ifdef ZTS + REGISTER_MAIN_LONG_CONSTANT(PHP_ZTS, 1, CONST_PERSISTENT | CONST_CS); +#else + REGISTER_MAIN_LONG_CONSTANT(PHP_ZTS, 0, CONST_PERSISTENT | CONST_CS); +#endif + REGISTER_MAIN_LONG_CONSTANT(PHP_DEBUG, PHP_DEBUG, CONST_PERSISTENT | CONST_CS); { zend_utility_functions zuf; zend_utility_values zuv; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js
pajoye Sun Feb 17 01:26:15 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildconfutils.js Log: - add PHP_PHP_BUILD\bin to the path in PATH_PROG (option set with --with-php-builds=[PATH] the zip.zip contains all we need (except re2c! ) http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.2r2=1.60.2.1.2.8.2.3diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.2 php-src/win32/build/confutils.js:1.60.2.1.2.8.2.3 --- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.2 Thu Jan 10 18:21:56 2008 +++ php-src/win32/build/confutils.jsSun Feb 17 01:26:15 2008 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.60.2.1.2.8.2.2 2008/01/10 18:21:56 rrichards Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8.2.3 2008/02/17 01:26:15 pajoye Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -501,6 +501,7 @@ var exe; var place; var cyg_path = PHP_CYGWIN + \\bin; + PHP_CYGWIN + \\usr\\local\\bin; + var php_build_bin_path = PHP_PHP_BUILD + \\bin exe = progname + .exe; @@ -510,6 +511,8 @@ additional_paths += ; + cyg_path; } + additional_paths = additional_paths + ; + php_build_bin_path; + place = search_paths(exe, additional_paths, PATH); if (place == true) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Sun Feb 17 01:29:17 2008 UTC Modified files: /php-src/win32/buildconfutils.js Log: - MFB: add PHP_PHP_BUILD\bin to the path in PATH_PROG (option set with --with-php-builds=[PATH] the zip.zip contains all we need (except re2c! ) http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.71r2=1.72diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.71 php-src/win32/build/confutils.js:1.72 --- php-src/win32/build/confutils.js:1.71 Thu Jan 10 18:21:23 2008 +++ php-src/win32/build/confutils.jsSun Feb 17 01:29:16 2008 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.71 2008/01/10 18:21:23 rrichards Exp $ +// $Id: confutils.js,v 1.72 2008/02/17 01:29:16 pajoye Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -501,6 +501,7 @@ var exe; var place; var cyg_path = PHP_CYGWIN + \\bin; + PHP_CYGWIN + \\usr\\local\\bin; + var php_build_bin_path = PHP_PHP_BUILD + \\bin exe = progname + .exe; @@ -510,6 +511,8 @@ additional_paths += ; + cyg_path; } + additional_paths = additional_paths + ; + php_build_bin_path; + place = search_paths(exe, additional_paths, PATH); if (place == true) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Mon Feb 25 03:09:09 2008 UTC Modified files: /CVSROOTavail Log: - Paul Chandler karma for pecl/xrange http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1358r2=1.1359diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1358 CVSROOT/avail:1.1359 --- CVSROOT/avail:1.1358Sat Feb 23 09:57:52 2008 +++ CVSROOT/avail Mon Feb 25 03:09:09 2008 @@ -290,6 +290,7 @@ avail|sfox|pecl/phar avail|ramsey|pecl/uploadprogress,pecl/pdo_user avail|seariver|pecl/wxwidgets +avail|pestilence669|pecl/xrange # Objective-C bridge avail|wez,jan|php-objc -- 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) / NEWS /main main.c
pajoye Wed Mar 5 20:58:08 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/main main.c Log: - #42505, new sendmail default path breaks on Novell (Guenter Knauf) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1107r2=1.2027.2.547.2.1108diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1107 php-src/NEWS:1.2027.2.547.2.1108 --- php-src/NEWS:1.2027.2.547.2.1107Wed Mar 5 10:46:46 2008 +++ php-src/NEWSWed Mar 5 20:58:08 2008 @@ -8,6 +8,8 @@ - Fixed bug #44306 (Better detection of MIPS processors on Windows). (Ilia) - Fixed bug #44166 (Parameter handling flaw in PDO::getAvailableDrivers()). (Ilia) +- Fixed bug #42505 (new sendmail default breaks on Netware platform) + (Guenter Knauf) 27 Feb 2008, PHP 5.2.6RC1 - Fixed security issue detailed in CVE-2008-0599. (Rasmus) http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.61r2=1.640.2.23.2.62diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.61 php-src/main/main.c:1.640.2.23.2.62 --- php-src/main/main.c:1.640.2.23.2.61 Mon Dec 31 07:20:15 2007 +++ php-src/main/main.c Wed Mar 5 20:58:08 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.640.2.23.2.61 2007/12/31 07:20:15 sebastian Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.62 2008/03/05 20:58:08 pajoye Exp $ */ /* {{{ includes */ @@ -352,9 +352,8 @@ # define PHP_SAFE_MODE_EXEC_DIR #endif -#if defined(PHP_PROG_SENDMAIL) !defined(NETWARE) -# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL -t -i -#elif defined(PHP_WIN32) +/* Windows and Netware use the internal mail */ +#if defined(PHP_WIN32) || defined(NETWARE) # define DEFAULT_SENDMAIL_PATH NULL #else # define DEFAULT_SENDMAIL_PATH /usr/sbin/sendmail -t -i -- 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) / NEWS /ext/standard info.c
pajoye Wed Mar 5 21:09:29 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/standard info.c Log: - #40013, php_uname() does not return nodename on Netware (Guenter Knauf) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1108r2=1.2027.2.547.2.1109diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1108 php-src/NEWS:1.2027.2.547.2.1109 --- php-src/NEWS:1.2027.2.547.2.1108Wed Mar 5 20:58:08 2008 +++ php-src/NEWSWed Mar 5 21:09:29 2008 @@ -10,6 +10,8 @@ (Ilia) - Fixed bug #42505 (new sendmail default breaks on Netware platform) (Guenter Knauf) +- Fixed bug #40013 (php_uname() does not return nodename on Netware + (Guenter Knauf) 27 Feb 2008, PHP 5.2.6RC1 - Fixed security issue detailed in CVE-2008-0599. (Rasmus) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.16r2=1.249.2.10.2.17diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.16 php-src/ext/standard/info.c:1.249.2.10.2.17 --- php-src/ext/standard/info.c:1.249.2.10.2.16 Sun Mar 2 15:36:09 2008 +++ php-src/ext/standard/info.c Wed Mar 5 21:09:29 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: info.c,v 1.249.2.10.2.16 2008/03/02 15:36:09 iliaa Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.17 2008/03/05 21:09:29 pajoye Exp $ */ #include php.h #include php_ini.h @@ -326,6 +326,30 @@ if (uname((struct utsname *)buf) == -1) { php_uname = PHP_UNAME; } else { +#ifdef NETWARE + if (mode == 's') { + php_uname = buf.sysname; + } else if (mode == 'r') { + snprintf(tmp_uname, sizeof(tmp_uname), %d.%d.%d, +buf.netware_major, buf.netware_minor, buf.netware_revision); + php_uname = tmp_uname; + } else if (mode == 'n') { + php_uname = buf.servername; + } else if (mode == 'v') { + snprintf(tmp_uname, sizeof(tmp_uname), libc-%d.%d.%d #%d, +buf.libmajor, buf.libminor, buf.librevision, buf.libthreshold); + php_uname = tmp_uname; + } else if (mode == 'm') { + php_uname = buf.machine; + } else { /* assume mode == 'a' */ + snprintf(tmp_uname, sizeof(tmp_uname), %s %s %d.%d.%d libc-%d.%d.%d #%d %s, +buf.sysname, buf.servername, +buf.netware_major, buf.netware_minor, buf.netware_revision, +buf.libmajor, buf.libminor, buf.librevision, buf.libthreshold, +buf.machine); + php_uname = tmp_uname; + } +#else if (mode == 's') { php_uname = buf.sysname; } else if (mode == 'r') { @@ -342,6 +366,7 @@ buf.machine); php_uname = tmp_uname; } +#endif /* NETWARE */ } #else php_uname = PHP_UNAME; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard info.c
pajoye Wed Mar 5 21:18:26 2008 UTC Modified files: /php-src/ext/standard info.c Log: - MFB: #40013, php_uname() does not return nodename on Netware (Guenter Knauf) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.286r2=1.287diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.286 php-src/ext/standard/info.c:1.287 --- php-src/ext/standard/info.c:1.286 Sun Mar 2 15:36:24 2008 +++ php-src/ext/standard/info.c Wed Mar 5 21:18:26 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: info.c,v 1.286 2008/03/02 15:36:24 iliaa Exp $ */ +/* $Id: info.c,v 1.287 2008/03/05 21:18:26 pajoye Exp $ */ #include php.h #include php_ini.h @@ -425,6 +425,30 @@ if (uname((struct utsname *)buf) == -1) { php_uname = PHP_UNAME; } else { +#ifdef NETWARE + if (mode == 's') { + php_uname = buf.sysname; + } else if (mode == 'r') { + snprintf(tmp_uname, sizeof(tmp_uname), %d.%d.%d, +buf.netware_major, buf.netware_minor, buf.netware_revision); + php_uname = tmp_uname; + } else if (mode == 'n') { + php_uname = buf.servername; + } else if (mode == 'v') { + snprintf(tmp_uname, sizeof(tmp_uname), libc-%d.%d.%d #%d, +buf.libmajor, buf.libminor, buf.librevision, buf.libthreshold); + php_uname = tmp_uname; + } else if (mode == 'm') { + php_uname = buf.machine; + } else { /* assume mode == 'a' */ + snprintf(tmp_uname, sizeof(tmp_uname), %s %s %d.%d.%d libc-%d.%d.%d #%d %s, +buf.sysname, buf.servername, +buf.netware_major, buf.netware_minor, buf.netware_revision, +buf.libmajor, buf.libminor, buf.librevision, buf.libthreshold, +buf.machine); + php_uname = tmp_uname; + } +#else if (mode == 's') { php_uname = buf.sysname; } else if (mode == 'r') { @@ -441,6 +465,7 @@ buf.machine); php_uname = tmp_uname; } +#endif /* NETWARE */ } #else php_uname = PHP_UNAME; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
pajoye Wed Mar 5 21:20:14 2008 UTC Modified files: /php-src/main main.c Log: - MFB: #42505, new sendmail default path breaks on Novell (Guenter Knauf) http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.761r2=1.762diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.761 php-src/main/main.c:1.762 --- php-src/main/main.c:1.761 Wed Mar 5 13:35:02 2008 +++ php-src/main/main.c Wed Mar 5 21:20:14 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.761 2008/03/05 13:35:02 dmitry Exp $ */ +/* $Id: main.c,v 1.762 2008/03/05 21:20:14 pajoye Exp $ */ /* {{{ includes */ @@ -460,9 +460,8 @@ * PHP_INCLUDE_PATH */ -#if defined(PHP_PROG_SENDMAIL) !defined(NETWARE) -# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL -t -i -#elif defined(PHP_WIN32) +/* Windows and Netware use the internal mail */ +#if defined(PHP_WIN32) || defined(NETWARE) # define DEFAULT_SENDMAIL_PATH NULL #else # define DEFAULT_SENDMAIL_PATH /usr/sbin/sendmail -t -i -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Fri Mar 7 12:46:19 2008 UTC Modified files: /CVSROOTavail Log: - karma for systems (for myself) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1365r2=1.1366diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1365 CVSROOT/avail:1.1366 --- CVSROOT/avail:1.1365Wed Mar 5 19:42:06 2008 +++ CVSROOT/avail Fri Mar 7 12:46:19 2008 @@ -131,7 +131,7 @@ avail|changelog|php-src,php-gtk,Zend,ZendEngine2,smarty # Some people have access to change the day-to-day code on the various php.net machines -avail|imajes,edink,derick,sfox,wez,goba,mj|systems +avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye|systems # Finally, there are various people with access to various bits and # pieces of other CVS modules. -- 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/exif exif.c
pajoye Fri Mar 7 18:41:02 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/exif exif.c Log: - #44355, compilation breaks due illegal const usage (Guenter Knauf) I suppose it must break on other platform, it is not used anywhere else but here, and it was introduced after 5.2.5 (why no news) http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.23r2=1.173.2.5.2.24diff_format=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.173.2.5.2.23 php-src/ext/exif/exif.c:1.173.2.5.2.24 --- php-src/ext/exif/exif.c:1.173.2.5.2.23 Mon Dec 31 07:20:06 2007 +++ php-src/ext/exif/exif.c Fri Mar 7 18:41:02 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: exif.c,v 1.173.2.5.2.23 2007/12/31 07:20:06 sebastian Exp $ */ +/* $Id: exif.c,v 1.173.2.5.2.24 2008/03/07 18:41:02 pajoye Exp $ */ /* ToDos * @@ -142,7 +142,7 @@ }; /* }}} */ -#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.23 2007/12/31 07:20:06 sebastian Exp $ +#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.24 2008/03/07 18:41:02 pajoye Exp $ /* {{{ PHP_MINFO_FUNCTION */ @@ -242,7 +242,7 @@ /* }}} */ /* {{{ exif dependencies */ -static const zend_module_dep exif_module_deps[] = { +static zend_module_dep exif_module_deps[] = { ZEND_MOD_REQUIRED(standard) #if EXIF_USE_MBSTRING ZEND_MOD_REQUIRED(mbstring) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/exif exif.c
pajoye Fri Mar 7 18:41:59 2008 UTC Modified files: /php-src/ext/exif exif.c Log: - MFB: #44355 compilation breaks due illegal const usage http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.199r2=1.200diff_format=u Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.199 php-src/ext/exif/exif.c:1.200 --- php-src/ext/exif/exif.c:1.199 Mon Dec 31 07:12:09 2007 +++ php-src/ext/exif/exif.c Fri Mar 7 18:41:59 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: exif.c,v 1.199 2007/12/31 07:12:09 sebastian Exp $ */ +/* $Id: exif.c,v 1.200 2008/03/07 18:41:59 pajoye Exp $ */ /* ToDos * @@ -142,7 +142,7 @@ }; /* }}} */ -#define EXIF_VERSION 1.4 $Id: exif.c,v 1.199 2007/12/31 07:12:09 sebastian Exp $ +#define EXIF_VERSION 1.4 $Id: exif.c,v 1.200 2008/03/07 18:41:59 pajoye Exp $ /* {{{ PHP_MINFO_FUNCTION */ @@ -242,7 +242,7 @@ /* }}} */ /* {{{ exif dependencies */ -static const zend_module_dep exif_module_deps[] = { +static zend_module_dep exif_module_deps[] = { ZEND_MOD_REQUIRED(standard) #if EXIF_USE_MBSTRING ZEND_MOD_REQUIRED(mbstring) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue Apr 15 12:13:47 2008 UTC Modified files: /CVSROOTavail Log: - Raphael karma for testfest-web http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1377r2=1.1378diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1377 CVSROOT/avail:1.1378 --- CVSROOT/avail:1.1377Mon Mar 31 14:40:46 2008 +++ CVSROOT/avail Tue Apr 15 12:13:47 2008 @@ -29,7 +29,7 @@ avail|edink,jmertic|win-installer # Testfest web -avail|davidc,lsmith|php-testfest-web +avail|davidc,lsmith,goldoraf|php-testfest-web # The PhD (DocBook build system) lead developers avail|bjori,gwynne|phd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Wed Apr 16 09:17:38 2008 UTC Modified files: /CVSROOTavail Log: - (run|class)kit karma for mlively http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1378r2=1.1379diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1378 CVSROOT/avail:1.1379 --- CVSROOT/avail:1.1378Tue Apr 15 12:13:47 2008 +++ CVSROOT/avail Wed Apr 16 09:17:38 2008 @@ -286,6 +286,7 @@ avail|ramsey|pecl/uploadprogress,pecl/pdo_user avail|seariver|pecl/wxwidgets avail|pestilence669|pecl/xrange +avail|mlively|pecl/runkit,pecl/classkit # Objective-C bridge avail|wez,jan|php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue Apr 22 17:08:53 2008 UTC Modified files: /CVSROOTavail Log: - karma for bindlib_w32 (Liz, Scott, Edin and me, anyone else?) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1380r2=1.1381diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1380 CVSROOT/avail:1.1381 --- CVSROOT/avail:1.1380Tue Apr 22 12:03:09 2008 +++ CVSROOT/avail Tue Apr 22 17:08:53 2008 @@ -322,4 +322,8 @@ avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias,kshepherd,chapg|gd avail|mattias|php-src/ext/gd +# bindlib_w32 karma +# Our bundled version of bindlib (used by php on windows) +avail|auroraeosrose,scottmac,pajoye,edin|bindlib_w32 + # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
pajoye Tue Apr 22 17:27:37 2008 UTC Modified files: /CVSROOTloginfo Log: - add bindlib_w32 and win-installer to php-cvs list http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.128r2=1.129diff_format=u Index: CVSROOT/loginfo diff -u CVSROOT/loginfo:1.128 CVSROOT/loginfo:1.129 --- CVSROOT/loginfo:1.128 Sun Mar 23 21:15:47 2008 +++ CVSROOT/loginfo Tue Apr 22 17:27:37 2008 @@ -1,5 +1,5 @@ # -#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.128 2008/03/23 21:15:47 rasmus Exp $ +#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.129 2008/04/22 17:27:37 pajoye Exp $ # # The loginfo file is used to control where cvs commit log information # is sent. The first entry on a line is a regular expression which is tested @@ -112,7 +112,10 @@ ^portal $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv} # win installer stuff -^win-installer $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv} +^win-installer $CVSROOT/CVSROOT/loginfo.pl php-cvs@lists.php.net $USER %{sVv} + +# bindlib_w32 stuff +^bindlib_w32 $CVSROOT/CVSROOT/loginfo.pl php-cvs@lists.php.net $USER %{sVv} # gd stuff ^gd $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv} -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Wed Apr 23 15:01:02 2008 UTC Modified files: /CVSROOTavail Log: - pecl/fam karma for Thierry http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1383r2=1.1384diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1383 CVSROOT/avail:1.1384 --- CVSROOT/avail:1.1383Tue Apr 22 18:56:15 2008 +++ CVSROOT/avail Wed Apr 23 15:01:01 2008 @@ -288,6 +288,7 @@ avail|seariver|pecl/wxwidgets avail|pestilence669|pecl/xrange avail|mlively|pecl/runkit,pecl/classkit +avail|thierry|pecl/fam # Objective-C bridge avail|wez,jan|php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file bug44805.phpt
pajoye Thu Apr 24 08:45:12 2008 UTC Modified files: /php-src/ext/standard/tests/filebug44805.phpt Log: - improve test and remove files on exit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug44805.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/file/bug44805.phpt diff -u php-src/ext/standard/tests/file/bug44805.phpt:1.2 php-src/ext/standard/tests/file/bug44805.phpt:1.3 --- php-src/ext/standard/tests/file/bug44805.phpt:1.2 Thu Apr 24 07:46:10 2008 +++ php-src/ext/standard/tests/file/bug44805.phpt Thu Apr 24 08:45:11 2008 @@ -1,15 +1,30 @@ --TEST-- Bug#44806 (rename() function is not portable to Windows) +--SKIPIF-- +?php +if (substr(PHP_OS, 0, 3) != 'WIN') { +die('skip.. only for Windows'); +} +? --FILE-- ?php +$dirname = dirname(__FILE__); +$file1 = $dirname . DIRECTORY_SEPARATOR . file1.txt; +$file2 = $dirname . DIRECTORY_SEPARATOR . file2.txt; -file_put_contents(file1.txt, this is file 1); -file_put_contents(file2.txt, this is file 2); +file_put_contents($file1, this is file 1); +file_put_contents($file2, this is file 2); -rename(file1.txt, file2.txt); +rename($file1, $file2); echo reading file 2: ; -readfile(file2.txt); +readfile($file2); +if (file_exists($file1)) { + unlink($file1); +} +if (file_exists($file1)) { + unlink($file2); +} ? --EXPECT-- reading file 2: this is file 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file bug44805.phpt
pajoye Thu Apr 24 08:45:35 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filebug44805.phpt Log: - MFH: improve test and remove files on exit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug44805.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/file/bug44805.phpt diff -u php-src/ext/standard/tests/file/bug44805.phpt:1.1.2.1 php-src/ext/standard/tests/file/bug44805.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/bug44805.phpt:1.1.2.1 Thu Apr 24 07:45:01 2008 +++ php-src/ext/standard/tests/file/bug44805.phpt Thu Apr 24 08:45:35 2008 @@ -1,15 +1,30 @@ --TEST-- Bug#44806 (rename() function is not portable to Windows) +--SKIPIF-- +?php +if (substr(PHP_OS, 0, 3) != 'WIN') { +die('skip.. only for Windows'); +} +? --FILE-- ?php +$dirname = dirname(__FILE__); +$file1 = $dirname . DIRECTORY_SEPARATOR . file1.txt; +$file2 = $dirname . DIRECTORY_SEPARATOR . file2.txt; -file_put_contents(file1.txt, this is file 1); -file_put_contents(file2.txt, this is file 2); +file_put_contents($file1, this is file 1); +file_put_contents($file2, this is file 2); -rename(file1.txt, file2.txt); +rename($file1, $file2); echo reading file 2: ; -readfile(file2.txt); +readfile($file2); +if (file_exists($file1)) { + unlink($file1); +} +if (file_exists($file1)) { + unlink($file2); +} ? --EXPECT-- reading file 2: this is file 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Thu Apr 24 11:33:48 2008 UTC Modified files: /CVSROOTavail Log: - pecl/tcc karma for hamano http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1386r2=1.1387diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1386 CVSROOT/avail:1.1387 --- CVSROOT/avail:1.1386Wed Apr 23 15:54:13 2008 +++ CVSROOT/avail Thu Apr 24 11:33:48 2008 @@ -289,6 +289,7 @@ avail|pestilence669|pecl/xrange avail|mlively|pecl/runkit,pecl/classkit avail|thierry|pecl/fam +avail|hamano|pecl/tcc avail|tetsuya|pear/Services_Yahoo_JP # Objective-C bridge -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue May 6 20:28:15 2008 UTC Modified files: /CVSROOTavail Log: - gd karma for Kalle http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1391r2=1.1392diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1391 CVSROOT/avail:1.1392 --- CVSROOT/avail:1.1391Mon May 5 06:01:12 2008 +++ CVSROOT/avail Tue May 6 20:28:15 2008 @@ -325,7 +325,7 @@ # Please ask [EMAIL PROTECTED] before adding some unknown guys :) # gd/libgd is the library itself, other directories are for # the various tools (website, bugs,...) -avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias,kshepherd,chapg|gd +avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias,kshepherd,chapg,kalle|gd avail|mattias|php-src/ext/gd # bindlib_w32 karma -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Sat May 17 13:01:22 2008 UTC Modified files: /CVSROOTavail Log: - pecl karma for David http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1397r2=1.1398diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1397 CVSROOT/avail:1.1398 --- CVSROOT/avail:1.1397Tue May 13 14:00:51 2008 +++ CVSROOT/avail Sat May 17 13:01:22 2008 @@ -91,7 +91,7 @@ avail|dbs|peclweb # General pecl -avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar|pecl +avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp|pecl # access to gcov.php.net website. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /main main.c
pajoye Wed May 21 15:55:31 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main main.c Log: - actually disable the ASSERT error dialog box (affects debug mode only), helps to run the tests and coverage analyze http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.21r2=1.640.2.23.2.57.2.22diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.21 php-src/main/main.c:1.640.2.23.2.57.2.22 --- php-src/main/main.c:1.640.2.23.2.57.2.21Sat Mar 22 12:56:16 2008 +++ php-src/main/main.c Wed May 21 15:55:31 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.21 2008/03/22 12:56:16 tony2001 Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.22 2008/05/21 15:55:31 pajoye Exp $ */ /* {{{ includes */ @@ -1691,6 +1691,9 @@ if (old_invalid_parameter_handler != NULL) { _set_invalid_parameter_handler(old_invalid_parameter_handler); } + + /* Disable the message box for assertions.*/ + _CrtSetReportMode(_CRT_ASSERT, 0); #endif #else php_os=PHP_OS; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php