pvmpov-cvs Mailing List for PVM patch for POV-Ray

Brought to you by: adilger, flierl

pvmpov-cvs — cvs commits

This list is closed, nobody may subscribe to it.

2002	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov (1)	_Dec (4)
2003	_Jan (2)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

[PVMPOV-CVS] pvmpov_3_5/src pvm.cpp,1.5,1.6

From: <mat...@us...> - 2003-01-02 06:53:24

Update of /cvsroot/pvmpov/pvmpov_3_5/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31503

Modified Files:
	pvm.cpp 
Log Message:
MG * Fix a previous fix in pvm.cpp that turned out to be a bug


Index: pvm.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/pvm.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pvm.cpp	1 Jan 2003 10:58:08 -0000	1.5
--- pvm.cpp	2 Jan 2003 06:53:21 -0000	1.6
***************
*** 237,241 ****
  	minions = 0;
  	for(i=0; i < PvmTasks; i++) {	/* start one by one */
! 	    m = pvm_spawn(PvmSlavename, sargs, PvmTaskHost, PvmHosts[i % PvmHostsN], 
  			  1, tids+minions);
  	    if( m < 0) {			/* spawn failed */
--- 237,241 ----
  	minions = 0;
  	for(i=0; i < PvmTasks; i++) {	/* start one by one */
! 	    m = pvm_spawn(PvmSlavename, sargs, PvmTaskHost, PvmHosts[i % PvmHostsN],
  			  1, tids+minions);
  	    if( m < 0) {			/* spawn failed */
***************
*** 670,674 ****
       * read already rendered parts
       */
!     if ((opts.Options & DISKWRITE) && (opts.Options & CONTINUE_TRACE)) {
  	int i;
  	int fl = opts.First_Line;			/* remember start of image */
--- 670,675 ----
       * read already rendered parts
       */
!     if ( (opts.Options & DISKWRITE) && (opts.Options & CONTINUE_TRACE) )
!     {
  	int i;
  	int fl = opts.First_Line;			/* remember start of image */
***************
*** 676,687 ****
  	Read_Rendered_Part(Actual_Output_Name);		/* read -> changes opts.First_line */
  
! 	frame_stat[frame].row_to_write = 
  	    frame_stat[frame].row_to_malloc = opts.First_Line;
  
  	// Status_Info("PvmStartFrame() opts.First_Line = %ld, OLD FORM (opts.First_Line/PvmChunkHeight)*grid_ppline = %ld\n", opts.First_Line, (opts.First_Line/PvmChunkHeight)*grid_ppline);
  	frame_stat[frame].block_to_write =
! 	// next line has bug? here is my fix MG rev 2
! 	//    frame_stat[frame].block_to_assign = (opts.First_Line/PvmChunkHeight)*grid_ppline;
! 	    frame_stat[frame].block_to_assign = ((opts.First_Line+PvmChunkHeight-1)/PvmChunkHeight)*grid_ppline;
  	/* blocks above the new start are already finished */
  	for(i=0; i < frame_stat[frame].block_to_assign; i++) {
--- 677,688 ----
  	Read_Rendered_Part(Actual_Output_Name);		/* read -> changes opts.First_line */
  
! 	frame_stat[frame].row_to_write =
  	    frame_stat[frame].row_to_malloc = opts.First_Line;
  
  	// Status_Info("PvmStartFrame() opts.First_Line = %ld, OLD FORM (opts.First_Line/PvmChunkHeight)*grid_ppline = %ld\n", opts.First_Line, (opts.First_Line/PvmChunkHeight)*grid_ppline);
  	frame_stat[frame].block_to_write =
! 	// MG next line has bug? no, this is no bug, it ensures that any partially rendered blocks are re-rendered
! 	    frame_stat[frame].block_to_assign = (opts.First_Line/PvmChunkHeight)*grid_ppline;
! 	//    frame_stat[frame].block_to_assign = ((opts.First_Line+PvmChunkHeight-1)/PvmChunkHeight)*grid_ppline;
  	/* blocks above the new start are already finished */
  	for(i=0; i < frame_stat[frame].block_to_assign; i++) {

[PVMPOV-CVS] pvmpov_3_5/src optin.cpp,1.5,1.6 optout.cpp,1.4,1.5 optout.h,1.5,1.6 png_pov.cpp,1.2,1.3 png_pov.h,1.2,1.3 povmsend.cpp,1.2,1.3 povmsrec.cpp,1.6,1.7 povray.cpp,1.4,1.5 povray.h,1.2,1.3 pvm.cpp,1.4,1.5 render.cpp,1.4,1.5 renderio.cpp,1.2,1.3 userio.cpp,1.4,1.5

From: <mat...@us...> - 2003-01-01 10:58:13

Update of /cvsroot/pvmpov/pvmpov_3_5/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13485

Modified Files:
	optin.cpp optout.cpp optout.h png_pov.cpp png_pov.h 
	povmsend.cpp povmsrec.cpp povray.cpp povray.h pvm.cpp 
	render.cpp renderio.cpp userio.cpp 
Log Message:
MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
MG * Add pvm_hosts option.
MG * Modify PNG file class to handle multiple streams and continue
MG trace options.
MG * Add hack to nullify Do_Cooperate() calls if possible.
MG * Ensure PVM is disabled by default.


Index: optin.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optin.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** optin.cpp	30 Dec 2002 19:33:42 -0000	1.5
--- optin.cpp	1 Jan 2003 10:58:07 -0000	1.6
***************
*** 26,29 ****
--- 26,37 ----
  * $Author$
  * $Log$
+ * Revision 1.6  2003/01/01 10:58:07  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.5  2002/12/30 19:33:42  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 556,560 ****
  				case kPOVAttrib_PVMWD:
  				{
- 				/* TODO - first version, yet to be tested */
  					long len = 1024;
  					char str[1025];
--- 564,567 ----
***************
*** 565,569 ****
  				}
  				case kPOVAttrib_PVMHosts:
! 				/* TODO */
  					break;
  				case kPOVAttrib_PVMBeSlave:
--- 572,611 ----
  				}
  				case kPOVAttrib_PVMHosts:
! 				/* TODO test */
! 					err = POVMSObject_Get(obj, &list, option->key);
! 					if(err != 0)
! 						break;
! 
! 					l = 0;
! 					err = POVMSAttrList_Count(&list, &l);
! 					if(err != 0)
! 						break;
! 					if(l == 0)
! 						break;
! 
! 					imax = l;
! 					for(i = 1; i <= imax; i++)
! 					{
! 						file->printf("%s=", option->keyword);
! 						err = POVMSAttrList_GetNth(&list, i, &item);
! 						if(err == 0)
! 						{
! 							l = 0;
! 							err = POVMSAttr_Size(&item, &l);
! 							if(l > 0)
! 							{
! 								bufptr = (char *)POV_MALLOC(l, "PVM hostname buffer");
! 								bufptr[0] = 0;
! 								if(POVMSAttr_Get(&item, kPOVMSType_CString, bufptr, &l) == 0)
! 								{
! 									if ( i > 1 ) file->printf(",");
! 									file->printf("%s", bufptr);
! 								}
! 								POV_FREE(bufptr);
! 							}
! 							(void)POVMSAttr_Delete(&item);
! 						}
! 					}
! 					file->printf("\n");
  					break;
  				case kPOVAttrib_PVMBeSlave:
***************
*** 1221,1230 ****
  				case kPOVAttrib_PVMArch:
  				case kPOVAttrib_PVMWD:
- 				/* TODO test */
  					err = POVMSUtil_SetString(obj, option->key, param);
  					break;
  				case kPOVAttrib_PVMHosts:
! 				/* TODO */
  					break;
  				case kPOVAttrib_PVMBeSlave:
  				/* NOTHING TO DO, cannot be specified in ini file??? */
--- 1263,1294 ----
  				case kPOVAttrib_PVMArch:
  				case kPOVAttrib_PVMWD:
  					err = POVMSUtil_SetString(obj, option->key, param);
  					break;
  				case kPOVAttrib_PVMHosts:
! 				/* TODO test */
! 				{
! 					int start=0, end=0;
! 					POVMSAttribute attr;
! 					err = POVMSAttrList_New(&list);
! 
! 					while ( param[end] )
! 					{
! 						end++;
! 						if ( (param[end] ==  ',') || (param[end] ==  '\0') )
! 						{
! 							char s[1025];
! 							strncpy(s, &(param[start]), min(1024, end-start));
! 							s[min(1024, end-start)] = '\0';
! 							err = POVMSAttr_New(&attr);
! 							err = POVMSAttr_Set(&attr, kPOVMSType_CString, s, strlen(s) + 1);
! 							if(err == kNoErr)
! 								err = POVMSAttrList_Append(&list, &attr);
! 							end++;
! 							start = end;
! 						}
! 					}
! 					err = POVMSObject_Set(obj, &list, option->key);
  					break;
+ 				}
  				case kPOVAttrib_PVMBeSlave:
  				/* NOTHING TO DO, cannot be specified in ini file??? */

Index: optout.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optout.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** optout.cpp	30 Dec 2002 19:33:42 -0000	1.4
--- optout.cpp	1 Jan 2003 10:58:07 -0000	1.5
***************
*** 26,29 ****
--- 26,37 ----
  * $Author$
  * $Log$
+ * Revision 1.5  2003/01/01 10:58:07  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.4  2002/12/30 19:33:42  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 89,94 ****
  #include "isosurf.h"
  
- /* Matthew Grove
- */
  #ifdef HAVE_LIBPVM3
  #include "pvm.h"
--- 97,100 ----

Index: optout.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optout.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** optout.h	30 Dec 2002 19:33:42 -0000	1.5
--- optout.h	1 Jan 2003 10:58:07 -0000	1.6
***************
*** 26,29 ****
--- 26,37 ----
  * $Author$
  * $Log$
+ * Revision 1.6  2003/01/01 10:58:07  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.5  2002/12/30 19:33:42  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 51,63 ****
  
  /* These are used by OPTOUT.C and the machine specific modules */
- 
- /* Matthew Grove
-    Change distr message
-    Increase max help page count
-    Revision 2
-    Update distr message
- 
- */
- 
  
  #define POV_RAY_IS_OFFICIAL 0
--- 59,62 ----

Index: png_pov.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/png_pov.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** png_pov.cpp	30 Dec 2002 19:33:43 -0000	1.2
--- png_pov.cpp	1 Jan 2003 10:58:07 -0000	1.3
***************
*** 28,32 ****
  * Updated to use the libpng 0.89 structure interface, Jun 1996
  *
! * $File: //depot/povray/3.5/source/png_pov.cpp $
  * $Revision$
  * $Change: 1817 $
--- 28,32 ----
  * Updated to use the libpng 0.89 structure interface, Jun 1996
  *
! * $File: //depot/povray/3.5/source/userio.cpp $
  * $Revision$
  * $Change: 1817 $
***************
*** 34,38 ****
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:43  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
  * patch (revision 2).
--- 34,46 ----
  * $Author$
  * $Log$
! * Revision 1.3  2003/01/01 10:58:07  matthewgrove
! * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
! * MG * Add pvm_hosts option.
! * MG * Modify PNG file class to handle multiple streams and continue
! * MG trace options.
! * MG * Add hack to nullify Do_Cooperate() calls if possible.
! * MG * Ensure PVM is disabled by default.
! *
! * Revision 1.4  2002/12/30 19:33:45  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
  * patch (revision 2).
***************
*** 105,110 ****
  ******************************************************************************/
  
! /* MG comment out these and add to class
! 
  static png_struct  *png_ptr  = NULL;
  static png_info    *info_ptr = NULL;
--- 113,118 ----
  ******************************************************************************/
  
! // png hack to help with continue trace and multiple streams
! #ifndef HAVE_LIBPVM3
  static png_struct  *png_ptr  = NULL;
  static png_info    *info_ptr = NULL;
***************
*** 120,124 ****
  POV_ISTREAM *PNG_Image::in_file = NULL;
  POV_OSTREAM *PNG_Image::out_file = NULL;
! */
  
  /*****************************************************************************
--- 128,132 ----
  POV_ISTREAM *PNG_Image::in_file = NULL;
  POV_OSTREAM *PNG_Image::out_file = NULL;
! #endif
  
  /*****************************************************************************
***************
*** 325,343 ****
    height = h ;
  
!   // MG
!   info_ptr = NULL;
    o_png_ptr = NULL;
    row_ptr = NULL;
    tmp_fp = NULL;
    png_ptr = NULL;
    buffer_size = 0;
    buffer = NULL;
    in_file= NULL;
    out_file = NULL;
  
    switch (mode)
    {
      case READ_MODE:
!     
        in_file = NULL;
        out_file = NULL;
--- 333,352 ----
    height = h ;
  
! #ifdef HAVE_LIBPVM3
    o_png_ptr = NULL;
    row_ptr = NULL;
    tmp_fp = NULL;
    png_ptr = NULL;
+   info_ptr = NULL;
    buffer_size = 0;
    buffer = NULL;
    in_file= NULL;
    out_file = NULL;
+ #endif
  
    switch (mode)
    {
      case READ_MODE:
! 
        in_file = NULL;
        out_file = NULL;
***************
*** 710,717 ****
      case APPEND_MODE:
  
  #if defined(PNG_WRITE_FLUSH_SUPPORTED)
        if (setjmp(png_ptr->jmpbuf))
        {
!         /* If we get here, we had a problem writing the file */
  
          if (buffer != NULL)
--- 719,727 ----
      case APPEND_MODE:
  
+ #ifndef HAVE_LIBPVM3
  #if defined(PNG_WRITE_FLUSH_SUPPORTED)
        if (setjmp(png_ptr->jmpbuf))
        {
!         // If we get here, we had a problem writing the file
  
          if (buffer != NULL)
***************
*** 729,740 ****
        }
  
!       /* Write out the data in the PNG/zlib buffers, and set automatic
!        * flushing for every few scanlines, in case of a rude crash.
!        */
        png_write_flush(png_ptr);
        png_set_flush(png_ptr, FLUSH_DIST);
! #else  /* !PNG_WRITE_FLUSH_SUPPORTED */
        fflush(file);
! #endif /* PNG_WRITE_FLUSH_SUPPORTED */
  
        if (!(opts.Options & TO_STDOUT))
--- 739,751 ----
        }
  
!       // Write out the data in the PNG/zlib buffers, and set automatic
!       // flushing for every few scanlines, in case of a rude crash.
! 
        png_write_flush(png_ptr);
        png_set_flush(png_ptr, FLUSH_DIST);
! #else  // !PNG_WRITE_FLUSH_SUPPORTED
        fflush(file);
! #endif // PNG_WRITE_FLUSH_SUPPORTED
! #endif // !HAVE_LIBPVM3
  
        if (!(opts.Options & TO_STDOUT))
***************
*** 754,760 ****
--- 765,911 ----
            return;
          }
+ 
+ /********************************************/
+ // MG This is my hack to allow continue trace to work
+ // with my multiple output stream hack
+ #ifdef HAVE_LIBPVM3
+ 
+       buffer_size = opts.File_Buffer_Size;
+ 
+       if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+                      (png_voidp)true, png_pov_err, png_pov_warn)) == NULL ||
+           (info_ptr = png_create_info_struct(png_ptr)) == NULL)
+       {
+         Error("Cannot allocate PNG data structures");
+       }
+ 
+       if (setjmp(png_ptr->jmpbuf))
+       {
+         // If we get here, we had a problem writing the file
+         if (buffer != NULL)
+         {
+           POV_FREE(buffer);
+           buffer = NULL;
+         }
+ 
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+ 
+         POV_DELETE(out_file, POV_OSTREAM);
+         out_file = NULL;
+ 
+         return;
+       }
+ 
+       /* Set up the compression structure */
+ 
+       // png_set_read_fn(png_ptr, out_file, png_pov_read_data);
+       png_set_write_fn(png_ptr, out_file, png_pov_write_data, png_pov_flush_data);
+ 
+       /* Fill in the relevant image information */
+ 
+       info_ptr->width = width = w;
+       info_ptr->height = height = h;
+ 
+       info_ptr->bit_depth = 8 * ((opts.OutputQuality + 7) / 8);
+ 
+       if (opts.Options & HF_GRAY_16)
+       {
+         if ( info_ptr->bit_depth < 16 ) {
+           info_ptr->bit_depth = 16;
+           opts.OutputQuality = 16;
+         }
+         info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
+       }
+       else
+       {
+         info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+       }
+ 
+       if (opts.Options & OUTPUT_ALPHA)
+       {
+         info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+       }
+ 
+ #if defined(PNG_WRITE_sBIT_SUPPORTED)
+       if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+       {
+         info_ptr->sig_bit.red =
+         info_ptr->sig_bit.green =
+         info_ptr->sig_bit.blue = opts.OutputQuality;
+       }
+       else
+       {
+         info_ptr->sig_bit.gray = opts.OutputQuality;
+       }
+ 
+       if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+       {
+         info_ptr->sig_bit.alpha = opts.OutputQuality;
+       }
+ 
+       info_ptr->valid |= PNG_INFO_sBIT;
+ #endif /* PNG_WRITE_sBIT_SUPPORTED */
+ 
+ #if defined(PNG_WRITE_gAMA_SUPPORTED)
+       if (!opts.histogram_on)
+       {
+         info_ptr->gamma = 1.0/opts.DisplayGamma;
+         info_ptr->valid |= PNG_INFO_gAMA;
+       }
+       else
+       {
+         info_ptr->gamma = 1.0;
+         info_ptr->valid |= PNG_INFO_gAMA;
+       }
+ #endif /* PNG_WRITE_gAMA_SUPPORTED */
+ 
+ #if defined(PNG_WRITE_oFFs_SUPPORTED)
+       if (opts.First_Column != 0 || opts.First_Line != 0)
+       {
+         info_ptr->x_offset = opts.First_Column;
+         info_ptr->y_offset = opts.First_Line;
+ 
+         info_ptr->offset_unit_type = PNG_OFFSET_PIXEL;
+ 
+         info_ptr->valid |= PNG_INFO_oFFs;
+       }
+ #endif /* PNG_WRITE_oFFs_SUPPORTED */
+ 
+       if (opts.histogram_on)
+       {
+       /* If we are writing a histogram file, we could potentially output
+        * a pCAL chunk with the max histogram value, to allow recovery of
+        * the original timing data.  However, pCAL is not yet official at
+        * the time of this writing.
+        */
+       }
+ 
+       // MG apparently this is necessary, but it does not actually write anything to the file ???
+       png_write_info(png_ptr, info_ptr);
+ 
+       png_stride = info_ptr->color_type & PNG_COLOR_MASK_COLOR ? 3 : 1;
+ 
+       if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+         png_stride++;
+ 
+       png_stride *= (opts.OutputQuality + 7) / 8;
+ 
+       row_ptr = (png_byte *)POV_MALLOC(w*png_stride, "PNG write row buffer");
+ 
+ #if defined(PNG_WRITE_FLUSH_SUPPORTED)
+       /* Set libpng to flush the output buffers every few lines, so that
+        * in case of a rude crash we don't lose very much data.
+        */
+       png_set_flush(png_ptr, FLUSH_DIST);
+ #endif /* PNG_WRITE_FLUSH_SUPPORTED */
+ #endif // HAVE_LIBPVM3
+ /********************************************/
+ 
+ #ifndef HAVE_LIBPVM3
          png_set_write_fn(png_ptr, out_file, png_pov_write_data, png_pov_flush_data);
+ #endif
        }
  
+ #ifndef HAVE_LIBPVM3
        /* Delete the temporary data file.  Note that the new output file
         * is all ready to go - nothing needs to be done here.
***************
*** 770,773 ****
--- 921,925 ----
          }
        }
+ #endif
    }
  

Index: png_pov.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/png_pov.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** png_pov.h	30 Dec 2002 19:33:43 -0000	1.2
--- png_pov.h	1 Jan 2003 10:58:07 -0000	1.3
***************
*** 26,29 ****
--- 26,37 ----
  * $Author$
  * $Log$
+ * Revision 1.3  2003/01/01 10:58:07  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.2  2002/12/30 19:33:43  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 75,79 ****
  		int initial_line_number;
  
! 		// MG no longer static
  		int line_number;
  		int buffer_size;
--- 83,87 ----
  		int initial_line_number;
  
! #ifdef HAVE_LIBPVM3
  		int line_number;
  		int buffer_size;
***************
*** 90,93 ****
--- 98,108 ----
  		char        tmp_fname[FILE_NAME_LENGTH];
  		POV_ISTREAM *tmp_fp;
+ #else
+                 static int line_number;
+                 static int buffer_size;
+                 static char *buffer;
+                 static POV_ISTREAM *in_file;
+                 static POV_OSTREAM *out_file;
+ #endif
  };
  

Index: povmsend.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povmsend.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** povmsend.cpp	30 Dec 2002 19:33:44 -0000	1.2
--- povmsend.cpp	1 Jan 2003 10:58:07 -0000	1.3
***************
*** 26,29 ****
--- 26,37 ----
  * $Author$
  * $Log$
+ * Revision 1.3  2003/01/01 10:58:07  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.2  2002/12/30 19:33:44  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 60,64 ****
  #include "pov_util.h"
  
- // Matthew Grove
  #ifdef HAVE_LIBPVM3
  #include "pvm.h"
--- 68,71 ----
***************
*** 471,475 ****
     if(err == kNoErr)
        err = POVMSUtil_SetString(msg, kPOVAttrib_PVMWD, PvmWorkingDir);
!    // TODO "PVM_Hosts", a list of cstrings
  
  #endif
--- 478,506 ----
     if(err == kNoErr)
        err = POVMSUtil_SetString(msg, kPOVAttrib_PVMWD, PvmWorkingDir);
!    if(err == kNoErr)
!    {
!       POVMSAttributeList list;
! 
!       err = POVMSAttrList_New(&list);
!       if(err == kNoErr)
!       {
!          int ii;
! 
!          for ( ii = 0; ii < PvmHostsN; ii++ )
!          {
!             err = POVMSAttr_New(&attr);
!             if(err == kNoErr)
!             {
!                err = POVMSAttr_Set(&attr, kPOVMSType_CString, PvmHosts[ii], strlen(PvmHosts[ii]) + 1);
!                if(err == kNoErr)
!                   err = POVMSAttrList_Append(&list, &attr);
!                else
!                   err = POVMSAttr_Delete(&attr);
!             }
!          }
!          if(err == kNoErr)
!             err = POVMSObject_Set(msg, &list, kPOVAttrib_PVMHosts);
!       }
!    }
  
  #endif

Index: povmsrec.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povmsrec.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** povmsrec.cpp	30 Dec 2002 19:33:44 -0000	1.6
--- povmsrec.cpp	1 Jan 2003 10:58:07 -0000	1.7
***************
*** 26,29 ****
--- 26,37 ----
  * $Author$
  * $Log$
+ * Revision 1.7  2003/01/01 10:58:07  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.6  2002/12/30 19:33:44  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 850,855 ****
     }
     if( POVMSObject_Exist(msg, kPOVAttrib_PVMWD) == 0 )
!    { /* we have found a working directory
!    TODO test this code */
  	char str[1025];
  	long len=1024;
--- 858,862 ----
     }
     if( POVMSObject_Exist(msg, kPOVAttrib_PVMWD) == 0 )
