Merge branch 'PHP-5.5'

* PHP-5.5: fix #64898imagerotate is broken with bilinear interpolation
mudou · May 27, 2013 · 8059ec1 · 8059ec1
2 parents 6e081f8 + 2f01e06
commit 8059ec1
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
@@ -1833,18 +1833,18 @@ gdImagePtr gdImageRotateBilinear(gdImagePtr src, const float degrees, const int
 				const gdFixed f_w4 = gd_mulfx(f_f, f_g);
 
 				if (n < src_w - 1) {
-					src_offset_x = m + 1;
-					src_offset_y = n;
+					src_offset_x = n + 1;
+					src_offset_y = m;
 				}
 
 				if (m < src_h-1) {
-					src_offset_x = m;
-					src_offset_y = n + 1;
+					src_offset_x = n;
+					src_offset_y = m + 1;
 				}
 
 				if (!((n >= src_w-1) || (m >= src_h-1))) {
-					src_offset_x = m + 1;
-					src_offset_y = n + 1;
+					src_offset_x = n + 1;
+					src_offset_y = m + 1;
 				}
 				{
 					const int pixel1 = src->tpixels[src_offset_y][src_offset_x];