| 64f59a70 |
1 | diff -ur php-4.2.3.orig/ext/gd/gd.c php-4.2.3/ext/gd/gd.c |
| 2 | --- php-4.2.3.orig/ext/gd/gd.c Tue Sep 3 15:09:29 2002 |
| 3 | +++ php-4.2.3/ext/gd/gd.c Sun Jan 2 17:42:49 2005 |
| 4 | @@ -1011,10 +1011,10 @@ |
| 5 | io_ctx = gdNewDynamicCtx (8, data); |
| 6 | if (io_ctx) { |
| 7 | if (getmbi(gdGetC, io_ctx) == 0 && skipheader(gdGetC, io_ctx) == 0 ) { |
| 8 | - io_ctx->free(io_ctx); |
| 9 | + io_ctx->gd_free(io_ctx); |
| 10 | return PHP_GDIMG_TYPE_WBM; |
| 11 | } else |
| 12 | - io_ctx->free(io_ctx); |
| 13 | + io_ctx->gd_free(io_ctx); |
| 14 | } |
| 15 | } |
| 16 | #endif |
| 17 | @@ -1206,7 +1206,7 @@ |
| 18 | } else { |
| 19 | im = (*ioctx_func_p)(io_ctx); |
| 20 | } |
| 21 | - io_ctx->free(io_ctx); |
| 22 | + io_ctx->gd_free(io_ctx); |
| 23 | #endif |
| 24 | } else { |
| 25 | if (image_type == PHP_GDIMG_TYPE_GD2PART) { |
| 26 | diff -ur php-4.2.3.orig/ext/gd/gd_ctx.c php-4.2.3/ext/gd/gd_ctx.c |
| 27 | --- php-4.2.3.orig/ext/gd/gd_ctx.c Sun Aug 5 18:21:29 2001 |
| 28 | +++ php-4.2.3/ext/gd/gd_ctx.c Sun Jan 2 17:43:54 2005 |
| 29 | @@ -67,7 +67,7 @@ |
| 30 | ctx = emalloc(sizeof(gdIOCtx)); |
| 31 | ctx->putC = _php_image_output_putc; |
| 32 | ctx->putBuf = _php_image_output_putbuf; |
| 33 | - ctx->free = _php_image_output_ctxfree; |
| 34 | + ctx->gd_free = _php_image_output_ctxfree; |
| 35 | |
| 36 | #if APACHE && defined(CHARSET_EBCDIC) |
| 37 | /* XXX this is unlikely to work any more thies@thieso.net */ |
| 38 | @@ -95,7 +95,7 @@ |
| 39 | break; |
| 40 | } |
| 41 | |
| 42 | - ctx->free(ctx); |
| 43 | + ctx->gd_free(ctx); |
| 44 | |
| 45 | if(fp) { |
| 46 | fflush(fp); |
projects / packages / php.git / blame