!    { /* we have found a working directory */
  	char str[1025];
  	long len=1024;
***************
*** 866,869 ****
--- 873,901 ----
     }
     // TODO "PVM_Hosts"
+ 
+    if ( POVMSObject_Get(msg, &attr, kPOVAttrib_PVMHosts) == 0 )
+    {
+       long cnt = 0;
+ 
+       if ( POVMSAttrList_Count(&attr, &cnt) == 0 )
+       {
+          POVMSAttribute item;
+          long ii,iii;
+ 	 PvmHostsN = cnt;
+ 	 PvmHosts = (char **)POV_MALLOC(sizeof(char *) * cnt, "PVMHosts");
+ 
+          for ( ii = 1; ii <= cnt; ii++ )
+          {
+             (void)POVMSAttr_New(&item);
+             if ( POVMSAttrList_GetNth(&attr, ii, &item) == 0 )
+             {
+ 	         PvmHosts[ii-1] = (char *)POV_MALLOC(sizeof(char) * 1024, "PVM hostname");
+                  POVMSAttr_Get(&item, kPOVMSType_CString, PvmHosts[ii-1], &iii);
+ 	    }
+ 	  }
+ 	}
+ 
+    }
+ 
  #endif
     if(POVMSObject_Exist(msg, kPOVAttrib_IncludeHeader) == 0)

Index: povray.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povray.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** povray.cpp	30 Dec 2002 19:33:44 -0000	1.4
--- povray.cpp	1 Jan 2003 10:58:08 -0000	1.5
***************
*** 21,25 ****
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *
! * $File: //depot/povray/3.5/source/povray.cpp $
  * $Revision$
  * $Change: 1817 $
--- 21,25 ----
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *
! * $File: //depot/povray/3.5/source/povmsrec.cpp $
  * $Revision$
  * $Change: 1817 $
***************
*** 27,31 ****
  * $Author$
  * $Log$
! * Revision 1.4  2002/12/30 19:33:44  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
  * patch (revision 2).
--- 27,39 ----
  * $Author$
  * $Log$
! * Revision 1.5  2003/01/01 10:58:08  matthewgrove
! * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
! * MG * Add pvm_hosts option.
! * MG * Modify PNG file class to handle multiple streams and continue
! * MG trace options.
! * MG * Add hack to nullify Do_Cooperate() calls if possible.
! * MG * Ensure PVM is disabled by default.
! *
! * Revision 1.6  2002/12/30 19:33:44  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
  * patch (revision 2).
***************
*** 536,540 ****
     FrameLoop();
  
!    Do_Cooperate_0; // MG Do_Cooperate(0);
  
     /* Clean up */
--- 544,548 ----
     FrameLoop();
  
!    Do_Cooperate(0);
  
     /* Clean up */
***************
*** 621,625 ****
  	else
  	{
! 		PvmMasterEnd();
  	}
  
--- 629,633 ----
  	else
  	{
! 		if ( PvmTasks) PvmMasterEnd();
  	}
  
***************
*** 643,647 ****
     }
  
!    Do_Cooperate_0; // MG Do_Cooperate(0);
  
     pre_init_flag=1;
--- 651,655 ----
     }
  
!    Do_Cooperate(0);
  
     pre_init_flag=1;
***************
*** 757,761 ****
     POVRAY_END_COOPERATE
  
!    Do_Cooperate_2; // MG Do_Cooperate(2);
  }
  #endif
--- 765,769 ----
     POVRAY_END_COOPERATE
  
!    Do_Cooperate(2);
  }
  #endif
***************
*** 897,901 ****
              }
  
!             Do_Cooperate_1; // MG Do_Cooperate(1);
           }
  #ifdef HAVE_LIBPVM3
--- 905,909 ----
              }
  
!             Do_Cooperate(1);
           }
  #ifdef HAVE_LIBPVM3
***************
*** 1141,1145 ****
     Send_RenderTime(0, 0, 0);
  
!  #ifdef HAVE_LIBPVM3
    } /* PvmSlave || !PvmTasks */
  #endif
--- 1149,1153 ----
     Send_RenderTime(0, 0, 0);
  
! #ifdef HAVE_LIBPVM3
    } /* PvmSlave || !PvmTasks */
  #endif
***************
*** 1333,1336 ****
--- 1341,1345 ----
  ******************************************************************************/
  
+ #ifdef USE_POVRAY_COOPERATE
  void Do_Cooperate(int level)
  {
***************
*** 1344,1348 ****
        case 0:
  #ifndef DONT_USE_POVMS
- abc
           do
           {
--- 1353,1356 ----
***************
*** 1359,1362 ****
--- 1367,1371 ----
     };
  }
+ #endif
  
  /*****************************************************************************
***************
*** 1369,1373 ****
  *   
  * OUTPUT
! *   
  * RETURNS
  *   
--- 1378,1382 ----
  *   
  * OUTPUT
! *
  * RETURNS
  *   

Index: povray.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povray.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** povray.h	30 Dec 2002 19:33:44 -0000	1.2
--- povray.h	1 Jan 2003 10:58:08 -0000	1.3
***************
*** 26,29 ****
--- 26,37 ----
  * $Author$
  * $Log$
+ * Revision 1.3  2003/01/01 10:58:08  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.2  2002/12/30 19:33:44  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 508,511 ****
--- 516,521 ----
  #else
  void povray_init();
+ // MG We can skip the Do_Cooperate calls
+ #define Do_Cooperate(x)
  #endif
  int povray_render(
***************
*** 519,525 ****
  #ifdef USE_POVRAY_COOPERATE
  void povray_cooperate();
- #endif
-   
  void Do_Cooperate(int level);
  
  SHELLRET pov_shellout (SHELLTYPE Type);
--- 529,534 ----
  #ifdef USE_POVRAY_COOPERATE
  void povray_cooperate();
  void Do_Cooperate(int level);
+ #endif
  
  SHELLRET pov_shellout (SHELLTYPE Type);

Index: pvm.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/pvm.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pvm.cpp	30 Dec 2002 19:33:44 -0000	1.4
--- pvm.cpp	1 Jan 2003 10:58:08 -0000	1.5
***************
*** 13,17 ****
  *
  *  You need the PVM 3.x libraries, include files, and PVMD daemons.
! *  
  *  PVM is available from the University of Tennessee, Knoxville, TN.
  *
--- 13,17 ----
  *
  *  You need the PVM 3.x libraries, include files, and PVMD daemons.
! *
  *  PVM is available from the University of Tennessee, Knoxville, TN.
  *
***************
*** 41,48 ****
  #include <sys/resource.h>
  #include <signal.h>
  #include "frame.h"
  #include "vector.h"
  #include "povproto.h"
- #include "frame.h"
  #include "povray.h"
  #include "render.h"
--- 41,51 ----
  #include <sys/resource.h>
  #include <signal.h>
+ 
  #include "frame.h"
+ 
+ #ifdef HAVE_LIBPVM3
+ 
  #include "vector.h"
  #include "povproto.h"
  #include "povray.h"
  #include "render.h"
***************
*** 75,82 ****
  char    PvmArch[20] = { 0 };
  int     PvmChunkHeight = PVM_DEFAULT_GRID_HEIGHT;	/* height of a block */
