Merge branch 'PHP-5.5'

pierrejoye · pierrejoye · commit 09854f1fb9d4 · 2013-03-20T12:34:51.000+01:00
* PHP-5.5:
  - add gd changes

Conflicts:
	UPGRADING
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -5486,8 +5486,6 @@ PHP_FUNCTION(imageaffine)
 		pRect = NULL;
 	}
 
-
-	//int gdTransformAffineGetImage(gdImagePtr *dst, const gdImagePtr src, gdRectPtr src_area, const double affine[6]);
 	if (gdTransformAffineGetImage(&dst, src, pRect, affine) != GD_TRUE) {
 		RETURN_FALSE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -5486,8 +5486,6 @@ PHP_FUNCTION(imageaffine)`
`5486`	`5486`	`pRect = NULL;`
`5487`	`5487`	`}`
`5488`	`5488`
`5489`		`-`
`5490`		`- //int gdTransformAffineGetImage(gdImagePtr *dst, const gdImagePtr src, gdRectPtr src_area, const double affine[6]);`
`5491`	`5489`	`if (gdTransformAffineGetImage(&dst, src, pRect, affine) != GD_TRUE) {`
`5492`	`5490`	`RETURN_FALSE;`
`5493`	`5491`	`}`