packages: php-ffmpeg/gdImageBoundsSafe.patch - gdImageBoundsSafeMacro retur...

[glen]

Author: glen                         Date: Fri Jun 26 00:57:17 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gdImageBoundsSafeMacro returns always true as workaround

---- Files affected:
packages/php-ffmpeg:
   gdImageBoundsSafe.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/php-ffmpeg/gdImageBoundsSafe.patch
diff -u packages/php-ffmpeg/gdImageBoundsSafe.patch:1.4 packages/php-ffmpeg/gdImageBoundsSafe.patch:1.5
--- packages/php-ffmpeg/gdImageBoundsSafe.patch:1.4	Fri Jun 26 02:42:45 2009
+++ packages/php-ffmpeg/gdImageBoundsSafe.patch	Fri Jun 26 02:57:11 2009
@@ -1,8 +1,17 @@
 no idea why he enabled it, still broken here
 http://ffmpeg-php.svn.sourceforge.net/viewvc/ffmpeg-php/trunk/ffmpeg-php/ffmpeg_frame.c?view=log&sortby=date&pathrev=520
 
---- ffmpeg-php-0.6.0/ffmpeg_frame.c	2009-06-25 23:06:13.837516462 +0300
-+++ ffmpeg-php-0.6.2/ffmpeg_frame.c	2009-06-26 00:25:46.041340289 +0300
+--- ffmpeg-php-0.6.2/ffmpeg_frame.c	2009-06-26 00:25:46.041340289 +0300
++++ ffmpeg-php-0.6.0/ffmpeg_frame.c	2009-06-26 02:28:30.532505030 +0300
+@@ -61,7 +61,7 @@
+ }
+ 
+ // Borrowed from gd.c
+-#define gdImageBoundsSafeMacro(im, x, y) (!((((y) < (im)->cy1) || ((y) > (im)->cy2)) || (((x) < (im)->cx1) || ((x) > (im)->cx2))))
++#define gdImageBoundsSafeMacro(im, x, y) (1)
+ 
+ static int le_gd; // this is only valid after calling 
+                   // FFMPEG_PHP_FETCH_IMAGE_RESOURCE() 
 @@ -284,15 +284,14 @@
      int x, y;
      int *src = (int*)frame->data[0];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-ffmpeg/gdImageBoundsSafe.patch?r1=1.4&r2=1.5&f=u