This commit was manufactured by cvs2svn to create tag 'RELEASE_4_1_1'.release/4.1.1

1 files changed, 0 insertions, 47 deletions

diff --git a/multimedia/mpegedit/files/patch-ad b/multimedia/mpegedit/files/patch-ad
deleted file mode 100644
index 083a71b4700e..000000000000
--- a/multimedia/mpegedit/files/patch-ad
+++ /dev/null
@@ -1,47 +0,0 @@
---- editor/mono_window.C.orig	Sat May 20 17:47:32 1995
-+++ editor/mono_window.C	Thu Feb  3 21:27:07 2000
-@@ -24,6 +24,8 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+extern "C" int XShmGetEventBase(Display *);
-+
- MonoWindow::MonoWindow(UI_Globals *parent,world_c x,world_c y,
- 		       unsigned int height,unsigned int width,
- 		       void (*cb)(void) )
-@@ -137,7 +139,7 @@
-       
-       ximage=XCreateImage(DispPointer(),None,8,ZPixmap,0,&dummy,
- 			  width,height,8,0);
--      ximage->data = new byte[ximage->bytes_per_line*height];
-+      ximage->data = (char *) new byte[ximage->bytes_per_line*height];
-       assert(ximage->data!=NULL);
- #ifdef SH_MEM
-     }
-@@ -154,7 +156,7 @@
-   for(int j = 0; j < GRAY_RANGE; j ++)
-     {
-       tmp_pixel = col_array[j];
--      XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0);
-+      XFreeColors(DispPointer(), Colourmap, (unsigned long int *) &tmp_pixel, 1, 0);
-     }
-   XFreeGC(DispPointer(),gc);
- 
-@@ -222,7 +224,7 @@
- 	  for(int j = 0; j < i; j ++)
- 	    {
- 	      tmp_pixel = col_array[j];
--	      XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0);
-+	      XFreeColors(DispPointer(), Colourmap, (unsigned long int *) &tmp_pixel, 1, 0);
- 	    }
- 	  cerr << "Unable to allocate the colours required to make the\n"
- 	       << "monochrome window.  Please re-run with the option "
-@@ -254,7 +256,7 @@
- {
-   assert(Frame.width()==ximage->width);
-   assert(Frame.height()==ximage->height);
--  DitherImage(Frame.lum_ptr(),ximage->data,ximage->width*ximage->height);
-+  DitherImage(Frame.lum_ptr(),(unsigned char *)ximage->data,ximage->width*ximage->height);
-   if(nicely)
-     {
-       XEvent Event;