Merge branch 'PHP-5.5'

* PHP-5.5:
  remove comments
This commit is contained in:
Pierre Joye 2013-03-25 03:14:40 +01:00
commit f21f37bb4c

View File

@ -59,7 +59,6 @@ TODO:
#include <math.h>
#include <gd.h>
//#include "gd_resize.h"
#include "gdhelpers.h"
#ifdef _MSC_VER
@ -313,7 +312,6 @@ static double filter_bessel(const double x)
static double filter_blackman(const double x)
{
//if (fabs(x)>1) return 0.0f;
return (0.42f+0.5f*(double)cos(M_PI*x)+0.08f*(double)cos(2.0f*M_PI*x));
}
@ -657,20 +655,17 @@ static inline int getPixelOverflowTC(gdImagePtr im, const int x, const int y, co
register int border;
if (y < im->cy1) {
//border = gdImageGetPixel(im, im->cx1, 0);
border = im->tpixels[0][im->cx1];
3 border = im->tpixels[0][im->cx1];
goto processborder;
}
if (y < im->cy1) {
//border = gdImageGetPixel(im, im->cx1, 0);
border = im->tpixels[0][im->cx1];
goto processborder;
}
if (y > im->cy2) {
if (x >= im->cx1 && x <= im->cx1) {
//border = gdImageGetPixel(im, x, im->cy2);
border = im->tpixels[im->cy2][x];
goto processborder;
} else {
@ -680,13 +675,11 @@ static inline int getPixelOverflowTC(gdImagePtr im, const int x, const int y, co
/* y is bound safe at this point */
if (x < im->cx1) {
//border = gdImageGetPixel(im, im->cx1, y);
border = im->tpixels[y][im->cx1];
goto processborder;
}
if (x > im->cx2) {
//border = gdImageGetPixel(im, im->cx2, y);
border = im->tpixels[y][im->cx2];
}
@ -1167,20 +1160,17 @@ static inline int getPixelOverflowColorTC(gdImagePtr im, const int x, const int
} else {
register int border;
if (y < im->cy1) {
//border = gdImageGetPixel(im, im->cx1, 0);
border = im->tpixels[0][im->cx1];
goto processborder;
}
if (y < im->cy1) {
//border = gdImageGetPixel(im, im->cx1, 0);
border = im->tpixels[0][im->cx1];
goto processborder;
}
if (y > im->cy2) {
if (x >= im->cx1 && x <= im->cx1) {
//border = gdImageGetPixel(im, x, im->cy2);
border = im->tpixels[im->cy2][x];
goto processborder;
} else {
@ -1190,13 +1180,11 @@ static inline int getPixelOverflowColorTC(gdImagePtr im, const int x, const int
/* y is bound safe at this point */
if (x < im->cx1) {
//border = gdImageGetPixel(im, im->cx1, y);
border = im->tpixels[y][im->cx1];
goto processborder;
}
if (x > im->cx2) {
//border = gdImageGetPixel(im, im->cx2, y);
border = im->tpixels[y][im->cx2];
}