From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 4 Mar 2013 11:03:01 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~501
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e0e64f2082bff83348e3f40e0b3d4d1cdc5922a;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  - add test for imagecropauto
  - (s)rgb distance works way better for now, re enable threshold
  - disable threshold for now, will enable it again using CIEDE2000
  - add todo for threshold
  - clean and enable threshold
  - add image crop support

Conflicts:
	UPGRADING
---

3e0e64f2082bff83348e3f40e0b3d4d1cdc5922a
diff --cc UPGRADING
index f7eda53519,ee1ff67c85..89107abbb1
--- a/UPGRADING
+++ b/UPGRADING
@@@ -68,6 -304,25 +68,28 @@@ PHP X.Y UPGRADE NOTE
  9. New Global Constants
  ========================================
  
++<<<<<<< HEAD
++=======
+ - mysqli:
+   - Added MYSQLI_SERVER_PUBLIC_KEY constant to be used with mysqli_options()
+ 
+ - cURL:
+   - Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt().
+ 
+ - GD
+   - Added constants for imageflip:
+     . IMG_FLIP_HORIZONTAL
+ 	. IMG_FLIP_VERTICAL
+     . IMG_FLIP_BOTH
+   - Added constants for imagecrop
+     . IMG_CROP_DEFAULT
+     . IMG_CROP_TRANSPARENT
+     . IMG_CROP_BLACK
+     . IMG_CROP_WHITE
+     . IMG_CROP_SIDES
+     . IMG_CROP_THRESHOLD
+ 
++>>>>>>> PHP-5.5
  ========================================
  10. Changes to INI File Handling
  ========================================