Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src:
  fix BELL constant declaration
  merging conflict left over
  fix typo
  add definition for 5.5
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
  - fix regression (imagerotate_overflow.phpt), fix for all cases
  - fix regression bug24155.phpt and bug39366.phpt
  - fix regression (imagerotate_overflow.phpt)
  fix memory leak
  - ws
  - add gd changes
  - update the comment to match the code/features
  setting plausible default value for struct members
  Fixed test after nick previous fix

Author: keyurdg

UPGRADING.INTERNALS

@@ -3,8 +3,7 @@ $Id$
 UPGRADE NOTES - PHP X.Y
 
 1. Internal API changes
-  a. Streams pooling API
-  b. Lowercasing and locales
+  a.
 
 2. Build system changes
   a. Unix build system changes
@@ -15,44 +14,6 @@ UPGRADE NOTES - PHP X.Y
 1. Internal API changes
 ========================
 
-	a. Streams pooling API
-
-The streams pooling API has been removed. The following functions no longer
-exist:
-
-PHPAPI int php_stream_context_get_link(php_stream_context *context,
-		const char *hostent, php_stream **stream);
-PHPAPI int php_stream_context_set_link(php_stream_context *context,
-		const char *hostent, php_stream *stream);
-PHPAPI int php_stream_context_del_link(php_stream_context *context,
-		php_stream *stream);
-
-	b. Lowercasing and locales
-
-The lowercasing functions in zend_operators.c were split into those that do 
-lowercasing according to locale rules and those that do ASCII lowercasing.
-ASCII:
-
-                zend_str_tolower_copy
-                zend_str_tolower_dup
-                zend_str_tolower
-                zend_binary_strcasecmp
-                zend_binary_strncasecmp
-
-Locale-based:
-                zend_binary_strncasecmp_l
-                zend_binary_strcasecmp_l
-                zend_binary_zval_strcasecmp
-                zend_binary_zval_strncasecmp
-                string_compare_function_ex
-                string_case_compare_function
-
-Internal engine lowercasing will be using ASCII-only rules. User-facing functions,
-such as strcasecmp, will be using locale rules. 
-
-Two new functions - zend_binary_strncasecmp_l and zend_binary_strcasecmp_l - added as 
-locale-based counterparts to zend_binary_strcasecmp and zend_binary_strncasecmp.
-
 ========================
 2. Build system changes
 ========================
@@ -61,5 +22,5 @@ locale-based counterparts to zend_binary_strcasecmp and zend_binary_strncasecmp.
     - 
 
   b. Windows build system changes
-    - Drop Windows XP and 2003 support.
+    - 
 

Zend/zend_ini_scanner_defs.h

@@ -1,13 +1,13 @@
-/* Generated by re2c 0.13.5 */
-#line 3 "Zend/zend_ini_scanner_defs.h"
-
-enum YYCONDTYPE {
-	yycINITIAL,
-	yycST_OFFSET,
-	yycST_SECTION_VALUE,
-	yycST_VALUE,
-	yycST_SECTION_RAW,
-	yycST_DOUBLE_QUOTES,
-	yycST_VARNAME,
-	yycST_RAW,
-};
+/* Generated by re2c 0.13.5 */
+#line 3 "Zend/zend_ini_scanner_defs.h"
+
+enum YYCONDTYPE {
+	yycINITIAL,
+	yycST_OFFSET,
+	yycST_SECTION_VALUE,
+	yycST_VALUE,
+	yycST_SECTION_RAW,
+	yycST_DOUBLE_QUOTES,
+	yycST_VARNAME,
+	yycST_RAW,
+};

ext/gd/gd.c

@@ -83,6 +83,10 @@ static void php_free_ps_enc(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 # endif
 #endif
 
+#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
+# include "X11/xpm.h"
+#endif
+
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
@@ -124,6 +128,10 @@ int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b);
 #define gdNewDynamicCtxEx(len, data, val) gdNewDynamicCtx(len, data)
 #endif
 
