diff -u xmrm20/Makefile xmrm20-mandrake8/Makefile
--- xmrm20/Makefile	Tue Mar 10 00:00:00 1998
+++ xmrm20-mandrake8/Makefile	Tue Sep  4 21:50:49 2001
@@ -29,14 +29,15 @@
 #COMPILE_FLAGS = -O3 -m486 -c
 
 # -O: normal optimization level  -c: don't link yet
-COMPILE_FLAGS = -O -c
+COMPILE_FLAGS = -O -I. -I/usr/X11R6/include -I/home/guido/xmrm/xforms/xforms/FORMS -c 
 
 # -s: DESTROYS symbol-table
 LINK_FLAGS = -s
 
 
-SYSLIB = -L/usr/X11R6/lib -lX11 -lm
+SYSLIB = -L/usr/X11R6/lib -L/home/guido/xmrm/xforms/xforms/FORMS -lX11 -lm
 LIBS = -L/usr/lib -ltiff -ljpeg -lgz -lforms -lXpm $(SYSLIB)
+LIBS = -L/usr/local/lib -L/usr/lib -ltiff -ljpeg -lforms -lXpm $(SYSLIB)
 
 OBJECTS = xmrm.o xmrm_cb.o io.o morphvec.o init.o wavemorph.o wave_rts.o wave.o\
           areas.o xmrm_main.o
Only in xmrm20-mandrake8: areas.o
diff -u xmrm20/init.cc xmrm20-mandrake8/init.cc
--- xmrm20/init.cc	Tue Mar 10 00:00:00 1998
+++ xmrm20-mandrake8/init.cc	Tue Sep  4 20:19:13 2001
@@ -2,6 +2,7 @@
 //   Idea: Manfred Kopp
 //   Programming: Gerhard Waldhör, Andreas Artmann
 
+#include 
 #include 
 #include "init.h"
 #include "const.h"
Only in xmrm20-mandrake8: init.o
diff -u xmrm20/io.cc xmrm20-mandrake8/io.cc
--- xmrm20/io.cc	Tue Mar 10 00:00:00 1998
+++ xmrm20-mandrake8/io.cc	Tue Sep  4 20:16:40 2001
@@ -1534,7 +1534,7 @@
   TIFF *tif;
   int tif_h,tif_v=0;
   int i,pic_num,pic_count,width,height;
-  char number[6];
+  char number[8];
   char cmdbuf[BUFSIZ];
   int val_Save_Start,val_Save_Step,val_NumPics;
   unsigned long *raster;
@@ -1720,7 +1720,7 @@
 //    extension--;
     
     i=0;
-    number = ".000.";
+    strcpy(number,".000.");
     while ( !(extension = strstr(extension,number)) && i<=999 )
     {
       i++;
Only in xmrm20-mandrake8: io.o
diff -u xmrm20/morphvec.cc xmrm20-mandrake8/morphvec.cc
--- xmrm20/morphvec.cc	Tue Mar 10 00:00:00 1998
+++ xmrm20-mandrake8/morphvec.cc	Tue Sep  4 20:18:03 2001
@@ -17,7 +17,7 @@
 
 extern Display *disp;
 
-extern max_x,max_y;
+extern int max_x,max_y;
 extern ControlClass control;
 extern VisualInfoClass vis;
 extern WindowClass *s_win, *d_win;
Only in xmrm20-mandrake8: morphvec.o
Only in xmrm20-mandrake8: wave.o
Only in xmrm20-mandrake8: wave_rts.o
Only in xmrm20-mandrake8: wavemorph.o
Only in xmrm20-mandrake8: xmrm
Only in xmrm20-mandrake8: xmrm.o
Only in xmrm20-mandrake8: xmrm_cb.o
diff -u xmrm20/xmrm_main.cc xmrm20-mandrake8/xmrm_main.cc
--- xmrm20/xmrm_main.cc	Tue Mar 10 00:00:00 1998
+++ xmrm20-mandrake8/xmrm_main.cc	Tue Sep  4 20:25:21 2001
@@ -308,7 +308,7 @@
   control.debug = 0;
   
   /* Init control: */
-  control.ControlClass(); // call constructor
+  //control.ControlClass(); // call constructor
   temp = control.URL_manual;
 
   while( (c=getopt(argc, argv, "hdm:p:")) != -1)
Only in xmrm20-mandrake8: xmrm_main.o
Only in xmrm20-mandrake8: xmrm_mpeg
Only in xmrm20-mandrake8: xmrm_mpeg.o
diff -u xmrm20/xmrm_mpeg_main.cc xmrm20-mandrake8/xmrm_mpeg_main.cc
--- xmrm20/xmrm_mpeg_main.cc	Tue Mar 10 00:00:00 1998
+++ xmrm20-mandrake8/xmrm_mpeg_main.cc	Tue Sep  4 21:11:59 2001
@@ -8,6 +8,7 @@
 #include 
 #include 
 #include "xmrm_mpeg.h"
+#include "const.h"
 
 #define MAX_PIC_NUM 999
 #define BORDER_WIDTH -1
@@ -36,8 +37,8 @@
 
     char *filename_ppm, *filename_yuv;
     char *extension;                    // points to '.###.tif' - used to modify '###'
-    char number_str[6];                 // holds '.###.'
-    char even[6];                       // ".even" if files have to be even-sized, ""(empty) otherwise
+    char number_str[7];                 // holds '.###.'
+    char even[7];                       // ".even" if files have to be even-sized, ""(empty) otherwise
 
     int abs_count;                      // absolute count of valid pictures
     int first_width, first_height;
@@ -68,7 +69,8 @@
 {
   int count = 0;
 
-  backup_class->number_str = ".000.";
+  //backup_class->number_str = ".000.";
+  strcpy(backup_class->number_str,".000.");
 
   while ( !(*ext = strstr(fname_only,backup_class->number_str)) && (count <= MAX_PIC_NUM) )
   {
@@ -417,7 +419,7 @@
       // Check for even picture size
       if ( (tif_w % 2) || (tif_h % 2) )
       {
-        work_class->even = ".even";
+        strcpy(work_class->even,".even");
         if ( Even_Size( tif, tif_w, tif_h) )
           return 1;
       }
Only in xmrm20-mandrake8: xmrm_mpeg_main.o

mirror server hosted at Truenetwork, Russian Federation.