! int     PvmChunkWidth  = PVM_DEFAULT_GRID_WIDTH;	/* widht of a block */
  int     PvmRowsToSend = 1;
  int     PvmSlave = 0;
! int     PvmTasks = 9999;
  int     PvmNice = PVM_DEFAULT_NICE;
  int     PvmMTid;
--- 78,85 ----
  char    PvmArch[20] = { 0 };
  int     PvmChunkHeight = PVM_DEFAULT_GRID_HEIGHT;	/* height of a block */
! int     PvmChunkWidth  = PVM_DEFAULT_GRID_WIDTH;	/* width of a block */
  int     PvmRowsToSend = 1;
  int     PvmSlave = 0;
! int     PvmTasks = 0; /* not active by default */
  int     PvmNice = PVM_DEFAULT_NICE;
  int     PvmMTid;
***************
*** 1441,1445 ****
      pvm_pkSTAT( (long*)stats, MaxStat*sizeof(COUNTER)/sizeof(long), 1);
      pvm_send(PvmMTid, PVM_SLAVE_STATS);
-     // init_statistics(stats); // MG
  }
  }
--- 1444,1447 ----
***************
*** 1623,1624 ****
--- 1625,1629 ----
      }
  }
+ 
+ #endif
+ 

Index: render.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/render.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** render.cpp	30 Dec 2002 19:33:45 -0000	1.4
--- render.cpp	1 Jan 2003 10:58:08 -0000	1.5
***************
*** 30,33 ****
--- 30,41 ----
  * $Author$
  * $Log$
+ * Revision 1.5  2003/01/01 10:58:08  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.4  2002/12/30 19:33:45  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 870,874 ****
        check_stats(Current_Line_Number, 1, PixelSize);
  
!       Do_Cooperate_0; // MG Do_Cooperate(0);
  
        /* do each column/pixel on a row */
--- 878,882 ----
        check_stats(Current_Line_Number, 1, PixelSize);
  
!       Do_Cooperate(0);
  
        /* do each column/pixel on a row */
***************
*** 1062,1066 ****
        check_stats(Current_Line_Number, 1, skip);
  
!       Do_Cooperate_0; // MG Do_Cooperate(0);
  
        for (x = opts.First_Column; x < opts.Last_Column; x += skip)
--- 1070,1074 ----
        check_stats(Current_Line_Number, 1, skip);
  
!       Do_Cooperate(0);
  
        for (x = opts.First_Column; x < opts.Last_Column; x += skip)
***************
*** 1351,1355 ****
      check_stats(Current_Line_Number, 0, 1);
  
!     Do_Cooperate_0; // MG Do_Cooperate(0);
  
      /* Prune vista tree. */
--- 1359,1363 ----
      check_stats(Current_Line_Number, 0, 1);
  
!     Do_Cooperate(0);
  
      /* Prune vista tree. */
***************
*** 1536,1540 ****
      check_stats(Current_Line_Number, 0, 1);
  
!     Do_Cooperate_0; // MG Do_Cooperate(0);
  
      if (opts.Options & USE_VISTA_BUFFER)
--- 1544,1548 ----
      check_stats(Current_Line_Number, 0, 1);
  
!     Do_Cooperate(0);
  
      if (opts.Options & USE_VISTA_BUFFER)
***************
*** 1734,1738 ****
    int oldptflag;
  
!   Do_Cooperate_1; // MG Do_Cooperate(1);
  
    Increase_Counter(stats[Number_Of_Rays]);
--- 1742,1746 ----
    int oldptflag;
  
!   Do_Cooperate(1);
  
    Increase_Counter(stats[Number_Of_Rays]);

Index: renderio.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/renderio.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** renderio.cpp	30 Dec 2002 19:33:45 -0000	1.2
--- renderio.cpp	1 Jan 2003 10:58:08 -0000	1.3
***************
*** 26,29 ****
--- 26,37 ----
  * $Author$
  * $Log$
+ * Revision 1.3  2003/01/01 10:58:08  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.2  2002/12/30 19:33:45  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 142,149 ****
  
    opts.First_Line = Output_File->Line();
!   if(opts.First_Line < 0) // MG was 1
    {
!     opts.First_Line = 0; // MG was 1
    }
  
    if(Output_File != NULL)
--- 150,167 ----
  
    opts.First_Line = Output_File->Line();
!   // MG What is this code for???
!   // The original breaks the PVM code by setting First_Line to 1 when no file exists?
!   // Why does this not break POV-Ray?
! #ifdef HAVE_LIBPVM3
!   if(opts.First_Line < 0)
    {
!     opts.First_Line = 0;
    }
+ #else
+   if(opts.First_Line < 1)
+   {
+     opts.First_Line = 1;
+   }
+ #endif
  
    if(Output_File != NULL)

Index: userio.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/userio.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** userio.cpp	30 Dec 2002 19:33:45 -0000	1.4
--- userio.cpp	1 Jan 2003 10:58:08 -0000	1.5
***************
*** 26,29 ****
--- 26,37 ----
  * $Author$
  * $Log$
+ * Revision 1.5  2003/01/01 10:58:08  matthewgrove
+ * MG ** First pvmpov revision, based on pvmpovray35 rev 2 **
+ * MG * Add pvm_hosts option.
+ * MG * Modify PNG file class to handle multiple streams and continue
+ * MG trace options.
+ * MG * Add hack to nullify Do_Cooperate() calls if possible.
+ * MG * Ensure PVM is disabled by default.
+ *
  * Revision 1.4  2002/12/30 19:33:45  flierl
  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
***************
*** 176,180 ****
  	#endif
  
! 	Do_Cooperate_0; // MG Do_Cooperate(0);
  
  	return 0;
--- 184,188 ----
  	#endif
  
! 	Do_Cooperate(0);
  
  	return 0;
***************
*** 235,239 ****
  	}
  
! 	Do_Cooperate_0; // MG Do_Cooperate(0);
  
  	return 0;
--- 243,247 ----
  	}
  
! 	Do_Cooperate(0);
  
  	return 0;
***************
*** 276,280 ****
  #endif
  
! 	Do_Cooperate_0; // MG Do_Cooperate(0);
  
  	return 0;
--- 284,288 ----
  #endif
  
! 	Do_Cooperate(0);
  
  	return 0;
***************
*** 330,334 ****
  	}
  
! 	Do_Cooperate_0; // MG Do_Cooperate(0);
  
  	return 0;
--- 338,342 ----
  	}
  
! 	Do_Cooperate(0);
  
  	return 0;

[PVMPOV-CVS] pvmpov_3_5 povray.conf,NONE,1.1

From: <fl...@us...> - 2002-12-30 21:57:45

Update of /cvsroot/pvmpov/pvmpov_3_5
In directory sc8-pr-cvs1:/tmp/cvs-serv29983

Added Files:
	povray.conf 
Log Message:
Added the global povray config file.


--- NEW FILE: povray.conf ---
;
;                     PERSISTENCE OF VISION RAY TRACER
;
;                           POV-Ray VERSION 3.5
;
;                         SAMPLE POVRAY.CONF FILE
;
; The general form of the options is:
;
;  [Variable]
;  value
;
; Note: characters after a semi-colon are treated as a comment
;
; These options have been put in this file because they will help
; you get up and running quickly.
;
; This file is used primarily to define security settings, i.e. to
; restrict reading and writing of files and running of scripts beyond
; the security provided by the filesystem.  Regardless of the settings
; in this file, POV-Ray will not allow users to read files they would
; not ordinarily be allowed to read, write files they would not
; ordinarily be allowed to write, or execute files they would not
; ordinarily be allowed to execute, unless someone has made the binary
; setuid or setgid.
;
; POV-Ray will look in two places for this file: in a system-wide
; directory (typically /usr/local/etc/povray.conf or /etc/povray.conf)
; and in the user's home directory (as ~/.povray.conf).  POV-Ray will
; always use the most strict version of what is specified; user settings
; can only make security more strict.

; File I/O Security options are none, read-only, and restricted.
;
; "none" means that there are no restrictions other than those enforced
; by the file system, i.e. normal UNIX file and directory permissions.
;
; "read-only" means that files may be read without restriction.
; 
; "restricted" means that files access is subject to restrictions as
; specified in the rest of this file.  See the other variables for details.

[File I/O Security]
none
;read-only
; restricted

; Shellout Security determines whether POV-Ray will be allowed to call
; scripts (e.g. Post_Frame_Command) as specified in the documentation.
;
; "allowed" means that shellout will work as specified in the documentation.
;
; "forbidden" means that shellout will be disabled.

[Shellout Security]
allowed
; forbidden

; Current Directory Read/Write specifies whether read/write will be allowed
; in the current directory *and all its descendents*.  It makes something akin 
; to a chroot environment in the user's current directory.
;
; "allowed" means that file read/write is permitted in the user's current
; directory and all its descendents.
;
; "forbidden" means that file read/write is restricted to directory trees
; rooted in specifically named directories.

[Current Directory Read/Write]
allowed
; forbidden

; Permitted Input Paths is a list of up to 64 directories for which
; reading is permitted in those directories and their descendents.  
; Both relative and absolute paths are permitted (making . especially 
; useful), and the install directory (typically /usr/local/share/povray-3.5 
; or /usr/share/povray-3.5) can be specified with "%INSTALLDIR%".  The 
; directories should be numbered from 0 up to 63.
; Note that since user-level permissions are at least as strict as
; system-level restrictions, any paths specified in the system-wide
; povray.conf will also need to be specified in ~/.povray.conf

[Permitted Input Paths]
0=.
1=%INSTALLDIR%/include
2=%INSTALLDIR%/scenes
3=/tmp
4=%INSTALLDIR%/../../etc/povray.ini

; Permitted Output Paths is a list of up to 64 directories for which
; writing is permitted in both those directories and their descendents.
; Both relative and absolute paths are permitted (making . especially
; useful), and the install directory (typically /usr/local/share/povray-3.5
; or /usr/share/povray-3.5) can be specified with "%INSTALLDIR%".  Note
; that the installdir is typically only writable by root, so this ability
; is less useful here.
; Note that since user-level permissions are at least as strict as
; system-level restrictions, any paths specified in the system-wide
; povray.conf will also need to be specified in ~/.povray.conf

[Permitted Output Paths]
0=.
1=/tmp

[PVMPOV-CVS] pvmpov_3_5/src Makefile.am,1.3,1.4

From: <fl...@us...> - 2002-12-30 20:19:33

Update of /cvsroot/pvmpov/pvmpov_3_5/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11452

Modified Files:
	Makefile.am 
Log Message:
Minor fix.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	30 Dec 2002 19:33:40 -0000	1.3
--- Makefile.am	30 Dec 2002 20:19:30 -0000	1.4
***************
*** 29,34 ****
  DEFS = -DPREFIX=\"$(prefix)\" -DPOV_LIB_DIR=\"@datadir@/povray-3.5\" -DCOMPILER_VER=\".Linux.$(CC)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DUSE_IO_RESTRICTIONS=\"$(ac_use_io_restrictions)\"
  NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi `
! LDADD = @X_LIBS@
  CXXFLAGS = $(PVM_CFLAGS) $(NOMULTICHAR) -O3
! LDFLAGS = $(PVM_LDFLAGS) @X_CFLAGS@
  EXTRA_DIST = xpovicon.xbm xpovmask.xbm xpovicon.xpm 
--- 29,34 ----
  DEFS = -DPREFIX=\"$(prefix)\" -DPOV_LIB_DIR=\"@datadir@/povray-3.5\" -DCOMPILER_VER=\".Linux.$(CC)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DUSE_IO_RESTRICTIONS=\"$(ac_use_io_restrictions)\"
  NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi `
! LDADD = @X_LIBS@ $(PVM_LDFLAGS)
  CXXFLAGS = $(PVM_CFLAGS) $(NOMULTICHAR) -O3
! LDFLAGS = @X_CFLAGS@
  EXTRA_DIST = xpovicon.xbm xpovmask.xbm xpovicon.xpm

