[Pkg-php-commits] r1142 - in ffmpeg-php/trunk/debian: . patches
Raphael Geissert
atomo64-guest at alioth.debian.org
Sat Aug 23 18:47:44 UTC 2008
Author: atomo64-guest
Date: 2008-08-23 18:47:44 +0000 (Sat, 23 Aug 2008)
New Revision: 1142
Added:
ffmpeg-php/trunk/debian/patches/gdtoimage_fix.patch
Modified:
ffmpeg-php/trunk/debian/changelog
ffmpeg-php/trunk/debian/patches/series
Log:
fix the toGDImage method by not using gdImageBoundsSafeMacro, prepare upload
Modified: ffmpeg-php/trunk/debian/changelog
===================================================================
--- ffmpeg-php/trunk/debian/changelog 2008-08-21 17:16:47 UTC (rev 1141)
+++ ffmpeg-php/trunk/debian/changelog 2008-08-23 18:47:44 UTC (rev 1142)
@@ -1,3 +1,11 @@
+ffmpeg-php (0.5.3.1-3) unstable; urgency=low
+
+ * gdtoimage_fix.patch
+ + fix the toGDImage method by not using gdImageBoundsSafeMacro
+ - Thanks to Patrick Matthäi <patrick.matthaei at web.de> for the patch
+
+ -- Raphael Geissert <atomo64 at 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.
Added: ffmpeg-php/trunk/debian/patches/gdtoimage_fix.patch
===================================================================
--- ffmpeg-php/trunk/debian/patches/gdtoimage_fix.patch (rev 0)
+++ ffmpeg-php/trunk/debian/patches/gdtoimage_fix.patch 2008-08-23 18:47:44 UTC (rev 1142)
@@ -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;
+ }
Modified: ffmpeg-php/trunk/debian/patches/series
===================================================================
--- ffmpeg-php/trunk/debian/patches/series 2008-08-21 17:16:47 UTC (rev 1141)
+++ ffmpeg-php/trunk/debian/patches/series 2008-08-23 18:47:44 UTC (rev 1142)
@@ -1 +1,2 @@
allow_persistent_on_persistentMovie.phpt.patch
+gdtoimage_fix.patch
More information about the Pkg-php-commits
mailing list