packages: php-ffmpeg/gdImageBoundsSafe.patch - gdImageBoundsSafe is still b...

[glen]

Author: glen                         Date: Thu Jun 25 20:08:50 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gdImageBoundsSafe is still broken

---- Files affected:
packages/php-ffmpeg:
   gdImageBoundsSafe.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/php-ffmpeg/gdImageBoundsSafe.patch
diff -u packages/php-ffmpeg/gdImageBoundsSafe.patch:1.1 packages/php-ffmpeg/gdImageBoundsSafe.patch:1.2
--- packages/php-ffmpeg/gdImageBoundsSafe.patch:1.1	Thu Jun 25 22:07:36 2009
+++ packages/php-ffmpeg/gdImageBoundsSafe.patch	Thu Jun 25 22:08:45 2009
@@ -1,12 +1,13 @@
 --- ffmpeg-php-0.6.0/ffmpeg_frame.c~	2009-06-25 23:06:11.000000000 +0300
 +++ ffmpeg-php-0.6.0/ffmpeg_frame.c	2009-06-25 23:06:13.837516462 +0300
-@@ -284,15 +284,14 @@
+@@ -284,15 +284,15 @@
      int x, y;
      int *src = (int*)frame->data[0];
  
-+	if (!gdImageBoundsSafeMacro(dest, width, height)) {
++	// disable gdImageBoundsSafeMacro it just returns gibberish
++	/*if (!gdImageBoundsSafeMacro(dest, width, height)) {
 +		return -1;
-+	}
++	}*/
 +
      for (y = 0; y < height; y++) {
          for (x = 0; x < width; x++) {
@@ -22,13 +23,3 @@
          }
          src += width;
      }
-@@ -342,8 +341,7 @@
- 
-     FFMPEG_PHP_FETCH_IMAGE_RESOURCE(gd_img, &return_value);
- 
--    if (_php_avframe_to_gd_image(ff_frame->av_frame, gd_img,
--            ff_frame->width, ff_frame->height)) {
-+    if (_php_avframe_to_gd_image(ff_frame->av_frame, gd_img, ff_frame->width, ff_frame->height)) {
-         zend_error(E_ERROR, "failed to convert frame to gd image");
-     }
- }
================================================================

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