[PVMPOV-CVS] pvmpov_3_5/src Makefile.am,1.2,1.3 atmosph.cpp,1.1.1.1,1.2 atmosph.h,1.1.1.1,1.2 bbox.cpp,1.1.1.1,1.2 bbox.h,1.1.1.1,1.2 bcyl.cpp,1.1.1.1,1.2 bcyl.h,1.1.1.1,1.2 benchmark.cpp,1.1.1.1,1.2 bezier.cpp,1.1.1.1,1.2 bezier.h,1.1.1.1,1.2 blob.cpp,1.1.1.1,1.2 blob.h,1.1.1.1,1.2 boxes.cpp,1.1.1.1,1.2 boxes.h,1.1.1.1,1.2 bsphere.cpp,1.1.1.1,1.2 bsphere.h,1.1.1.1,1.2 camera.cpp,1.1.1.1,1.2 camera.h,1.1.1.1,1.2 chi2.cpp,1.1.1.1,1.2 chi2.h,1.1.1.1,1.2 colour.cpp,1.1.1.1,1.2 colour.h,1.1.1.1,1.2 colutils.cpp,1.1.1.1,1.2 colutils.h,1.1.1.1,1.2 cones.cpp,1.1.1.1,1.2 cones.h,1.1.1.1,1.2 csg.cpp,1.1.1.1,1.2 csg.h,1.1.1.1,1.2 discs.cpp,1.1.1.1,1.2 discs.h,1.1.1.1,1.2 express.cpp,1.1.1.1,1.2 express.h,1.1.1.1,1.2 file_pov.cpp,1.1.1.1,1.2 file_pov.h,1.1.1.1,1.2 fncode.cpp,1.1.1.1,1.2 fncode.h,1.1.1.1,1.2 fnintern.cpp,1.1.1.1,1.2 fnintern.h,1.1.1.1,1.2 fnpovfpu.cpp,1.1.1.1,1.2 fnpovfpu.h,1.1.1.1,1.2 fnsyntax.cpp,1.1.1.1,1.2 fnsyntax.h,1.1.1.1,1.2 fpmetric.cpp,1.1.1.1,1.2 fpmetric.h,1.1.1.1,1.2 fractal.cpp,1.1.1.1,1.2 fractal.h,1.1.1.1,1.2 frame.h,1.1.1.1,1.2 function.cpp,1.1.1.1,1.2 function.h,1.1.1.1,1.2 gif.cpp,1.1.1.1,1.2 gif.h,1.1.1.1,1.2 gifdecod.cpp,1.1.1.1,1.2 gifdecod.h,1.1.1.1,1.2 hcmplx.cpp,1.1.1.1,1.2 hcmplx.h,1.1.1.1,1.2 hfield.cpp,1.1.1.1,1.2 hfield.h,1.1.1.1,1.2 histogra.cpp,1.1.1.1,1.2 histogra.h,1.1.1.1,1.2 iff.cpp,1.1.1.1,1.2 iff.h,1.1.1.1,1.2 image.cpp,1.1.1.1,1.2 image.h,1.1.1.1,1.2 interior.cpp,1.1.1.1,1.2 interior.h,1.1.1.1,1.2 isosurf.cpp,1.1.1.1,1.2 isosurf.h,1.1.1.1,1.2 jpeg_pov.cpp,1.1.1.1,1.2 jpeg_pov.h,1.1.1.1,1.2 lathe.cpp,1.1.1.1,1.2 lathe.h,1.1.1.1,1.2 lbuffer.cpp,1.1.1.1,1.2 lbuffer.h,1.1.1.1,1.2 lightgrp.cpp,1.1.1.1,1.2 lightgrp.h,1.1.1.1,1.2 lighting.cpp,1.1.1.1,1.2 lighting.h,1.1.1.1,1.2 matrices.cpp,1.1.1.1,1.2 matrices.h,1.1.1.1,1.2 media.cpp,1.1.1.1,1.2 media.h,1.1.1.1,1.2 mesh.cpp,1.1.1.1,1.2 mesh.h,1.1.1.1,1.2 normal.cpp,1.1.1.1,1.2 normal.h,1.1.1.1,1.2 objects.cpp,1.1.1.1,1.2 objects.h,1.1.1.1,1.2 octree.cpp,1.1.1.1,1.2 octree.h,1.1.1.1,1.2 optin.cpp,1.4,1.5 optin.h,1.3,1.4 optout.cpp,1.3,1.4 optout.h,1.4,1.5 parse.cpp,1.1.1.1,1.2 parse.h,1.1.1.1,1.2 parsestr.cpp,1.1.1.1,1.2 parsestr.h,1.1.1.1,1.2 parstxtr.cpp,1.1.1.1,1.2 parstxtr.h,1.1.1.1,1.2 pattern.cpp,1.1.1.1,1.2 pattern.h,1.1.1.1,1.2 pgm.cpp,1.1.1.1,1.2 pgm.h,1.1.1.1,1.2 photons.cpp,1.1.1.1,1.2 photons.h,1.1.1.1,1.2 pigment.cpp,1.1.1.1,1.2 pigment.h,1.1.1.1,1.2 planes.cpp,1.1.1.1,1.2 planes.h,1.1.1.1,1.2 png_pov.cpp,1.1.1.1,1.2 png_pov.h,1.1.1.1,1.2 point.cpp,1.1.1.1,1.2 point.h,1.1.1.1,1.2 poly.cpp,1.1.1.1,1.2 poly.h,1.1.1.1,1.2 polygon.cpp,1.1.1.1,1.2 polygon.h,1.1.1.1,1.2 polysolv.cpp,1.1.1.1,1.2 polysolv.h,1.1.1.1,1.2 pov_mem.cpp,1.1.1.1,1.2 pov_mem.h,1.1.1.1,1.2 pov_util.cpp,1.1.1.1,1.2 pov_util.h,1.1.1.1,1.2 povms.cpp,1.1.1.1,1.2 povms.h,1.1.1.1,1.2 povmscpp.cpp,1.1.1.1,1.2 povmscpp.h,1.1.1.1,1.2 povmsend.cpp,1.1.1.1,1.2 povmsend.h,1.1.1.1,1.2 povmsgid.h,1.3,1.4 povmsrec.cpp,1.5,1.6 povmsrec.h,1.1.1.1,1.2 povproto.h,1.1.1.1,1.2 povray.cpp,1.3,1.4 povray.h,1.1.1.1,1.2 ppm.cpp,1.1.1.1,1.2 ppm.h,1.1.1.1,1.2 prism.cpp,1.1.1.1,1.2 prism.h,1.1.1.1,1.2 pvm.cpp,1.3,1.4 pvm.h,1.1,1.2 quadrics.cpp,1.1.1.1,1.2 quadrics.h,1.1.1.1,1.2 quatern.cpp,1.1.1.1,1.2 quatern.h,1.1.1.1,1.2 rad_data.cpp,1.1.1.1,1.2 radiosit.cpp,1.1.1.1,1.2 radiosit.h,1.1.1.1,1.2 ray.cpp,1.1.1.1,1.2 ray.h,1.1.1.1,1.2 render.cpp,1.3,1.4 render.h,1.1.1.1,1.2 renderio.cpp,1.1.1.1,1.2 renderio.h,1.1.1.1,1.2 sor.cpp,1.1.1.1,1.2 sor.h,1.1.1.1,1.2 spheres.cpp,1.1.1.1,1.2 spheres.h,1.1.1.1,1.2 sphsweep.cpp,1.1.1.1,1.2 sphsweep.h,1.1.1.1,1.2 splines.cpp,1.1.1.1,1.2 splines.h,1.1.1.1,1.2 statspov.cpp,1.1.1.1,1.2 statspov.h,1.1.1.1,1.2 super.cpp,1.1.1.1,1.2 super.h,1.1.1.1,1.2 targa.cpp,1.1.1.1,1.2 targa.h,1.1.1.1,1.2 texture.cpp,1.1.1.1,1.2 texture.h,1.1.1.1,1.2 tiff_pov.cpp,1.1.1.1,1.2 tiff_pov.h,1.1.1.1,1.2 tokenize.cpp,1.1.1.1,1.2 tokenize.h,1.1.1.1,1.2 torus.cpp,1.1.1.1,1.2 torus.h,1.1.1.1,1.2 triangle.cpp,1.1.1.1,1.2 triangle.h,1.1.1.1,1.2 truetype.cpp,1.1.1.1,1.2 truetype.h,1.1.1.1,1.2 txttest.cpp,1.1.1.1,1.2 txttest.h,1.1.1.1,1.2 unix.cpp,1.1.1.1,1.2 userdisp.cpp,1.1.1.1,1.2 userdisp.h,1.1.1.1,1.2 userio.cpp,1.3,1.4 userio.h,1.1.1.1,1.2 vbuffer.cpp,1.1.1.1,1.2 vbuffer.h,1.1.1.1,1.2 vector.h,1.1.1.1,1.2 vlbuffer.cpp,1.1.1.1,1.2 vlbuffer.h,1.1.1.1,1.2 warps.cpp,1.1.1.1,1.2 warps.h,1.1.1.1,1.2

From: <fl...@us...> - 2002-12-30 19:34:24

Update of /cvsroot/pvmpov/pvmpov_3_5/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18616/src

Modified Files:
	Makefile.am atmosph.cpp atmosph.h bbox.cpp bbox.h bcyl.cpp 
	bcyl.h benchmark.cpp bezier.cpp bezier.h blob.cpp blob.h 
	boxes.cpp boxes.h bsphere.cpp bsphere.h camera.cpp camera.h 
	chi2.cpp chi2.h colour.cpp colour.h colutils.cpp colutils.h 
	cones.cpp cones.h csg.cpp csg.h discs.cpp discs.h express.cpp 
	express.h file_pov.cpp file_pov.h fncode.cpp fncode.h 
	fnintern.cpp fnintern.h fnpovfpu.cpp fnpovfpu.h fnsyntax.cpp 
	fnsyntax.h fpmetric.cpp fpmetric.h fractal.cpp fractal.h 
	frame.h function.cpp function.h gif.cpp gif.h gifdecod.cpp 
	gifdecod.h hcmplx.cpp hcmplx.h hfield.cpp hfield.h 
	histogra.cpp histogra.h iff.cpp iff.h image.cpp image.h 
	interior.cpp interior.h isosurf.cpp isosurf.h jpeg_pov.cpp 
	jpeg_pov.h lathe.cpp lathe.h lbuffer.cpp lbuffer.h 
	lightgrp.cpp lightgrp.h lighting.cpp lighting.h matrices.cpp 
	matrices.h media.cpp media.h mesh.cpp mesh.h normal.cpp 
	normal.h objects.cpp objects.h octree.cpp octree.h optin.cpp 
	optin.h optout.cpp optout.h parse.cpp parse.h parsestr.cpp 
	parsestr.h parstxtr.cpp parstxtr.h pattern.cpp pattern.h 
	pgm.cpp pgm.h photons.cpp photons.h pigment.cpp pigment.h 
	planes.cpp planes.h png_pov.cpp png_pov.h point.cpp point.h 
	poly.cpp poly.h polygon.cpp polygon.h polysolv.cpp polysolv.h 
	pov_mem.cpp pov_mem.h pov_util.cpp pov_util.h povms.cpp 
	povms.h povmscpp.cpp povmscpp.h povmsend.cpp povmsend.h 
	povmsgid.h povmsrec.cpp povmsrec.h povproto.h povray.cpp 
	povray.h ppm.cpp ppm.h prism.cpp prism.h pvm.cpp pvm.h 
	quadrics.cpp quadrics.h quatern.cpp quatern.h rad_data.cpp 
	radiosit.cpp radiosit.h ray.cpp ray.h render.cpp render.h 
	renderio.cpp renderio.h sor.cpp sor.h spheres.cpp spheres.h 
	sphsweep.cpp sphsweep.h splines.cpp splines.h statspov.cpp 
	statspov.h super.cpp super.h targa.cpp targa.h texture.cpp 
	texture.h tiff_pov.cpp tiff_pov.h tokenize.cpp tokenize.h 
	torus.cpp torus.h triangle.cpp triangle.h truetype.cpp 
	truetype.h txttest.cpp txttest.h unix.cpp userdisp.cpp 
	userdisp.h userio.cpp userio.h vbuffer.cpp vbuffer.h vector.h 
	vlbuffer.cpp vlbuffer.h warps.cpp warps.h 
Log Message:
Import of the latest sources of POV-Ray version 3.5c and MG's PVM
patch (revision 2).

Added some command line options to the configure script:
 --enable/disable-pvm,
 --with-pvm-incs=DIR,
 --with-pvm-arch=ARCH,
 --with-pvm-libs=DIR,
 --with-pvm-auxlibs=LDFLAGS.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	5 Oct 2002 15:09:43 -0000	1.2
--- Makefile.am	30 Dec 2002 19:33:40 -0000	1.3
***************
*** 30,34 ****
  NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi `
  LDADD = @X_LIBS@
! CXXFLAGS = $(NOMULTICHAR) -O3
! LDFLAGS = @X_CFLAGS@
  EXTRA_DIST = xpovicon.xbm xpovmask.xbm xpovicon.xpm 
--- 30,34 ----
  NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi `
  LDADD = @X_LIBS@
! CXXFLAGS = $(PVM_CFLAGS) $(NOMULTICHAR) -O3
! LDFLAGS = $(PVM_LDFLAGS) @X_CFLAGS@
  EXTRA_DIST = xpovicon.xbm xpovmask.xbm xpovicon.xpm 

Index: atmosph.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/atmosph.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** atmosph.cpp	5 Oct 2002 10:20:25 -0000	1.1.1.1
--- atmosph.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:25  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: atmosph.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/atmosph.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** atmosph.h	5 Oct 2002 10:23:41 -0000	1.1.1.1
--- atmosph.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:41  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: bbox.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/bbox.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bbox.cpp	5 Oct 2002 10:20:27 -0000	1.1.1.1
--- bbox.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 34,39 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:27  flierl
! * Initial import.
  *
  *
--- 34,47 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *
***************
*** 546,550 ****
        high = numOfFiniteObjects;
  
!       Do_Cooperate(0);
      }
  
--- 554,558 ----
        high = numOfFiniteObjects;
  
!       Do_Cooperate_0; // MG Do_Cooperate(0);
      }
  
***************
*** 1800,1804 ****
    }
  
