com php-src: Fixed Bug #69479 GD fails to build with newer libvpx: ext/gd/libgd/webpimg.c
| From: | Remi Collet | Date: | Sun, 24 May 2015 07:37:12 +0000 |
| Subject: | com php-src: Fixed Bug #69479 GD fails to build with newer libvpx: ext/gd/libgd/webpimg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86895@lists.php.net to get a copy of this message | ||
Commit: e807e07bfa22eefd5aebf13498c1df16c90afb0a
Author: Remi Collet <remi@php.net> Sun, 24 May 2015 09:37:12 +0200
Parents: d9c266f4c91ab4cbee1c334f078c63519ab21395
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e807e07bfa22eefd5aebf13498c1df16c90afb0a
Log:
Fixed Bug #69479 GD fails to build with newer libvpx
From upstream https://github.com/libgd/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8
Fix build with latest libvpx 1.4.0
These new constants exist at least since 1.0.0
Compatibility ones have been droped in 1.4.0
Bugs:
https://bugs.php.net/69479
Changed paths:
M ext/gd/libgd/webpimg.c
Diff:
diff --git a/ext/gd/libgd/webpimg.c b/ext/gd/libgd/webpimg.c
index 01bef93..1ea3495 100644
--- a/ext/gd/libgd/webpimg.c
+++ b/ext/gd/libgd/webpimg.c
@@ -706,14 +706,14 @@ static WebPResult VPXEncode(const uint8* Y,
codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- vpx_img_wrap(&img, IMG_FMT_I420,
+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
y_width, y_height, 16, (uint8*)(Y));
- img.planes[PLANE_Y] = (uint8*)(Y);
- img.planes[PLANE_U] = (uint8*)(U);
- img.planes[PLANE_V] = (uint8*)(V);
- img.stride[PLANE_Y] = y_stride;
- img.stride[PLANE_U] = uv_stride;
- img.stride[PLANE_V] = uv_stride;
+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
+ img.planes[VPX_PLANE_U] = (uint8*)(U);
+ img.planes[VPX_PLANE_V] = (uint8*)(V);
+ img.stride[VPX_PLANE_Y] = y_stride;
+ img.stride[VPX_PLANE_U] = uv_stride;
+ img..stride[VPX_PLANE_V] = uv_stride;
res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);