Patch php-gd-newvpx.diff for GD related Bug #69479

Patch version 2015-04-18 08:57 UTC

• 2015-04-18 08:57 UTC [diff to current]

Developer: yui@funpanda.ru

diff -urN php-5.5.24.org/ext/gd/libgd/webpimg.c php-5.5.24/ext/gd/libgd/webpimg.c
--- php-5.5.24.org/ext/gd/libgd/webpimg.c	2015-04-15 13:43:00.000000000 +0300
+++ php-5.5.24/ext/gd/libgd/webpimg.c	2015-04-18 11:46:36.247244985 +0300
@@ -706,14 +722,14 @@
     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);