!   Do_Cooperate(1);
  
    /*
--- 1808,1812 ----
    }
  
!   Do_Cooperate_1; // MG Do_Cooperate(1);
  
    /*

Index: bbox.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/bbox.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bbox.h	5 Oct 2002 10:23:41 -0000	1.1.1.1
--- bbox.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:41  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: bcyl.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/bcyl.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bcyl.cpp	5 Oct 2002 10:20:28 -0000	1.1.1.1
--- bcyl.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 27,32 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:28  flierl
! * Initial import.
  *
  *
--- 27,40 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: bcyl.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/bcyl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bcyl.h	5 Oct 2002 10:23:41 -0000	1.1.1.1
--- bcyl.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:41  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: benchmark.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/benchmark.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** benchmark.cpp	5 Oct 2002 10:20:30 -0000	1.1.1.1
--- benchmark.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 27,32 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:30  flierl
! * Initial import.
  *
  *
--- 27,40 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: bezier.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/bezier.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bezier.cpp	5 Oct 2002 10:20:33 -0000	1.1.1.1
--- bezier.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:33  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: bezier.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/bezier.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bezier.h	5 Oct 2002 10:23:41 -0000	1.1.1.1
--- bezier.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:41  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: blob.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/blob.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** blob.cpp	5 Oct 2002 10:20:37 -0000	1.1.1.1
--- blob.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 31,36 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:37  flierl
! * Initial import.
  *
  *
--- 31,44 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: blob.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/blob.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** blob.h	5 Oct 2002 10:23:42 -0000	1.1.1.1
--- blob.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:42  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/boxes.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** boxes.cpp	5 Oct 2002 10:20:38 -0000	1.1.1.1
--- boxes.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:38  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: boxes.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/boxes.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** boxes.h	5 Oct 2002 10:23:42 -0000	1.1.1.1
--- boxes.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:42  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: bsphere.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/bsphere.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bsphere.cpp	5 Oct 2002 10:20:39 -0000	1.1.1.1
--- bsphere.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:39  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *
***************
*** 440,444 ****
    }
  
!   Do_Cooperate(1);
  
    /*
--- 448,452 ----
    }
  
!   Do_Cooperate_1; // MG Do_Cooperate(1);
  
    /*
***************
*** 604,608 ****
        high = nElem;
  
!       Do_Cooperate(0);
      }
    }
--- 612,616 ----
        high = nElem;
  
!       Do_Cooperate_0; // MG Do_Cooperate(0);
      }
    }

Index: bsphere.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/bsphere.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** bsphere.h	5 Oct 2002 10:23:42 -0000	1.1.1.1
--- bsphere.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:42  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: camera.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/camera.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** camera.cpp	5 Oct 2002 10:20:39 -0000	1.1.1.1
--- camera.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:39  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: camera.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/camera.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** camera.h	5 Oct 2002 10:23:42 -0000	1.1.1.1
--- camera.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:42  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: chi2.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/chi2.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** chi2.cpp	5 Oct 2002 10:20:40 -0000	1.1.1.1
--- chi2.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 32,37 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:40  flierl
! * Initial import.
  *
  *
--- 32,45 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: chi2.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/chi2.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** chi2.h	5 Oct 2002 10:23:42 -0000	1.1.1.1
--- chi2.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:42  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: colour.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/colour.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** colour.cpp	5 Oct 2002 10:20:41 -0000	1.1.1.1
--- colour.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:41  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: colour.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/colour.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** colour.h	5 Oct 2002 10:23:43 -0000	1.1.1.1
--- colour.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:43  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: colutils.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/colutils.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** colutils.cpp	5 Oct 2002 10:20:42 -0000	1.1.1.1
--- colutils.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:42  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: colutils.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/colutils.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** colutils.h	5 Oct 2002 10:23:43 -0000	1.1.1.1
--- colutils.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:43  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: cones.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/cones.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cones.cpp	5 Oct 2002 10:20:43 -0000	1.1.1.1
--- cones.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:43  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: cones.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/cones.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cones.h	5 Oct 2002 10:23:43 -0000	1.1.1.1
--- cones.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:43  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: csg.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/csg.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** csg.cpp	5 Oct 2002 10:20:44 -0000	1.1.1.1
--- csg.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:44  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: csg.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/csg.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** csg.h	5 Oct 2002 10:23:43 -0000	1.1.1.1
--- csg.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:43  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: discs.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/discs.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** discs.cpp	5 Oct 2002 10:20:45 -0000	1.1.1.1
--- discs.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:45  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: discs.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/discs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** discs.h	5 Oct 2002 10:23:43 -0000	1.1.1.1
--- discs.h	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:43  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: express.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/express.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** express.cpp	5 Oct 2002 10:20:49 -0000	1.1.1.1
--- express.cpp	30 Dec 2002 19:33:40 -0000	1.2
***************
*** 27,32 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:49  flierl
! * Initial import.
  *
  *
--- 27,40 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:40  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: express.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/express.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** express.h	5 Oct 2002 10:23:43 -0000	1.1.1.1
--- express.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:43  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: file_pov.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/file_pov.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** file_pov.cpp	5 Oct 2002 10:20:50 -0000	1.1.1.1
--- file_pov.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:50  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: file_pov.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/file_pov.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** file_pov.h	5 Oct 2002 10:23:44 -0000	1.1.1.1
--- file_pov.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:44  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fncode.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fncode.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fncode.cpp	5 Oct 2002 10:20:54 -0000	1.1.1.1
--- fncode.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:54  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fncode.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fncode.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fncode.h	5 Oct 2002 10:23:44 -0000	1.1.1.1
--- fncode.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:44  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fnintern.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fnintern.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fnintern.cpp	5 Oct 2002 10:20:56 -0000	1.1.1.1
--- fnintern.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 31,36 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:56  flierl
! * Initial import.
  *
  *
--- 31,44 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fnintern.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fnintern.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fnintern.h	5 Oct 2002 10:23:44 -0000	1.1.1.1
--- fnintern.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 30,35 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:44  flierl
! * Initial import.
  *
  *
--- 30,43 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fnpovfpu.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fnpovfpu.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fnpovfpu.cpp	5 Oct 2002 10:20:58 -0000	1.1.1.1
--- fnpovfpu.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:20:58  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fnpovfpu.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fnpovfpu.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fnpovfpu.h	5 Oct 2002 10:23:45 -0000	1.1.1.1
--- fnpovfpu.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:45  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fnsyntax.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fnsyntax.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fnsyntax.cpp	5 Oct 2002 10:21:00 -0000	1.1.1.1
--- fnsyntax.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:00  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fnsyntax.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fnsyntax.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fnsyntax.h	5 Oct 2002 10:23:45 -0000	1.1.1.1
--- fnsyntax.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:45  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fpmetric.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fpmetric.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fpmetric.cpp	5 Oct 2002 10:21:02 -0000	1.1.1.1
--- fpmetric.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 29,34 ****
   * $Author$
   * $Log$
!  * Revision 1.1.1.1  2002/10/05 10:21:02  flierl
!  * Initial import.
   *
   *
--- 29,42 ----
   * $Author$
   * $Log$
!  * Revision 1.2  2002/12/30 19:33:41  flierl
!  * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
!  * patch (revision 2).
!  *
!  * Added some command line options to the configure script:
!  *  --enable/disable-pvm,
!  *  --with-pvm-incs=DIR,
!  *  --with-pvm-arch=ARCH,
!  *  --with-pvm-libs=DIR,
!  *  --with-pvm-auxlibs=LDFLAGS.
   *
   *
***************
*** 923,927 ****
  
  	if(depth == PrecompLastDepth / 2)
! 		Do_Cooperate(1);
  
  	if(depth >= PrecompLastDepth)
--- 931,935 ----
  
  	if(depth == PrecompLastDepth / 2)
! 		Do_Cooperate_1; // MG Do_Cooperate(1);
  
  	if(depth >= PrecompLastDepth)

Index: fpmetric.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fpmetric.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fpmetric.h	5 Oct 2002 10:23:45 -0000	1.1.1.1
--- fpmetric.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:45  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fractal.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fractal.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fractal.cpp	5 Oct 2002 10:21:03 -0000	1.1.1.1
--- fractal.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:03  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: fractal.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/fractal.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fractal.h	5 Oct 2002 10:23:45 -0000	1.1.1.1
--- fractal.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:45  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: frame.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/frame.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** frame.h	5 Oct 2002 10:23:48 -0000	1.1.1.1
--- frame.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:48  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *
***************
*** 493,496 ****
--- 501,519 ----
  #define COOPERATE_2
  #endif
+ 
+ 
+ // Matthew Grove
+ // We can skip the Do_Cooperate calls if DONT_USE_POVMS
+ // is defined.
+ #ifdef DONT_USE_POVMS
+ #define Do_Cooperate_0
+ #define Do_Cooperate_1
+ #define Do_Cooperate_2
+ #else
+ #define Do_Cooperate_0 Do_Cooperate(0);
+ #define Do_Cooperate_1 Do_Cooperate(1);
+ #define Do_Cooperate_2 Do_Cooperate(2);
+ #endif
+ 
  
  

Index: function.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/function.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** function.cpp	5 Oct 2002 10:21:03 -0000	1.1.1.1
--- function.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:03  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: function.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/function.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** function.h	5 Oct 2002 10:23:48 -0000	1.1.1.1
--- function.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:48  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: gif.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/gif.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gif.cpp	5 Oct 2002 10:21:03 -0000	1.1.1.1
--- gif.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:03  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: gif.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/gif.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gif.h	5 Oct 2002 10:23:48 -0000	1.1.1.1
--- gif.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:48  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: gifdecod.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/gifdecod.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gifdecod.cpp	5 Oct 2002 10:21:04 -0000	1.1.1.1
--- gifdecod.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:04  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: gifdecod.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/gifdecod.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gifdecod.h	5 Oct 2002 10:23:48 -0000	1.1.1.1
--- gifdecod.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:48  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: hcmplx.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/hcmplx.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hcmplx.cpp	5 Oct 2002 10:21:06 -0000	1.1.1.1
--- hcmplx.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:06  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: hcmplx.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/hcmplx.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hcmplx.h	5 Oct 2002 10:23:48 -0000	1.1.1.1
--- hcmplx.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:48  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: hfield.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/hfield.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hfield.cpp	5 Oct 2002 10:21:09 -0000	1.1.1.1
--- hfield.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 35,40 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:09  flierl
! * Initial import.
  *
  *
--- 35,48 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: hfield.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/hfield.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hfield.h	5 Oct 2002 10:23:48 -0000	1.1.1.1
--- hfield.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:48  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: histogra.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/histogra.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** histogra.cpp	5 Oct 2002 10:21:09 -0000	1.1.1.1
--- histogra.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:09  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: histogra.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/histogra.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** histogra.h	5 Oct 2002 10:23:49 -0000	1.1.1.1
--- histogra.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:49  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: iff.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/iff.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** iff.cpp	5 Oct 2002 10:21:10 -0000	1.1.1.1
--- iff.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:10  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: iff.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/iff.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** iff.h	5 Oct 2002 10:23:49 -0000	1.1.1.1
--- iff.h	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:49  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: image.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/image.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** image.cpp	5 Oct 2002 10:21:12 -0000	1.1.1.1
--- image.cpp	30 Dec 2002 19:33:41 -0000	1.2
***************
*** 27,32 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:12  flierl
! * Initial import.
  *
  *
--- 27,40 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:41  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: image.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/image.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** image.h	5 Oct 2002 10:23:49 -0000	1.1.1.1
--- image.h	30 Dec 2002 19:33:42 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:49  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:42  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: interior.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/interior.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** interior.cpp	5 Oct 2002 10:21:13 -0000	1.1.1.1
--- interior.cpp	30 Dec 2002 19:33:42 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:13  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:42  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: interior.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/interior.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** interior.h	5 Oct 2002 10:23:49 -0000	1.1.1.1
--- interior.h	30 Dec 2002 19:33:42 -0000	1.2
***************
*** 26,31 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:49  flierl
! * Initial import.
  *
  *
--- 26,39 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:42  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: isosurf.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/isosurf.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** isosurf.cpp	5 Oct 2002 10:21:14 -0000	1.1.1.1
--- isosurf.cpp	30 Dec 2002 19:33:42 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:14  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:42  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: isosurf.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/isosurf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** isosurf.h	5 Oct 2002 10:23:49 -0000	1.1.1.1
--- isosurf.h	30 Dec 2002 19:33:42 -0000	1.2
***************
*** 29,34 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:23:49  flierl
! * Initial import.
  *
  *
--- 29,42 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:42  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: jpeg_pov.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/jpeg_pov.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** jpeg_pov.cpp	5 Oct 2002 10:21:15 -0000	1.1.1.1
--- jpeg_pov.cpp	30 Dec 2002 19:33:42 -0000	1.2
***************
*** 28,33 ****
  * $Author$
  * $Log$
! * Revision 1.1.1.1  2002/10/05 10:21:15  flierl
! * Initial import.
  *
  *
--- 28,41 ----
  * $Author$
  * $Log$
! * Revision 1.2  2002/12/30 19:33:42  flierl
! * Import of the latest sources of POV-Ray version 3.5c and MG's PVM
! * patch (revision 2).
! *
! * Added some command line options to the configure script:
! *  --enable/disable-pvm,
! *  --with-pvm-incs=DIR,
! *  --with-pvm-arch=ARCH,
! *  --with-pvm-libs=DIR,
! *  --with-pvm-auxlibs=LDFLAGS.
  *
  *

Index: jpeg_pov.h
===================================================================
...
 
[truncated message content]

[PVMPOV-CVS] pvmpov_3_5 acinclude.m4,NONE,1.1 Makefile.am,1.1.1.1,1.2 README,1.1.1.1,1.2 aclocal.m4,1.2,1.3 configure,1.2,1.3 configure.in,1.2,1.3

From: <fl...@us...> - 2002-12-30 19:34:12

Update of /cvsroot/pvmpov/pvmpov_3_5
In directory sc8-pr-cvs1:/tmp/cvs-serv18616

Modified Files:
	Makefile.am README aclocal.m4 configure configure.in 
Added Files:
	acinclude.m4 
Log Message:
Import of the latest sources of POV-Ray version 3.5c and MG's PVM
patch (revision 2).

Added some command line options to the configure script:
 --enable/disable-pvm,
 --with-pvm-incs=DIR,
 --with-pvm-arch=ARCH,
 --with-pvm-libs=DIR,
 --with-pvm-auxlibs=LDFLAGS.


--- NEW FILE: acinclude.m4 ---
AC_DEFUN(AC_FIND_FILE,
[
  # parameter:
  #   1: variable to set with directory where file (parameter 3) was found
  #   2/3: directories/file to search for.
  #   4: directories to search in ( for 2/3 ).
  #   5: what to do on success.
  #   6: what to do in the other case.

  for dir1 in $4; do
    for dir2 in $2 .; do
      if test -r "$dir1/$dir2/$3"; then
        break 2
      fi
    done
  done

  if test -r "$dir1/$dir2/$3"; then
    $1=`echo "$dir1/$dir2" | sed -e 's%/./%/%g' -e 's%/.$%%'`
    $5
  else
    unset $1
    $6
  fi

])  

AC_DEFUN(AC_CHECK_PVM,
[ 

  dnl ******************************************
  dnl        Dirs, where PVM might be.
  dnl ******************************************

  POSSIBLE_PVM_DIRS="$PVM_ROOT          \
                     /usr               \
                     /usr/local         \
                     /usr/gnu           \
                     /opt/gnu           \
                     /opt/local/pvm3    \
                     /usr/lib/pvm3      \
                     /usr/local/lib/pvm3\
                     /opt/local/pvm     \
                     /usr/lib/pvm       \
                     /usr/local/lib/pvm \
                     $prefix            \
                    "
  dnl ******************************************
  dnl        Checks for pvm headers
  dnl ******************************************

  AC_ARG_ENABLE(
    pvm,
    [  --enable-pvm            Enables PVM support (default is no)],
    [ PVM_CFLAGS="-DHAVE_LIBPVM3" 
  
  AC_MSG_CHECKING(for pvm headers path)

  AC_ARG_WITH( 
    pvm-incs,   
    [  --with-pvm-incs=DIR     PVM headers are in DIR ],
    [ PVM_INCLUDEDIR="$withval" ],
    [ AC_FIND_FILE( 
      PVM_INCLUDEDIR, 
      include, pvm3.h, 
      $POSSIBLE_PVM_DIRS, 
      [  ],
      [ AC_MSG_RESULT(not found)
        AC_MSG_ERROR( 
         [PVM3 header file pvm3.h not found. Use --with-pvm-incs=DIR] 
      )]
    )]
  )
  PVM_CFLAGS="$PVM_CFLAGS -I$PVM_INCLUDEDIR"
  AC_SUBST(PVM_CFLAGS)
        
  AC_MSG_RESULT($PVM_INCLUDEDIR)

  dnl ******************************************
  dnl       Checks for pvm architecture
  dnl ******************************************

  AC_MSG_CHECKING(for pvm architecture)

  AC_ARG_WITH( 
    pvm-arch,   
    [  --with-pvm-arch=DIR     PVM architecture is ARCH],
    [ PVM_ARCH="$withval" ],
    [ AC_FIND_FILE( 
      PVM_ARCH_PROG, 
      lib, pvmgetarch, 
      $POSSIBLE_PVM_DIRS, 
      [ PVM_ARCH=`$PVM_ARCH_PROG/pvmgetarch` ],
      [ AC_MSG_RESULT(not found)
        AC_MSG_ERROR( 
        [PVM architecture not found. Use --with-pvm-arch=ARCH]
      )]
    )]
  )

  AC_SUBST(PVM_ARCH)

  AC_MSG_RESULT($PVM_ARCH)

  dnl ******************************************
  dnl       Checks for pvm libraries.
  dnl ******************************************

  AC_MSG_CHECKING(for pvm library path)

  AC_ARG_WITH( 
    pvm-libs,   
    [  --with-pvm-libs=DIR     PVM library is in DIR ],
    [ PVM_LIBDIR="$withval" ],
    [ AC_FIND_FILE( 
      PVM_LIBDIR, 
      lib/$PVM_ARCH lib, libpvm3.a, 
      $POSSIBLE_PVM_DIRS, 
      [  ],
      [ AC_MSG_RESULT(not found)
        AC_MSG_ERROR( 
         [PVM3 library libpvm3.a not found. Use --with-pvm-libs=DIR] 
      )]
    )]
  )

  PVM_LDFLAGS="-L$PVM_LIBDIR -lpvm3"

  AC_MSG_RESULT($PVM_LIBDIR)

  dnl ******************************************
  dnl       Checks for aux-libraries for pvm.
  dnl ******************************************

  AC_MSG_CHECKING(for auxiliary pvm libs)

  AC_ARG_WITH( 
    pvm-auxlibs,        
    [  --with-pvm-auxlibs=LDFLAGS     PVM auxiliary libraries are LDFLAGS],
    [ PVM_AUX_LIB="$withval" ],
    [ AC_FIND_FILE( 
      PVM_DEFFILE, 
      conf, $PVM_ARCH.def, 
      $POSSIBLE_PVM_DIRS, 
      [ PVM_AUX_LIB=`grep ARCHLIB $PVM_DEFFILE/$PVM_ARCH.def \
                | grep -v '^#' | head -1 \
                | sed -e 's/.*=//'` ],
      [ AC_MSG_RESULT(not found)
        AC_MSG_ERROR( 
         [PVM3 auxiiliary LDFLAGS not found. Use --with-pvm-auxlibs=LDFLAGS] 
      )]
    )]
  )

  PVM_LDFLAGS="$PVM_LDFLAGS $PVM_AUX_LIB"
  AC_SUBST(PVM_LDFLAGS)

  AC_MSG_RESULT($PVM_AUX_LIB)

],
    [ AC_MSG_RESULT("PVM support disabled")])
])

Index: Makefile.am
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	5 Oct 2002 10:07:53 -0000	1.1.1.1
--- Makefile.am	30 Dec 2002 19:33:37 -0000	1.2
***************
*** 23,28 ****
  ##############################################################################
  
  povray.ini: povray.in
! 	sed 's!the C:.POVRAY3 drive and!${pkglibdir}-3.5!' povray.in > povray.ini
  	echo >> povray.ini
  	echo ";; Search path for #include source files or command line ini files not" >> povray.ini
--- 23,29 ----
  ##############################################################################
  
+ povlibdir = @datadir@/povray-3.5
  povray.ini: povray.in
! 	sed 's!the C:.POVRAY3 drive and!${povlibdir}!' povray.in > povray.ini
  	echo >> povray.ini
  	echo ";; Search path for #include source files or command line ini files not" >> povray.ini
***************
*** 30,35 ****
  	echo ";; search path, up to a maximum of 25." >> povray.ini
  	echo >> povray.ini
! 	echo "Library_Path=${pkglibdir}-3.5" >> povray.ini
! 	echo "Library_Path=${pkglibdir}-3.5/include" >> povray.ini
  	echo >> povray.ini
  	echo ";; File output type control." >> povray.ini
--- 31,36 ----
  	echo ";; search path, up to a maximum of 25." >> povray.ini
  	echo >> povray.ini
! 	echo "Library_Path=${povlibdir}" >> povray.ini
! 	echo "Library_Path=${povlibdir}/include" >> povray.ini
  	echo >> povray.ini
  	echo ";; File output type control." >> povray.ini
***************
*** 43,52 ****
  	echo "Output_File_Type=N8             ;; (+/-Ftype)" >> povray.ini
  SUBDIRS = doc include ini scenes scripts src tests
! docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@
  doc_DATA = povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix 
! povlibdir = @datadir@/povray-3.5
! povlib_DATA = povray.ini
  TEST = tests/test.sh
! EXTRA_DIST = doc include scenes scripts tests povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix povray.in povray.ini
  POVINI = @datadir@/povray-3.5
  clean-generic:
--- 44,53 ----
  	echo "Output_File_Type=N8             ;; (+/-Ftype)" >> povray.ini
  SUBDIRS = doc include ini scenes scripts src tests
! docdir = ${datadir}/doc/@PACKAGE@-@VERSION@
  doc_DATA = povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix 
! povconfdir = @sysconfdir@
! sysconf_DATA = povray.conf povray.ini
  TEST = tests/test.sh
! EXTRA_DIST = doc include scenes scripts tests povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix povray.in povray.ini povray.conf
  POVINI = @datadir@/povray-3.5
  clean-generic:

Index: README
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	5 Oct 2002 10:07:49 -0000	1.1.1.1
--- README	30 Dec 2002 19:33:38 -0000	1.2
***************
*** 1,11 ****
! POV-Ray 3.5
  
! This is a first effort at an official version of POV-Ray using a configure 
! script and Makefile generated by GNU autoconf and GNU automake.  There 
! should be a bit of emphasis on this being a FIRST effort, and I rather 
! expect this to proceed by successive approximation.  It's hardly a perfect 
! arrangment, and I'd never used autoconf or automake before this, so I'm sure 
! I have lots of tricks to learn, and I'm sure future releases (hopefully
! including minor versions) will be superior.  
  
  If you have problems on your platform, let me know, and I'll see what I can 
--- 1,10 ----
! POV-Ray 3.50c
  
! This is a fairly early effort at an official version of POV-Ray using a 
! configure script and Makefile generated by GNU autoconf and GNU automake.  
! I rather expect this to proceed by successive approximation.  It's hardly 
! a perfect arrangment, and I'd never used autoconf or automake before this, 
! so I'm sure I have lots of tricks to learn, and I'm sure future releases 
! (hopefully including minor versions) will be superior.  
  
  If you have problems on your platform, let me know, and I'll see what I can 
***************
*** 14,18 ****
  Follow these instructions to compile POV-Ray:
  
! - make sure you have libpng, zlib, and libjpeg.  POV-Ray flat-out 
  depends on these libraries.  Note that systems that use package management
  may have -devel versions of these libraries, which will be needed to
--- 13,32 ----
  Follow these instructions to compile POV-Ray:
  
! - In this version, you'll need to manually edit a couple lines near the
! top of src/optout.h:
! 
! #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:"
! #error You must complete the following DISTRIBUTION_MESSAGE macro
! #define DISTRIBUTION_MESSAGE_2 " FILL IN NAME HERE........................."
! #define DISTRIBUTION_MESSAGE_3 " The POV-Ray Team(tm) is not responsible for supporting this version."
! 
! At the very least, you'll need to edit out the #error line.  Filling in
! your name is highly recommended.  At some point, I plan to have a configure
! option that will allow you to clear the error and set DISTRIBUTION_MESSAGE_2
! at compile-time, plus additional code that will warn you at compile-time if
! this line hasn't been edited, but that hasn't been implemented yet.  Sorry for
! the inconvenience.
! 
! - Make sure you have libpng, zlib, and libjpeg.  POV-Ray flat-out 
  depends on these libraries.  Note that systems that use package management
  may have -devel versions of these libraries, which will be needed to
***************
*** 24,32 ****
  have:
  
! libpng-1.2.1
  libjpeg-6b
  zlib-1.1.4
  
! - from the directory where this file resides, run:
  
  $ ./configure
--- 38,46 ----
  have:
  
! libpng-1.2.2
  libjpeg-6b
  zlib-1.1.4
  
! - From the directory where this file resides, run:
  
  $ ./configure
***************
*** 36,46 ****
  # make install
  
! - note: this only creates one binary, regardless of platform.  I've combined
  the X, SVGA, and console display versions into one binary.  The intent is that
  if you tell POV-Ray that you want a display, it will Just Work, providing you
  with the display that makes most sense in your current context.   If you don't
  have either X or SVGA libraries, it should still compile fine, but without
! the support for display types you may be lacking.  Pre-compiled binaries
! should depend only on glibc 2.2.
  
! Mark Gordon <mtg...@po...>, July 2002
--- 50,59 ----
  # make install
  
! - Note: this only creates one binary, regardless of platform.  I've combined
  the X, SVGA, and console display versions into one binary.  The intent is that
  if you tell POV-Ray that you want a display, it will Just Work, providing you
  with the display that makes most sense in your current context.   If you don't
  have either X or SVGA libraries, it should still compile fine, but without
! the support for display types you may be lacking.
  
! Mark Gordon <mtg...@po...>, October 2002

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/aclocal.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aclocal.m4	5 Oct 2002 15:09:38 -0000	1.2
--- aclocal.m4	30 Dec 2002 19:33:38 -0000	1.3
***************
*** 11,14 ****
--- 11,177 ----
  dnl PARTICULAR PURPOSE.
  
+ AC_DEFUN(AC_FIND_FILE,
+ [
+   # parameter:
+   #   1: variable to set with directory where file (parameter 3) was found
+   #   2/3: directories/file to search for.
+   #   4: directories to search in ( for 2/3 ).
+   #   5: what to do on success.
+   #   6: what to do in the other case.
+ 
+   for dir1 in $4; do
+     for dir2 in $2 .; do
+       if test -r "$dir1/$dir2/$3"; then
+         break 2
+       fi
+     done
+   done
+ 
+   if test -r "$dir1/$dir2/$3"; then
+     $1=`echo "$dir1/$dir2" | sed -e 's%/./%/%g' -e 's%/.$%%'`
+     $5
+   else
+     unset $1
+     $6
+   fi
+ 
+ ])  
+ 
+ AC_DEFUN(AC_CHECK_PVM,
+ [ 
+ 
+   dnl ******************************************
+   dnl        Dirs, where PVM might be.
+   dnl ******************************************
+ 
+   POSSIBLE_PVM_DIRS="$PVM_ROOT          \
+                      /usr               \
+                      /usr/local         \
+                      /usr/gnu           \
+                      /opt/gnu           \
+                      /opt/local/pvm3    \
+                      /usr/lib/pvm3      \
+                      /usr/local/lib/pvm3\
+                      /opt/local/pvm     \
+                      /usr/lib/pvm       \
+                      /usr/local/lib/pvm \
+                      $prefix            \
+                     "
+   dnl ******************************************
+   dnl        Checks for pvm headers
+   dnl ******************************************
+ 
+   AC_ARG_ENABLE(
+     pvm,
+     [  --enable-pvm            Enables PVM support (default is no)],
+     [ PVM_CFLAGS="-DHAVE_LIBPVM3" 
+   
+   AC_MSG_CHECKING(for pvm headers path)
+ 
+   AC_ARG_WITH( 
+     pvm-incs,   
+     [  --with-pvm-incs=DIR     PVM headers are in DIR ],
+     [ PVM_INCLUDEDIR="$withval" ],
+     [ AC_FIND_FILE( 
+       PVM_INCLUDEDIR, 
+       include, pvm3.h, 
+       $POSSIBLE_PVM_DIRS, 
+       [  ],
+       [ AC_MSG_RESULT(not found)
+         AC_MSG_ERROR( 
+          [PVM3 header file pvm3.h not found. Use --with-pvm-incs=DIR] 
+       )]
+     )]
+   )
+   PVM_CFLAGS="$PVM_CFLAGS -I$PVM_INCLUDEDIR"
+   AC_SUBST(PVM_CFLAGS)
+         
+   AC_MSG_RESULT($PVM_INCLUDEDIR)
+ 
+   dnl ******************************************
+   dnl       Checks for pvm architecture
+   dnl ******************************************
+ 
+   AC_MSG_CHECKING(for pvm architecture)
+ 
+   AC_ARG_WITH( 
+     pvm-arch,   
+     [  --with-pvm-arch=DIR     PVM architecture is ARCH],
+     [ PVM_ARCH="$withval" ],
+     [ AC_FIND_FILE( 
+       PVM_ARCH_PROG, 
+       lib, pvmgetarch, 
+       $POSSIBLE_PVM_DIRS, 
+       [ PVM_ARCH=`$PVM_ARCH_PROG/pvmgetarch` ],
+       [ AC_MSG_RESULT(not found)
+         AC_MSG_ERROR( 
+         [PVM architecture not found. Use --with-pvm-arch=ARCH]
+       )]
+     )]
+   )
+ 
+   AC_SUBST(PVM_ARCH)
+ 
+   AC_MSG_RESULT($PVM_ARCH)
+ 
+   dnl ******************************************
+   dnl       Checks for pvm libraries.
+   dnl ******************************************
+ 
+   AC_MSG_CHECKING(for pvm library path)
+ 
+   AC_ARG_WITH( 
+     pvm-libs,   
+     [  --with-pvm-libs=DIR     PVM library is in DIR ],
+     [ PVM_LIBDIR="$withval" ],
+     [ AC_FIND_FILE( 
+       PVM_LIBDIR, 
+       lib/$PVM_ARCH lib, libpvm3.a, 
+       $POSSIBLE_PVM_DIRS, 
+       [  ],
+       [ AC_MSG_RESULT(not found)
+         AC_MSG_ERROR( 
+          [PVM3 library libpvm3.a not found. Use --with-pvm-libs=DIR] 
+       )]
+     )]
+   )
+ 
+   PVM_LDFLAGS="-L$PVM_LIBDIR -lpvm3"
+ 
+   AC_MSG_RESULT($PVM_LIBDIR)
+ 
+   dnl ******************************************
+   dnl       Checks for aux-libraries for pvm.
+   dnl ******************************************
+ 
+   AC_MSG_CHECKING(for auxiliary pvm libs)
+ 
+   AC_ARG_WITH( 
+     pvm-auxlibs,        
+     [  --with-pvm-auxlibs=LDFLAGS     PVM auxiliary libraries are LDFLAGS],
+     [ PVM_AUX_LIB="$withval" ],
+     [ AC_FIND_FILE( 
+       PVM_DEFFILE, 
+       conf, $PVM_ARCH.def, 
+       $POSSIBLE_PVM_DIRS, 
+       [ PVM_AUX_LIB=`grep ARCHLIB $PVM_DEFFILE/$PVM_ARCH.def \
+                 | grep -v '^#' | head -1 \
+                 | sed -e 's/.*=//'` ],
+       [ AC_MSG_RESULT(not found)
+         AC_MSG_ERROR( 
+          [PVM3 auxiiliary LDFLAGS not found. Use --with-pvm-auxlibs=LDFLAGS] 
+       )]
+     )]
+   )
+ 
+   PVM_LDFLAGS="$PVM_LDFLAGS $PVM_AUX_LIB"
+   AC_SUBST(PVM_LDFLAGS)
+ 
+   AC_MSG_RESULT($PVM_AUX_LIB)
+ 
+ ],
+     [ AC_MSG_RESULT("PVM support disabled")])
+ ])
+ 
  # Do all the work for Automake.  This macro actually does too much --
  # some checks are only needed if your package does certain things.

Index: configure
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure	5 Oct 2002 15:09:38 -0000	1.2
--- configure	30 Dec 2002 19:33:38 -0000	1.3
***************
*** 13,16 ****
--- 13,26 ----
  # Any additions from configure.in:
  ac_help="$ac_help
+   --enable-pvm            Enables PVM support (default is no)"
+ ac_help="$ac_help
+   --with-pvm-incs=DIR     PVM headers are in DIR "
+ ac_help="$ac_help
+   --with-pvm-arch=DIR     PVM architecture is ARCH"
+ ac_help="$ac_help
+   --with-pvm-libs=DIR     PVM library is in DIR "
[...2302 lines suppressed...]
  
- 
  trap '' 1 2 15
  cat > confcache <<\EOF
--- 3529,3532 ----
***************
*** 3355,3359 ****
  s%@CPP@%$CPP%g
  s%@CXX@%$CXX%g
! s%@CXXCPP@%$CXXCPP%g
  s%@X_CFLAGS@%$X_CFLAGS%g
  s%@X_PRE_LIBS@%$X_PRE_LIBS%g
--- 3676,3682 ----
  s%@CPP@%$CPP%g
  s%@CXX@%$CXX%g
! s%@PVM_CFLAGS@%$PVM_CFLAGS%g
! s%@PVM_ARCH@%$PVM_ARCH%g
! s%@PVM_LDFLAGS@%$PVM_LDFLAGS%g
  s%@X_CFLAGS@%$X_CFLAGS%g
  s%@X_PRE_LIBS@%$X_PRE_LIBS%g

Index: configure.in
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.in	5 Oct 2002 15:26:35 -0000	1.2
--- configure.in	30 Dec 2002 19:33:38 -0000	1.3
***************
*** 9,16 ****
  AC_PROG_CPP
  AC_PROG_CXX
- AC_PROG_CXXCPP
  AC_PROG_MAKE_SET
  
  dnl Checks for libraries.
  AC_CHECK_LIB(m, sin)
  AC_CHECK_LIB(z, inflate)
--- 9,20 ----
  AC_PROG_CPP
  AC_PROG_CXX
  AC_PROG_MAKE_SET
  
+ AC_CHECK_PVM
+ 
  dnl Checks for libraries.
+ AC_CHECK_LIB(c, socket,,[AC_CHECK_LIB(socket, socket)])
+ AC_CHECK_LIB(c, xdr_short,,[AC_CHECK_LIB(nsl, xdr_short)])
+ 
  AC_CHECK_LIB(m, sin)
  AC_CHECK_LIB(z, inflate)
***************
*** 20,24 ****
  AC_CHECK_LIB(vga, vga_init)
  AC_CHECK_LIB(vgagl, gl_setcontextvga)
- AC_CHECK_LIB(pvm3, pvm_mytid)
  dnl look for ios, iostream, fstream
  dnl Moved check for libX11 until after AC_PATH_EXTRA can define
--- 24,27 ----
***************
*** 32,35 ****
--- 35,40 ----
  AC_CHECK_HEADERS(limits.h sys/time.h unistd.h, )
  
+ #--------------------------------------------------------------------
+ 
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
***************
*** 46,50 ****
  AC_FUNC_VPRINTF
  AC_CHECK_FUNCS(getcwd gettimeofday)
- 
  
  AC_OUTPUT(Makefile src/Makefile doc/Makefile doc/html/Makefile doc/html/images/Makefile doc/html/images/vfaq/Makefile tests/Makefile scenes/Makefile scenes/advanced/Makefile scenes/advanced/drums2/Makefile scenes/advanced/fish13/Makefile scenes/advanced/ionic5/Makefile scenes/advanced/newltpot/Makefile scenes/advanced/ntreal/Makefile scenes/advanced/piece2/Makefile scenes/advanced/piece3/Makefile scenes/advanced/teapot/Makefile scenes/advanced/balcony/Makefile scenes/advanced/blocks/Makefile scenes/advanced/cats/Makefile scenes/advanced/cliche/Makefile scenes/advanced/glasschess/Makefile scenes/camera/Makefile scenes/incdemo/Makefile scenes/incdemo/glasses/Makefile scenes/incdemo/metals/Makefile scenes/incdemo/stones/Makefile scenes/incdemo/woods/Makefile scenes/interior/Makefile scenes/interior/media/Makefile scenes/lights/Makefile scenes/objects/Makefile scenes/objects/csg/Makefile scenes/objects/quartic/Makefile scenes/textures/Makefile scenes/textures/pigments/Makefile scenes/textures/pigments/skies/Makefile scenes/textures/finishes/Makefile scenes/textures/normals/Makefile scenes/textures/patterns/Makefile scenes/animations/Makefile scenes/animations/ambient/Makefile scenes/animations/boing/Makefile scenes/animations/camera2/Makefile scenes/animations/clockd/Makefile scenes/animations/diffuse/Makefile scenes/animations/float1/Makefile scenes/animations/float2/Makefile scenes/animations/float3/Makefile scenes/animations/float4/Makefile scenes/animations/fractalzoom/Makefile scenes/animations/l_o/Makefile scenes/animations/life/Makefile scenes/animations/pentmap/Makefile scenes/animations/quilted/Makefile scenes/animations/raddem/Makefile scenes/animations/reflect/Makefile scenes/animations/slinky/Makefile scenes/animations/speclr/Makefile scenes/animations/splinefollow/Makefile scenes/animations/vect1/Makefile scenes/animations/vect2/Makefile scenes/language/Makefile scenes/language/arrays/Makefile scenes/language/fileio/Makefile scenes/language/macros/Makefile scenes/objectmods/Makefile scenes/portfolio/Makefile scenes/qtvr/Makefile scenes/radiosity/Makefile include/Makefile ini/Makefile scripts/Makefile )
--- 51,54 ----

[PVMPOV-CVS] pvmpov_3_5/src optin.cpp,1.3,1.4 optin.h,1.2,1.3 optout.cpp,1.2,1.3 optout.h,1.3,1.4 povmsgid.h,1.2,1.3 povmsrec.cpp,1.4,1.5 povray.cpp,1.2,1.3 render.cpp,1.2,1.3 userio.cpp,1.2,1.3

From: <ll...@us...> - 2002-11-03 07:39:39

Update of /cvsroot/pvmpov/pvmpov_3_5/src
In directory usw-pr-cvs1:/tmp/cvs-serv29721

Modified Files:
	optin.cpp optin.h optout.cpp optout.h povmsgid.h povmsrec.cpp 
	povray.cpp render.cpp userio.cpp 
Log Message:
Lee Begg 3 Nov 2002

Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
Saves having to manually define it.

Note to self: Have not finished patching userio.cpp yet (also povray.cpp)


Index: optin.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** optin.cpp	30 Oct 2002 01:05:06 -0000	1.3
--- optin.cpp	3 Nov 2002 07:39:35 -0000	1.4
***************
*** 26,35 ****
  * $Author$
  * $Log$
! * Revision 1.3  2002/10/30 01:05:06  llnz
! * Lee Begg 30 Oct 2002
! * - optin.cpp: fixed what sets PVM going and +ni handling
! * - povmsrec.cpp: added Working Directory handler, now uses PVM_WD +nd
! * - pvm.cpp: change -ni<workingdir> to +ni<workingdir> to work with new
! * options system
  *
  * Revision 1.1.1.1  2002/10/05 10:21:45  flierl
--- 26,36 ----
  * $Author$
  * $Log$
! * Revision 1.4  2002/11/03 07:39:35  llnz
! * Lee Begg 3 Nov 2002
! *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
! *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
  *
  * Revision 1.1.1.1  2002/10/05 10:21:45  flierl
***************
*** 209,213 ****
  	{ "Output_To_File",		 kPOVAttrib_OutputToFile,		kPOVMSType_Bool },
  
! #ifdef PVM
  	{ "PVM",                 kPOVAttrib_PVMUse,            kPOVMSType_Bool },
  	{ "PVM_Arch",            kPOVAttrib_PVMArch,           kPOVMSType_CString },
--- 210,214 ----
  	{ "Output_To_File",		 kPOVAttrib_OutputToFile,		kPOVMSType_Bool },
  
! #ifdef HAVE_LIBPVM3
  	{ "PVM",                 kPOVAttrib_PVMUse,            kPOVMSType_Bool },
  	{ "PVM_Arch",            kPOVAttrib_PVMArch,           kPOVMSType_CString },
***************
*** 337,341 ****
  	{ "MB",	 kNoParameter,					kNoParameter,			kPOVAttrib_Bounding },
  	{ "MV",	 kPOVAttrib_Version,			kPOVMSType_Float,		kNoParameter },
! #ifdef PVM
  	{ "NA",  kPOVAttrib_PVMArch,    kPOVMSType_CString,    kPOVAttrib_PVMUse },
  	{ "ND",  kPOVAttrib_PVMWD,      kPOVObjectClass_File,  kNoParameter },
--- 338,342 ----
  	{ "MB",	 kNoParameter,					kNoParameter,			kPOVAttrib_Bounding },
  	{ "MV",	 kPOVAttrib_Version,			kPOVMSType_Float,		kNoParameter },
! #ifdef HAVE_LIBPVM3
  	{ "NA",  kPOVAttrib_PVMArch,    kPOVMSType_CString,    kPOVAttrib_PVMUse },
  	{ "ND",  kPOVAttrib_PVMWD,      kPOVObjectClass_File,  kNoParameter },

Index: optin.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optin.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** optin.h	28 Oct 2002 01:45:43 -0000	1.2
--- optin.h	3 Nov 2002 07:39:35 -0000	1.3
***************
*** 26,38 ****
  * $Author$
  * $Log$
! * Revision 1.2  2002/10/28 01:45:43  llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
  *
! * Fixed misleading comment in pvm.cpp
  *
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
  *
  * Revision 1.1.1.1  2002/10/05 10:23:52  flierl
--- 26,36 ----
  * $Author$
  * $Log$
! * Revision 1.3  2002/11/03 07:39:35  llnz
! * Lee Begg 3 Nov 2002
  *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
  *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
  *
  * Revision 1.1.1.1  2002/10/05 10:23:52  flierl
***************
*** 157,161 ****
    INCLUDE_INI_OP,
  
! #ifdef PVM
    /* options for PVMPOV */
    PVM_TASKS_OP,
--- 155,159 ----
    INCLUDE_INI_OP,
  
! #ifdef HAVE_LIBPVM3
    /* options for PVMPOV */
    PVM_TASKS_OP,

Index: optout.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optout.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** optout.cpp	28 Oct 2002 01:45:43 -0000	1.2
--- optout.cpp	3 Nov 2002 07:39:35 -0000	1.3
***************
*** 26,38 ****
  * $Author$
  * $Log$
! * Revision 1.2  2002/10/28 01:45:43  llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
  *
! * Fixed misleading comment in pvm.cpp
  *
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
  *
  * Revision 1.1.1.1  2002/10/05 10:21:47  flierl
--- 26,36 ----
  * $Author$
  * $Log$
! * Revision 1.3  2002/11/03 07:39:35  llnz
! * Lee Begg 3 Nov 2002
  *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
  *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
  *
  * Revision 1.1.1.1  2002/10/05 10:21:47  flierl
***************
*** 93,97 ****
  #include "povmsgid.h"
  #include "isosurf.h"
! #ifdef PVM
  #include "pvm.h"	/* PVMPOV */
  #endif
--- 91,95 ----
  #include "povmsgid.h"
  #include "isosurf.h"
! #ifdef HAVE_LIBPVM3
  #include "pvm.h"	/* PVMPOV */
  #endif
***************
*** 505,509 ****
        Banner("    5     Tracing Options\n");
        Banner("    6     Animation Options\n");
! #ifdef PVM
        Banner("    7     PVM Options\n");
        Banner("    8     Redirecting Options\n");
--- 503,507 ----
        Banner("    5     Tracing Options\n");
        Banner("    6     Animation Options\n");
! #ifdef HAVE_LIBPVM3
        Banner("    7     PVM Options\n");
        Banner("    8     Redirecting Options\n");
***************
*** 638,642 ****
        break;
  
! #ifdef PVM
  
      /* PVM Options */
--- 636,640 ----
        break;
  
! #ifdef HAVE_LIBPVM3
  
      /* PVM Options */
***************
*** 1057,1061 ****
    Render_Info("\n");
  
! #ifdef PVM
  
    /* print options for PVMPOV */
--- 1055,1059 ----
    Render_Info("\n");
  
! #ifdef HAVE_LIBPVM3
  
    /* print options for PVMPOV */

Index: optout.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optout.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** optout.h	28 Oct 2002 01:45:43 -0000	1.3
--- optout.h	3 Nov 2002 07:39:35 -0000	1.4
***************
*** 26,38 ****
  * $Author$
  * $Log$
! * Revision 1.3  2002/10/28 01:45:43  llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
  *
! * Fixed misleading comment in pvm.cpp
  *
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
  *
  * Revision 1.2  2002/10/05 15:09:44  flierl
--- 26,36 ----
  * $Author$
  * $Log$
! * Revision 1.4  2002/11/03 07:39:35  llnz
! * Lee Begg 3 Nov 2002
  *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
  *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
  *
  * Revision 1.2  2002/10/05 15:09:44  flierl
***************
*** 72,76 ****
  /* Number of help pages (numbered 0 to MAX_HELP_PAGE). */
  
! #ifdef PVM
  #define MAX_HELP_PAGE 8
  #else
--- 70,74 ----
  /* Number of help pages (numbered 0 to MAX_HELP_PAGE). */
  
! #ifdef HAVE_LIBPVM3
  #define MAX_HELP_PAGE 8
  #else

Index: povmsgid.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povmsgid.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** povmsgid.h	28 Oct 2002 01:45:43 -0000	1.2
--- povmsgid.h	3 Nov 2002 07:39:35 -0000	1.3
***************
*** 26,38 ****
  * $Author$
  * $Log$
! * Revision 1.2  2002/10/28 01:45:43  llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
  *
! * Fixed misleading comment in pvm.cpp
  *
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
  *
  * Revision 1.1.1.1  2002/10/05 10:23:56  flierl
--- 26,36 ----
  * $Author$
  * $Log$
! * Revision 1.3  2002/11/03 07:39:35  llnz
! * Lee Begg 3 Nov 2002
  *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
  *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
  *
  * Revision 1.1.1.1  2002/10/05 10:23:56  flierl
***************
*** 262,266 ****
  	kPOVAttrib_EndColumn			 = kPOVAttrib_Right,
  	kPOVAttrib_StartRow				 = kPOVAttrib_Top,
! #ifdef PVM
  	kPOVAttrib_EndRow				 = kPOVAttrib_Bottom,
  	kPOVAttrib_PVMTasks                      = 'PVMt',
--- 260,264 ----
  	kPOVAttrib_EndColumn			 = kPOVAttrib_Right,
  	kPOVAttrib_StartRow				 = kPOVAttrib_Top,
! #ifdef HAVE_LIBPVM3
  	kPOVAttrib_EndRow				 = kPOVAttrib_Bottom,
  	kPOVAttrib_PVMTasks                      = 'PVMt',

Index: povmsrec.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povmsrec.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** povmsrec.cpp	30 Oct 2002 01:12:47 -0000	1.4
--- povmsrec.cpp	3 Nov 2002 07:39:35 -0000	1.5
***************
*** 26,32 ****
  * $Author$
  * $Log$
! * Revision 1.4  2002/10/30 01:12:47  llnz
! * Lee Begg 30 Oct 2002
! * removed debugging stuff from povmsrec.cpp
  *
  * Revision 1.1.1.1  2002/10/05 10:22:38  flierl
--- 26,36 ----
  * $Author$
  * $Log$
! * Revision 1.5  2002/11/03 07:39:35  llnz
! * Lee Begg 3 Nov 2002
! *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
! *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
  *
  * Revision 1.1.1.1  2002/10/05 10:22:38  flierl
***************
*** 67,71 ****
  #include "povmsend.h"
  #include "pov_err.h"
! #ifdef PVM
  #include "pvm.h"
  #endif
--- 71,75 ----
  #include "povmsend.h"
  #include "pov_err.h"
! #ifdef HAVE_LIBPVM3
  #include "pvm.h"
  #endif
***************
*** 781,785 ****
        (void)BuildRenderOptions(result);
  
! #ifdef PVM
     if(POVMSUtil_GetBool(msg, kPOVAttrib_PVMUse, &b) == 0)
     {
--- 785,789 ----
        (void)BuildRenderOptions(result);
  
! #ifdef HAVE_LIBPVM3
     if(POVMSUtil_GetBool(msg, kPOVAttrib_PVMUse, &b) == 0)
     {

Index: povray.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povray.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** povray.cpp	28 Oct 2002 01:45:43 -0000	1.2
--- povray.cpp	3 Nov 2002 07:39:35 -0000	1.3
***************
*** 27,39 ****
  * $Author$
  * $Log$
! * Revision 1.2  2002/10/28 01:45:43  llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
  *
! * Fixed misleading comment in pvm.cpp
  *
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
  *
  * Revision 1.1.1.1  2002/10/05 10:22:42  flierl
--- 27,37 ----
  * $Author$
  * $Log$
! * Revision 1.3  2002/11/03 07:39:35  llnz
! * Lee Begg 3 Nov 2002
  *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
  *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
  *
  * Revision 1.1.1.1  2002/10/05 10:22:42  flierl
***************
*** 107,111 ****
  #include "pov_err.h"
  #include "optout.h"
! #ifdef PVM
  #include "pvm.h" /* PVMPOV */
  #endif
--- 105,109 ----
  #include "pov_err.h"
  #include "optout.h"
! #ifdef HAVE_LIBPVM3
  #include "pvm.h" /* PVMPOV */
  #endif
***************
*** 488,492 ****
  #endif
  
! #ifdef PVM
    /* If slave, turn off certain options */
    if ( PvmSlave)
--- 486,490 ----
  #endif
  
! #ifdef HAVE_LIBPVM3
    /* If slave, turn off certain options */
    if ( PvmSlave)
***************
*** 501,505 ****
     Open_Text_Streams();
  
! #ifdef PVM
    if ( !PvmSlave) {
        /* Write .INI file [SCD 2/95] */
--- 499,503 ----
     Open_Text_Streams();
  
! #ifdef HAVE_LIBPVM3
    if ( !PvmSlave) {
        /* Write .INI file [SCD 2/95] */
***************
*** 524,528 ****
     init_output_file_handle();
  
! #ifdef PVM
    /* Initialize PVM master */
    if ( !PvmSlave && PvmTasks)
--- 522,526 ----
     init_output_file_handle();
  
! #ifdef HAVE_LIBPVM3
    /* Initialize PVM master */
    if ( !PvmSlave && PvmTasks)
***************
*** 792,796 ****
     Clock_Delta = ((Diff_Frame == 0) ? 0 : Diff_Clock/Diff_Frame);
  
! #ifdef PVM
     /* PVM Slave */
     if (PvmSlave ) {
--- 790,794 ----
     Clock_Delta = ((Diff_Frame == 0) ? 0 : Diff_Clock/Diff_Frame);
  
! #ifdef HAVE_LIBPVM3
     /* PVM Slave */
     if (PvmSlave ) {
***************
*** 828,832 ****
        {
  
! #ifdef PVM
   	  if(!PvmSlave && PvmTasks) {
   	      START_TIME
--- 826,830 ----
        {
  
! #ifdef HAVE_LIBPVM3
   	  if(!PvmSlave && PvmTasks) {
   	      START_TIME
***************
*** 879,883 ****
           }
  
! #ifdef PVM
   	  }
  #endif
--- 877,881 ----
           }
  
! #ifdef HAVE_LIBPVM3
   	  }
  #endif
***************
*** 1054,1058 ****
     START_TIME
  
! #ifdef PVM
    if( !PvmSlave) {
  #endif
--- 1052,1056 ----
     START_TIME
  
! #ifdef HAVE_LIBPVM3
    if( !PvmSlave) {
  #endif
***************
*** 1081,1085 ****
     }
  
! #ifdef PVM
    } /* !PvmTasks */
  #endif
--- 1079,1083 ----
     }
  
! #ifdef HAVE_LIBPVM3
    } /* !PvmTasks */
  #endif
***************
*** 1088,1092 ****
     Initialize_Renderer();
  
! #ifdef PVM
    /* If a PVM slave, re-assign Write_Line to PVM */
    if (PvmSlave) {
--- 1086,1090 ----
     Initialize_Renderer();
  
! #ifdef HAVE_LIBPVM3
    /* If a PVM slave, re-assign Write_Line to PVM */
    if (PvmSlave) {
***************
*** 1100,1104 ****
     // initialize the display until we know this, which in turn means we can't
     // read the rendered part before the display is initialized. [AED]
! #ifdef PVM
    if (!PvmSlave) {
  #endif
--- 1098,1102 ----
     // initialize the display until we know this, which in turn means we can't
     // read the rendered part before the display is initialized. [AED]
! #ifdef HAVE_LIBPVM3
    if (!PvmSlave) {
  #endif
***************
*** 1113,1121 ****
           opts.Last_Column = Frame.Screen_Width;
     }
! #ifdef PVM
    } /* !PvmSlave */
  #endif
  
! #ifdef PVM
    if(PvmSlave || !PvmTasks) {
  #endif
--- 1111,1119 ----
           opts.Last_Column = Frame.Screen_Width;
     }
! #ifdef HAVE_LIBPVM3
    } /* !PvmSlave */
  #endif
  
! #ifdef HAVE_LIBPVM3
    if(PvmSlave || !PvmTasks) {
  #endif
***************
*** 1124,1128 ****
     tparse += TIME_ELAPSED
  
! #ifdef PVM
    } /* PvmSlave || !PvmTasks */
  #endif
--- 1122,1126 ----
     tparse += TIME_ELAPSED
  
! #ifdef HAVE_LIBPVM3
    } /* PvmSlave || !PvmTasks */
  #endif
***************
*** 1157,1161 ****
     Send_RenderStatus("Rendering");
  
! #ifdef PVM
    do {
  #endif
--- 1155,1159 ----
     Send_RenderStatus("Rendering");
  
! #ifdef HAVE_LIBPVM3
    do {
  #endif
***************
*** 1188,1192 ****
     }
  
! #ifdef PVM
    } while(PvmSlave ? Pvm_Slave_Control() : 0);		/* ask for more work */
  #endif
--- 1186,1190 ----
     }
  
! #ifdef HAVE_LIBPVM3
    } while(PvmSlave ? Pvm_Slave_Control() : 0);		/* ask for more work */
  #endif
***************
*** 1205,1209 ****
     trender = 0;
  
! #ifdef PVM
    if(!PvmSlave) {
  #endif
--- 1203,1207 ----
     trender = 0;
  
! #ifdef HAVE_LIBPVM3
    if(!PvmSlave) {
  #endif
***************
*** 1214,1218 ****
        Output_File = NULL;
     }
! #ifdef PVM
    }
  #endif
--- 1212,1216 ----
        Output_File = NULL;
     }
! #ifdef HAVE_LIBPVM3
    }
  #endif
***************
*** 1249,1253 ****
     POV_POST_SHUTDOWN
  
! #ifdef PVM
    if(!PvmSlave) {
  #endif
--- 1247,1251 ----
     POV_POST_SHUTDOWN
  
! #ifdef HAVE_LIBPVM3
    if(!PvmSlave) {
  #endif
***************
*** 1263,1267 ****
     if(opts.histogram_on)
        write_histogram(opts.Histogram_File_Name);
! #ifdef PVM
    }
  #endif
--- 1261,1265 ----
     if(opts.histogram_on)
        write_histogram(opts.Histogram_File_Name);
! #ifdef HAVE_LIBPVM3
    }
  #endif
***************
*** 1272,1276 ****
  
     // Print stats ...
! #ifdef PVM
    if(!PvmSlave)
  #endif
--- 1270,1274 ----
  
     // Print stats ...
! #ifdef HAVE_LIBPVM3
    if(!PvmSlave)
  #endif
***************
*** 1815,1819 ****
    opts.Radiosity_Recursion_Limit = 3;
    opts.Radiosity_Quality = 6;     /* Q-flag value for light gathering */
! #ifdef PVM
    opts.Radiosity_File_ReadOnContinue = PvmSlave ? 0 : 1;
    opts.Radiosity_File_SaveWhileRendering = PvmSlave ? 0 : 1; /* Don't save radiosity cache with PVM */
--- 1813,1817 ----
    opts.Radiosity_Recursion_Limit = 3;
    opts.Radiosity_Quality = 6;     /* Q-flag value for light gathering */
! #ifdef HAVE_LIBPVM3
    opts.Radiosity_File_ReadOnContinue = PvmSlave ? 0 : 1;
    opts.Radiosity_File_SaveWhileRendering = PvmSlave ? 0 : 1; /* Don't save radiosity cache with PVM */
***************
*** 1823,1827 ****
  #endif
    opts.Radiosity_File_AlwaysReadAtStart = 0;
! #ifdef PVM
    opts.Radiosity_File_KeepOnAbort = PvmSlave ? 0 : 1;
  #else
--- 1821,1825 ----
  #endif
    opts.Radiosity_File_AlwaysReadAtStart = 0;
! #ifdef HAVE_LIBPVM3
    opts.Radiosity_File_KeepOnAbort = PvmSlave ? 0 : 1;
  #else

Index: render.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/render.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** render.cpp	28 Oct 2002 01:45:43 -0000	1.2
--- render.cpp	3 Nov 2002 07:39:35 -0000	1.3
***************
*** 30,42 ****
  * $Author$
  * $Log$
! * Revision 1.2  2002/10/28 01:45:43  llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
  *
! * Fixed misleading comment in pvm.cpp
  *
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
  *
  * Revision 1.1.1.1  2002/10/05 10:22:56  flierl
--- 30,40 ----
  * $Author$
  * $Log$
! * Revision 1.3  2002/11/03 07:39:35  llnz
! * Lee Begg 3 Nov 2002
  *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
  *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
  *
  * Revision 1.1.1.1  2002/10/05 10:22:56  flierl
***************
*** 88,92 ****
  #include "file_pov.h"
  #include "povms.h"
! #ifdef PVM
  #include "pvm.h"      /* PVMPOV */
  #endif
--- 86,90 ----
  #include "file_pov.h"
  #include "povms.h"
! #ifdef HAVE_LIBPVM3
  #include "pvm.h"      /* PVMPOV */
  #endif
***************
*** 432,436 ****
    size = (Frame.Screen_Width + 1) * sizeof(COLOUR);
  
! #ifdef PVM
    if (Previous_Line!=NULL) POV_FREE(Previous_Line);
    if (Current_Line!=NULL) POV_FREE(Current_Line);
--- 430,434 ----
    size = (Frame.Screen_Width + 1) * sizeof(COLOUR);
  
! #ifdef HAVE_LIBPVM3
    if (Previous_Line!=NULL) POV_FREE(Previous_Line);
    if (Current_Line!=NULL) POV_FREE(Current_Line);
***************
*** 451,455 ****
      size = (Frame.Screen_Width + 1) * sizeof(char);
  
! #ifdef PVM
      if (Previous_Line_Antialiased_Flags!=NULL) POV_FREE(Previous_Line_Antialiased_Flags);
      if (Current_Line_Antialiased_Flags!=NULL) POV_FREE(Current_Line_Antialiased_Flags);
--- 449,453 ----
      size = (Frame.Screen_Width + 1) * sizeof(char);
  
! #ifdef HAVE_LIBPVM3
      if (Previous_Line_Antialiased_Flags!=NULL) POV_FREE(Previous_Line_Antialiased_Flags);
      if (Current_Line_Antialiased_Flags!=NULL) POV_FREE(Current_Line_Antialiased_Flags);
***************
*** 466,470 ****
    }
  
! #ifdef PVM
    /* If PVM, this is already enough */
    if(PvmTasks && !PvmSlave)
--- 464,468 ----
    }
  
! #ifdef HAVE_LIBPVM3
    /* If PVM, this is already enough */
    if(PvmTasks && !PvmSlave)

Index: userio.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/userio.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** userio.cpp	28 Oct 2002 01:45:43 -0000	1.2
--- userio.cpp	3 Nov 2002 07:39:35 -0000	1.3
***************
*** 26,38 ****
  * $Author$
  * $Log$
! * Revision 1.2  2002/10/28 01:45:43  llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
  *
! * Fixed misleading comment in pvm.cpp
  *
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
  *
  * Revision 1.1.1.1  2002/10/05 10:23:27  flierl
--- 26,36 ----
  * $Author$
  * $Log$
! * Revision 1.3  2002/11/03 07:39:35  llnz
! * Lee Begg 3 Nov 2002
  *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
  *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
  *
  * Revision 1.1.1.1  2002/10/05 10:23:27  flierl
***************
*** 60,64 ****
  #include "pov_err.h"
  #include "file_pov.h"
! #ifdef PVM
  #include "pvm.h"
  #endif
--- 58,62 ----
  #include "pov_err.h"
  #include "file_pov.h"
! #ifdef HAVE_LIBPVM3
  #include "pvm.h"
  #endif

Flat | Threaded

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (4)
2003	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec