Please unblock ffmpeg-php
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
Please
unblock ffmpeg-php/0.5.3.1-3
It fixes a bug restoring some functionality to the package.
Debdiff between version in testing and the one in unstable attached.
Thanks in advance.
Kind regards,
- --
Atomo64 - Raphael
Please avoid sending me Word, PowerPoint or Excel attachments.
See http://www.gnu.org/philosophy/no-word-attachments.html
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkiyBUoACgkQYy49rUbZzloNbACgh4d7jvloRevgHfQK3/7JCSLw
rUkAmwVs/CKvXYb4vCkfRoFpR6A/LqMz
=zo06
-----END PGP SIGNATURE-----
diff -u ffmpeg-php-0.5.3.1/debian/changelog ffmpeg-php-0.5.3.1/debian/changelog
--- ffmpeg-php-0.5.3.1/debian/changelog
+++ ffmpeg-php-0.5.3.1/debian/changelog
@@ -1,3 +1,11 @@
+ffmpeg-php (0.5.3.1-3) unstable; urgency=low
+
+ * gdtoimage_fix.patch (Closes: #496079)
+ + fix the toGDImage method by not using gdImageBoundsSafeMacro
+ - Thanks to Patrick Matthäi <patrick.matthaei@web.de> for the patch
+
+ -- Raphael Geissert <atomo64@gmail.com> Mon, 07 Jul 2008 18:24:47 -0500
+
ffmpeg-php (0.5.3.1-2) unstable; urgency=low
* Fix build failure caused by chrpath returning an exit status of 2.
diff -u ffmpeg-php-0.5.3.1/debian/patches/series ffmpeg-php-0.5.3.1/debian/patches/series
--- ffmpeg-php-0.5.3.1/debian/patches/series
+++ ffmpeg-php-0.5.3.1/debian/patches/series
@@ -1,0 +2 @@
+gdtoimage_fix.patch
only in patch2:
unchanged:
--- ffmpeg-php-0.5.3.1.orig/debian/patches/gdtoimage_fix.patch
+++ ffmpeg-php-0.5.3.1/debian/patches/gdtoimage_fix.patch
@@ -0,0 +1,25 @@
+diff -Naur ffmpeg-php-0.5.3.1.orig/ffmpeg_frame.c ffmpeg-php-0.5.3.1/ffmpeg_frame.c
+--- ffmpeg-php-0.5.3.1.orig/ffmpeg_frame.c 2008-08-22 17:03:55.000000000 +0200
++++ ffmpeg-php-0.5.3.1/ffmpeg_frame.c 2008-08-22 17:06:15.000000000 +0200
+@@ -396,15 +396,14 @@
+ int x, y;
+ int *src = (int*)frame->data[0];
+
++ if(width > dest->sx || height > dest->sy){
++ return -1;
++ }
++
+ for (y = 0; y < height; y++) {
+ for (x = 0; x < width; x++) {
+-
+- if (gdImageBoundsSafeMacro(dest, x, y)) {
+- /* copy pixel to gdimage buffer zeroing the alpha channel */
+- dest->tpixels[y][x] = src[x] & 0x00ffffff;
+- } else {
+- return -1;
+- }
++ /* copy pixel to gdimage buffer zeroing the alpha channel */
++ dest->tpixels[y][x] = src[x] & 0x00ffffff;
+ }
+ src += width;
+ }
Reply to: