com php-src: Merge branch 'PHP-5.5': UPGRADING ext/gd/config.w32
| From: | Pierre Joye | Date: | Mon, 04 Mar 2013 11:03:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': UPGRADING ext/gd/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71390@lists.php.net to get a copy of this message | ||
Commit: 3e0e64f2082bff83348e3f40e0b3d4d1cdc5922a
Author: Pierre Joye <pierre.php@gmail.com> Mon, 4 Mar 2013 12:03:01 +0100
Parents: 02a15898b263c5dcfb7ca663ab7f3b33deb7a8e1 2024ff3b61956f05929f2b87fa259b485cdf0810
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3e0e64f2082bff83348e3f40e0b3d4d1cdc5922a
Log:
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
Changed paths:
MM UPGRADING
MM ext/gd/config.w32
Diff:
diff --cc UPGRADING
index f7eda53,ee1ff67..89107ab
--- 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
========================================