+/* as it is not really public, duplicate declaration here to avoid 
+   pointless warnings */
+int overflow2(int a, int b);
+
 /* Section Filters Declarations */
 /* IMPORTANT NOTE FOR NEW FILTER
  * Do not forget to update:
@@ -1265,7 +1273,7 @@ PHP_MINIT_FUNCTION(gd)
 	REGISTER_LONG_CONSTANT("IMG_CROP_THRESHOLD", GD_CROP_THRESHOLD, CONST_CS | CONST_PERSISTENT);
 
 
-	REGISTER_LONG_CONSTANT("IMG_BELL", GD_BILINEAR_FIXED, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("IMG_BELL", GD_BELL, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("IMG_BESSEL", GD_BESSEL, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("IMG_BILINEAR_FIXED", GD_BILINEAR_FIXED, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("IMG_BICUBIC", GD_BICUBIC, CONST_CS | CONST_PERSISTENT);
@@ -2266,7 +2274,7 @@ PHP_FUNCTION(imagerotate)
 
 	ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd);
 
-	im_dst = gdImageRotateInterpolated(im_src, (float)degrees, color);
+	im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);
 
 	if (im_dst != NULL) {
 		ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd);
@@ -5489,8 +5497,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;
 	}

ext/gd/libgd/gd.h

@@ -845,8 +845,7 @@ gdImagePtr gdImageRotateNearestNeighbour(gdImagePtr src, const float degrees, co
 gdImagePtr gdImageRotateBilinear(gdImagePtr src, const float degrees, const int bgColor);
 gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, const float degrees, const int bgColor);
 gdImagePtr gdImageRotateGeneric(gdImagePtr src, const float degrees, const int bgColor);
-
-
+gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, int bgcolor);
 
 typedef enum {
 	GD_AFFINE_TRANSLATE = 0,

ext/gd/libgd/gd_interpolation.c

@@ -1,4 +1,5 @@
 /*
+ * The two pass scaling function is based on:
  * Filtered Image Rescaling
  * Based on Gems III
  *  - Schumacher general filtered image rescaling
@@ -13,6 +14,7 @@
  *
  * 	Initial sources code is avaibable in the Gems Source Code Packages:
  * 	http://www.acm.org/pubs/tog/GraphicsGems/GGemsIII.tar.gz
+ *
  */
 
 /*
@@ -34,6 +36,17 @@
 
 */
 
+/*
+	Additional functions are available for simple rotation or up/downscaling.
+	downscaling using the fixed point implementations are usually much faster
+	than the existing gdImageCopyResampled while having a similar or better
+	quality.
+	
+	For image rotations, the optimized versions have a lazy antialiasing for 
+	the edges of the images. For a much better antialiased result, the affine
+	function is recommended.
+*/
+
 /*
 TODO:
  - Optimize pixel accesses and loops once we have continuous buffer
@@ -805,10 +818,6 @@ int getPixelInterpolated(gdImagePtr im, const double x, const double y, const in
 		return -1;
 	}
 
-	/* Default to full alpha */
-	if (bgColor == -1) {
-	}
-
 	if (im->interpolation_id == GD_WEIGHTED4) {
 		return getPixelInterpolateWeight(im, x, y, bgColor);
 	}
@@ -1704,6 +1713,7 @@ gdImagePtr gdImageRotateNearestNeighbour(gdImagePtr src, const float degrees, co
 gdImagePtr gdImageRotateGeneric(gdImagePtr src, const float degrees, const int bgColor)
 {
 	float _angle = ((float) (-degrees / 180.0f) * (float)M_PI);
+	const int angle_rounded = (int)floor(degrees * 100);
 	const int src_w  = gdImageSX(src);
 	const int src_h = gdImageSY(src);
 	const unsigned int new_width = (unsigned int)(abs((int)(src_w * cos(_angle))) + abs((int)(src_h * sin(_angle))) + 0.5f);
@@ -1725,6 +1735,10 @@ gdImagePtr gdImageRotateGeneric(gdImagePtr src, const float degrees, const int b
 							f_slop_x > f_slop_y ? gd_divfx(f_slop_y, f_slop_x) : gd_divfx(f_slop_x, f_slop_y)
 						: 0;
 
+	if (bgColor < 0) {
+		return NULL;
+	}
+
 	/* impact perf a bit, but not that much. Implementation for palette
 	   images can be done at a later point.
 	*/