MFH

NEWS

@@ -17,7 +17,7 @@ PHP 4                                                                      NEWS
 - Added long options into CLI & CGI (e.g. --version). (Marcus)
 - Fixed ext/yaz to not log unless yaz.log_file is set. (Adam Dickmeiss)
 - Fixed ext/exif to honor "magic_quotes_runtime" php.ini option. (Marcus)
-- Synchronized bundled GD library with GD 2.0.14. (Ilia)
+- Synchronized bundled GD library with GD 2.0.15. (Ilia)
 - Added integer overflow checks to bundled GD library. (Ilia)
 - Fixed bug #23913 (make rename() work across partitions on *nix). (Ilia)
 - Fixed bug #23912 (Invalid CSS in phpinfo() output). (Ilia)

ext/gd/gd.c

@@ -386,7 +386,7 @@ PHP_RSHUTDOWN_FUNCTION(gd)
 /* }}} */
 
 #if HAVE_GD_BUNDLED
-#define PHP_GD_VERSION_STRING "bundled (2.0.14 compatible)"
+#define PHP_GD_VERSION_STRING "bundled (2.0.15 compatible)"
 #elif HAVE_LIBGD20
 #define PHP_GD_VERSION_STRING "2.0 or higher"
 #elif HAVE_GDIMAGECOLORRESOLVE

ext/gd/libgd/gd.c

@@ -873,11 +873,6 @@ static void gdImageAntiAliasedApply (gdImagePtr im, int px, int py)
 	float p_dist, p_alpha;
 	unsigned char opacity;
 
-	/* 2.0.13: bounds check! AA_opacity is just as capable of overflowing as the main pixel array. Arne Jorgensen. */
-	if (!gdImageBoundsSafeMacro(im, px, py)) {
-		return;
-	}
-
 	/* 
 	 * Find the perpendicular distance from point C (px, py) to the line 
 	 * segment AB that is being drawn.  (Adapted from an algorithm from the
@@ -892,6 +887,15 @@ static void gdImageAntiAliasedApply (gdImagePtr im, int px, int py)
 	int Bx_Cx = im->AAL_x2 - px;
 	int By_Cy = im->AAL_y2 - py;
 
+	/* 2.0.13: bounds check! AA_opacity is just as capable of
+	 * overflowing as the main pixel array. Arne Jorgensen. 
+	 * 2.0.14: typo fixed. 2.0.15: moved down below declarations
+	 * to satisfy non-C++ compilers.
+	 */
+	if (!gdImageBoundsSafeMacro(im, px, py)) {
+		return;
+	}
+
 	/* Get the squares of the lengths of the segemnts AC and BC. */
 	LAC_2 = (Ax_Cx * Ax_Cx) + (Ay_Cy * Ay_Cy);
 	LBC_2 = (Bx_Cx * Bx_Cx) + (By_Cy * By_Cy);